fixed bugs in test programs for template builder

muga · muga · commit 6857111a0890 · 2011-07-13T00:26:00.000+09:00
diff --git a/src/test/java/org/msgpack/testclasses/InheritanceClass.java b/src/test/java/org/msgpack/testclasses/InheritanceClass.java
@@ -6,8 +6,8 @@
 
 @Ignore @Message
 public class InheritanceClass extends SuperClass {
-    public String f2;
-    public int f3;
+    public String f1;
+    public int f2;
 
     public InheritanceClass() {}
 
@@ -17,17 +17,24 @@ public boolean equals(Object o) {
 	    return false;
 	}
 	InheritanceClass that = (InheritanceClass) o;
-	// f2
-	if (f2 == null) {
-	    if (that.f2 != null) {
+	// f0
+	if (f0 == null) {
+	    if (that.f0 != null) {
 		return false;
 	    }
 	}
-	if (! f2.equals(that.f2)) {
+	if (! f0.equals(that.f0)) {
+	    return false;
+	}
+	// f1
+	if (f2 != that.f2) {
 	    return false;
 	}
-	// f3
-	if (f3 != that.f3) {
+	if (! f1.equals(that.f1)) {
+	    return false;
+	}
+	// f2
+	if (f2 != that.f2) {
 	    return false;
 	}
 	return true;
diff --git a/src/test/java/org/msgpack/testclasses/InheritanceClassNotNullable.java b/src/test/java/org/msgpack/testclasses/InheritanceClassNotNullable.java
@@ -6,11 +6,11 @@
 
 
 @Ignore @Message
-public class InheritanceClassNotNullable extends SuperClass {
+public class InheritanceClassNotNullable extends SuperClassNotNullable {
     @NotNullable
-    public String f2;
+    public String f1;
     @NotNullable
-    public int f3;
+    public int f2;
 
     public InheritanceClassNotNullable() {}
 
@@ -20,17 +20,17 @@ public boolean equals(Object o) {
 	    return false;
 	}
 	InheritanceClassNotNullable that = (InheritanceClassNotNullable) o;
-	// f2
-	if (f2 == null) {
-	    if (that.f2 != null) {
+	// f1
+	if (f1 == null) {
+	    if (that.f1 != null) {
 		return false;
 	    }
 	}
-	if (! f2.equals(that.f2)) {
+	if (! f1.equals(that.f1)) {
 	    return false;
 	}
-	// f3
-	if (f3 != that.f3) {
+	// f2
+	if (f2 != that.f2) {
 	    return false;
 	}
 	return true;
diff --git a/src/test/java/org/msgpack/testclasses/SuperClass.java b/src/test/java/org/msgpack/testclasses/SuperClass.java
@@ -7,7 +7,6 @@
 @Ignore @Message
 public class SuperClass {
     public String f0;
-    protected int f1;
 
     public SuperClass() {}
 
@@ -25,9 +24,6 @@ public boolean equals(Object o) {
 	if (! f0.equals(that.f0)) {
 	    return false;
 	}
-	if (f1 != that.f1) {
-	    return false;
-	}
 	return true;
     }
 }
diff --git a/src/test/java/org/msgpack/testclasses/SuperClassNotNullable.java b/src/test/java/org/msgpack/testclasses/SuperClassNotNullable.java
@@ -9,8 +9,23 @@
 public class SuperClassNotNullable {
     @NotNullable
     public String f0;
-    @NotNullable
-    protected int f1;
 
     public SuperClassNotNullable() {}
+
+    @Override
+    public boolean equals(Object o) {
+	if (! (o instanceof SuperClassNotNullable)) {
+	    return false;
+	}
+	SuperClassNotNullable that = (SuperClassNotNullable) o;
+	if (f0 == null) {
+	    if (that.f0 != null) {
+		return false;
+	    }
+	}
+	if (! f0.equals(that.f0)) {
+	    return false;
+	}
+	return true;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`@Ignore @Message`
`8`	`8`	`public class SuperClass {`
`9`	`9`	`public String f0;`
`10`		`- protected int f1;`
`11`	`10`
`12`	`11`	`public SuperClass() {}`
`13`	`12`
`@@ -25,9 +24,6 @@ public boolean equals(Object o) {`
`25`	`24`	`if (! f0.equals(that.f0)) {`
`26`	`25`	`return false;`
`27`	`26`	`}`
`28`		`- if (f1 != that.f1) {`
`29`		`- return false;`
`30`		`- }`
`31`	`27`	`return true;`
`32`	`28`	`}`
`33`	`29`	`}`