X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Freflection%2FAnnotationUtilsTest.java;h=03d2922a97ffd6b9691ddd5e4e99c2afaf7f9088;hb=26805fc0810098c4bd8009a35c8719478e74153e;hp=0ab685cd0c181c3ae3a00b9f34b6091c8d3d0e12;hpb=ad3f409d2a7981f5a4619e3a37c0866b55ce6526;p=utils

diff --git a/support/general/src/test/java/org/wamblee/reflection/AnnotationUtilsTest.java b/support/general/src/test/java/org/wamblee/reflection/AnnotationUtilsTest.java
index 0ab685cd..03d2922a 100644
--- a/support/general/src/test/java/org/wamblee/reflection/AnnotationUtilsTest.java
+++ b/support/general/src/test/java/org/wamblee/reflection/AnnotationUtilsTest.java
@@ -23,86 +23,87 @@ import java.util.List;
 
 import org.junit.Test;
 
-import static junit.framework.TestCase.*; 
+import static junit.framework.TestCase.*;
 
 public class AnnotationUtilsTest {
-    
+
     @Retention(RetentionPolicy.RUNTIME)
-    @Target({ElementType.FIELD, ElementType.METHOD})
-    public static @interface MyAnnotation { 
-        
+    @Target( { ElementType.FIELD, ElementType.METHOD })
+    public static @interface MyAnnotation {
+
     }
-    
-    public static class X1 { 
+
+    public static class X1 {
         @MyAnnotation
-        public int x; 
+        public int x;
     }
-    
-    public static class X2 { 
+
+    public static class X2 {
         @MyAnnotation
         private int x;
-        
+
     }
 
-    public static class X3 { 
+    public static class X3 {
         private int x;
-        
+
         public void setX(int aX) {
             x = aX;
         }
-        
+
         @MyAnnotation
         public int getX() {
             return x;
         }
     }
-    
-    public static class X4 { 
+
+    public static class X4 {
         private int x;
-        
+
         private void setX(int aX) {
             x = aX;
         }
-        
+
         @MyAnnotation
         private int getX() {
             return x;
         }
     }
 
-    public static class X5 { 
+    public static class X5 {
         private int x;
-        
+
         @MyAnnotation
-        private int y; 
-        
+        private int y;
+
         private void setX(int aX) {
             x = aX;
         }
-        
+
         @MyAnnotation
         private int getX() {
             return x;
         }
     }
 
-
-    
     @Test
     public void testPublicField() {
-        List<Accessor> accessors = AnnotationUtils.analyse(X1.class, MyAnnotation.class);
+        List<Accessor> accessors = AnnotationUtils.analyse(X1.class,
+            MyAnnotation.class);
         assertEquals(1, accessors.size());
         assertTrue(accessors.get(0) instanceof FieldAccessor);
+        assertEquals(int.class, accessors.get(0).getType());
 
         X1 obj = new X1();
         assertEquals(0, obj.x);
         accessors.get(0).set(obj, 100);
-        assertEquals(100,obj.x);
+        assertEquals(100, obj.x);
     }
-    
+
     @Test
-    public void testPrivateField() { 
-        List<Accessor> accessors = AnnotationUtils.analyse(X2.class, MyAnnotation.class);
+    public void testPrivateField() {
+        List<Accessor> accessors = AnnotationUtils.analyse(X2.class,
+            MyAnnotation.class);
         assertEquals(1, accessors.size());
         assertTrue(accessors.get(0) instanceof FieldAccessor);
         X2 obj = new X2();
@@ -110,21 +111,24 @@ public class AnnotationUtilsTest {
         accessors.get(0).set(obj, 100);
         assertEquals(100, obj.x);
     }
-    
+
     @Test
-    public void testPublicProperty() { 
-        List<Accessor> accessors = AnnotationUtils.analyse(X3.class, MyAnnotation.class);
+    public void testPublicProperty() {
+        List<Accessor> accessors = AnnotationUtils.analyse(X3.class,
+            MyAnnotation.class);
         assertEquals(1, accessors.size());
         assertTrue(accessors.get(0) instanceof PropertyAccessor);
+        assertEquals(int.class, accessors.get(0).getType());
         X3 obj = new X3();
         assertEquals(0, obj.x);
         accessors.get(0).set(obj, 100);
         assertEquals(100, obj.x);
     }
-    
+
     @Test
-    public void testPrivateProperty() { 
-        List<Accessor> accessors = AnnotationUtils.analyse(X4.class, MyAnnotation.class);
+    public void testPrivateProperty() {
+        List<Accessor> accessors = AnnotationUtils.analyse(X4.class,
+            MyAnnotation.class);
         assertEquals(1, accessors.size());
         assertTrue(accessors.get(0) instanceof PropertyAccessor);
         X4 obj = new X4();
@@ -132,15 +136,16 @@ public class AnnotationUtilsTest {
         accessors.get(0).set(obj, 100);
         assertEquals(100, obj.x);
     }
-    
+
     @Test
-    public void testMultipleMatches() { 
-        List<Accessor> accessors = AnnotationUtils.analyse(X5.class, MyAnnotation.class);
+    public void testMultipleMatches() {
+        List<Accessor> accessors = AnnotationUtils.analyse(X5.class,
+            MyAnnotation.class);
         assertEquals(2, accessors.size());
         X5 obj = new X5();
         assertEquals(0, obj.x);
         assertEquals(0, obj.y);
-        for (Accessor accessor: accessors) { 
+        for (Accessor accessor : accessors) {
             accessor.set(obj, 100);
         }
         assertEquals(100, obj.x);