added test programs for serializing private fields

muga · muga · commit f13b1bdfd65e · 2011-10-08T13:51:38.000+09:00
diff --git a/src/test/java/org/msgpack/template/builder/TestSet.java b/src/test/java/org/msgpack/template/builder/TestSet.java
@@ -289,6 +289,7 @@ public void testModifiersFieldsClass() throws Exception {
 	testModifiersFieldsClass(new ModifiersFieldsClass());
 	ModifiersFieldsClass v = new ModifiersFieldsClass();
 	v.f0 = 0;
+	v.f4 = "muga";
 	testModifiersFieldsClass(v);
     }
 
@@ -297,9 +298,15 @@ public void testModifiersFieldsClass(ModifiersFieldsClass v) throws Exception {
 
     public void testModifiersFieldsClassNotNullable() throws Exception {
 	testModifiersFieldsClassNotNullable(null);
-	testModifiersFieldsClassNotNullable(new ModifiersFieldsClassNotNullable());
+	try {
+	    testModifiersFieldsClassNotNullable(new ModifiersFieldsClassNotNullable());
+	    Assert.fail();
+	} catch (Throwable t) {
+	    Assert.assertTrue(t instanceof MessageTypeException);
+	}
 	ModifiersFieldsClassNotNullable v = new ModifiersFieldsClassNotNullable();
 	v.f0 = 0;
+	v.f4 = "muga";
 	testModifiersFieldsClassNotNullable(v);
     }
 
diff --git a/src/test/java/org/msgpack/testclasses/ModifiersFieldsClass.java b/src/test/java/org/msgpack/testclasses/ModifiersFieldsClass.java
@@ -9,19 +9,19 @@
 public class ModifiersFieldsClass {
     public int f0;
 
-    private int f1;
+    private int f1 = 5;
 
-    protected int f2;
+    protected int f2 = 10;
 
-    int f3;
+    int f3 = 15;
 
     public String f4;
 
-    private String f5;
+    private String f5 = "nishizawa";
 
-    protected String f6;
+    protected String f6 = "muga";
 
-    String f7;
+    String f7 = "hello";
 
     public ModifiersFieldsClass() {}
 
diff --git a/src/test/java/org/msgpack/testclasses/ModifiersFieldsClassNotNullable.java b/src/test/java/org/msgpack/testclasses/ModifiersFieldsClassNotNullable.java
@@ -12,13 +12,25 @@ public class ModifiersFieldsClassNotNullable {
     public int f0;
 
     @NotNullable
-    private int f1;
+    private int f1 = 5;
 
     @NotNullable
-    protected int f2;
+    protected int f2 = 10;
 
     @NotNullable
-    int f3;
+    int f3 = 15;
+
+    @NotNullable
+    public String f4;
+
+    @NotNullable
+    private String f5 = "nishizawa";
+
+    @NotNullable
+    protected String f6 = "hello";
+
+    @NotNullable
+    String f7 = "muga";
 
     public ModifiersFieldsClassNotNullable() {}
 
@@ -52,6 +64,46 @@ public void setF3(int f3) {
         this.f3 = f3;
     }
 
+    @NotNullable
+    public String getF4() {
+	return f4;
+    }
+
+    @NotNullable
+    public void setF4(String f4) {
+	this.f4 = f4;
+    }
+
+    @NotNullable
+    public String getF5() {
+	return f5;
+    }
+
+    @NotNullable
+    public void setF5(String f5) {
+	this.f5 = f5;
+    }
+
+    @NotNullable
+    public String getF6() {
+	return f6;
+    }
+
+    @NotNullable
+    public void setF6(String f6) {
+	this.f6 = f6;
+    }
+
+    @NotNullable
+    public String getF7() {
+	return f7;
+    }
+
+    @NotNullable
+    public void setF7(String f7) {
+	this.f7 = f7;
+    }
+
     @Override
     public boolean equals(Object o) {
 	if (! (o instanceof ModifiersFieldsClassNotNullable)) {
@@ -70,6 +122,38 @@ public boolean equals(Object o) {
 	if (f3 != that.f3) {
 	    return false;
 	}
+	if (f4 == null) {
+	    if (that.f4 != null) {
+		return false;
+	    }
+	}
+	if (that.f4 != null && ! f4.equals(that.f4)) {
+	    return false;
+	}
+	if (f5 == null) {
+	    if (that.f5 != null) {
+		return false;
+	    }
+	}
+	if (that.f5 != null && ! f5.equals(that.f5)) {
+	    return false;
+	}
+	if (f6 == null) {
+	    if (that.f6 != null) {
+		return false;
+	    }
+	}
+	if (that.f6 != null && ! f6.equals(that.f6)) {
+	    return false;
+	}
+	if (f7 == null) {
+	    if (that.f7 != null) {
+		return false;
+	    }
+	}
+	if (that.f7 != null && ! f7.equals(that.f7)) {
+	    return false;
+	}
 	return true;
     }
 }
