[Pojomatic-commits] SF.net SVN: pojomatic:[161] trunk/PojomaticAll/Pojomatic/src/test/java/org/ pojomatic/internal

[<iro...@us...>]

Revision: 161
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=161&view=rev
Author:   iroberts
Date:     2009-09-25 22:13:12 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
add a test to verify that ClassProperties doesn't grab inherited methods
twice

Modified Paths:
--------------
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C1.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C3.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C2.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C4.java

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java	2009-09-25 22:12:22 UTC (rev 160)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java	2009-09-25 22:13:12 UTC (rev 161)
@@ -12,6 +12,9 @@
 import org.pojomatic.annotations.DefaultPojomaticPolicy;
 import org.pojomatic.annotations.PojomaticPolicy;
 import org.pojomatic.annotations.Property;
+import org.pojomatic.internal.a.C1;
+import org.pojomatic.internal.b.C2;
+import org.pojomatic.internal.b.C4;
 
 public class ClassPropertiesTest {
 
@@ -208,6 +211,22 @@
   }
 
   @Test
+  public void testOverriddenMethods() throws Exception {
+    ClassProperties classProperties = new ClassProperties(C4.class);
+    assertEquals(
+      asSet(
+        TestUtils.method(C1.class, "packagePrivate"),
+        TestUtils.method(C1.class, "packagePrivateOverriddenProtected"),
+        TestUtils.method(C1.class, "packagePrivateOverriddenPublic"),
+        TestUtils.method(C1.class, "protectedMethod"),
+        TestUtils.method(C1.class, "publicMethod"),
+        TestUtils.method(C2.class, "packagePrivate"),
+        TestUtils.method(C2.class, "packagePrivateOverriddenProtected"),
+        TestUtils.method(C2.class, "packagePrivateOverriddenPublic")),
+      asSet(classProperties.getEqualsProperties()));
+  }
+
+  @Test
   public void testAnnotatedStaticField() {
     try {
       new ClassProperties(StaticField.class);

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C1.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C1.java	2009-09-25 22:12:22 UTC (rev 160)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C1.java	2009-09-25 22:13:12 UTC (rev 161)
@@ -1,9 +1,11 @@
 package org.pojomatic.internal.a;
 
+import org.pojomatic.annotations.Property;
+
 public class C1 {
-  int packagePrivate() { return 1; }
-  int packagePrivateOverriddenProtected() { return 1; }
-  int packagePrivateOverriddenPublic() { return 1; }
-  protected int protectedMethod() { return 1; }
-  public int publicMethod() { return 1; }
+  @Property int packagePrivate() { return 1; }
+  @Property int packagePrivateOverriddenProtected() { return 1; }
+  @Property int packagePrivateOverriddenPublic() { return 1; }
+  @Property protected int protectedMethod() { return 1; }
+  @Property public int publicMethod() { return 1; }
 }

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C3.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C3.java	2009-09-25 22:12:22 UTC (rev 160)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/a/C3.java	2009-09-25 22:13:12 UTC (rev 161)
@@ -1,12 +1,13 @@
 package org.pojomatic.internal.a;
 
+import org.pojomatic.annotations.Property;
 import org.pojomatic.internal.b.C2;
 
 @SuppressWarnings("all")
 public class C3 extends C2 {
-  int packagePrivate() { return 3; }
-  protected int packagePrivateOverriddenProtected() { return 3; }
-  public int packagePrivateOverriddenPublic() { return 3; }
-  protected int protectedMethod() { return 3; }
-  public int publicMethod() { return 3; }
+  @Property int packagePrivate() { return 3; }
+  @Property protected int packagePrivateOverriddenProtected() { return 3; }
+  @Property public int packagePrivateOverriddenPublic() { return 3; }
+  @Property protected int protectedMethod() { return 3; }
+  @Property public int publicMethod() { return 3; }
 }

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C2.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C2.java	2009-09-25 22:12:22 UTC (rev 160)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C2.java	2009-09-25 22:13:12 UTC (rev 161)
@@ -1,12 +1,13 @@
 package org.pojomatic.internal.b;
 
+import org.pojomatic.annotations.Property;
 import org.pojomatic.internal.a.C1;
 
 @SuppressWarnings("all")
 public class C2 extends C1 {
-  int packagePrivate() { return 1; }
-  protected int packagePrivateOverriddenProtected() { return 2; }
-  public int packagePrivateOverriddenPublic() { return 2; }
-  protected int protectedMethod() { return 2; }
-  public int publicMethod() { return 2; }
+  @Property int packagePrivate() { return 1; }
+  @Property protected int packagePrivateOverriddenProtected() { return 2; }
+  @Property public int packagePrivateOverriddenPublic() { return 2; }
+  @Property protected int protectedMethod() { return 2; }
+  @Property public int publicMethod() { return 2; }
 }

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C4.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C4.java	2009-09-25 22:12:22 UTC (rev 160)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/b/C4.java	2009-09-25 22:13:12 UTC (rev 161)
@@ -1,12 +1,13 @@
 package org.pojomatic.internal.b;
 
+import org.pojomatic.annotations.Property;
 import org.pojomatic.internal.a.C3;
 
 @SuppressWarnings("all")
 public class C4 extends C3 {
-  int packagePrivate() { return 4; }
-  protected int packagePrivateOverriddenProtected() { return 4; }
-  public int packagePrivateOverriddenPublic() { return 4; }
-  protected int protectedMethod() { return 4; }
-  public int publicMethod() { return 4; }
+  @Property int packagePrivate() { return 4; }
+  @Property protected int packagePrivateOverriddenProtected() { return 4; }
+  @Property public int packagePrivateOverriddenPublic() { return 4; }
+  @Property protected int protectedMethod() { return 4; }
+  @Property public int publicMethod() { return 4; }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.