X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fpersistence%2FPersistentFactoryTest.java;h=cb1c8acfd40534c32c165b9a8495fa029d5f5ac1;hb=4a575582a5c2999bd816b197d9cf274b4b3ddcd7;hp=b1a7d7191ee78254d3bdf38d9b81175372abf50a;hpb=7d3754ca3d757ef89241cdbd679f82941e64cfc6;p=utils

diff --git a/support/general/src/test/java/org/wamblee/persistence/PersistentFactoryTest.java b/support/general/src/test/java/org/wamblee/persistence/PersistentFactoryTest.java
index b1a7d719..cb1c8acf 100644
--- a/support/general/src/test/java/org/wamblee/persistence/PersistentFactoryTest.java
+++ b/support/general/src/test/java/org/wamblee/persistence/PersistentFactoryTest.java
@@ -40,13 +40,13 @@ public class PersistentFactoryTest {
         public void setPk(int aPk) {
             pk = aPk;
         }
-        
-        private void privateSetter(int aPk) { 
+
+        private void privateSetter(int aPk) {
             pk = aPk;
         }
-        
-        private int privateGetter() { 
-            return pk; 
+
+        private int privateGetter() {
+            return pk;
         }
     }
 
@@ -62,7 +62,7 @@ public class PersistentFactoryTest {
             pk = aPk;
         }
     }
-    
+
     public static class X3 {
         private int pk;
 
@@ -87,13 +87,13 @@ public class PersistentFactoryTest {
         public void setVersion(int aVersion) {
             version = aVersion;
         }
-        
-        private void privateSetter(int aVersion) { 
+
+        private void privateSetter(int aVersion) {
             version = aVersion;
         }
-        
-        private int privateGetter() { 
-            return version; 
+
+        private int privateGetter() {
+            return version;
         }
     }
 
@@ -109,7 +109,7 @@ public class PersistentFactoryTest {
             version = aVersion;
         }
     }
-    
+
     public static class X6 {
         private int version;
 
@@ -122,13 +122,13 @@ public class PersistentFactoryTest {
             version = aVersion;
         }
     }
-    
-    public static class X7 { 
+
+    public static class X7 {
         @Id
-        public int id; 
-        
+        public int id;
+
         @Version
-        public int version; 
+        public int version;
     }
 
     // FieldAccessor test
@@ -154,24 +154,25 @@ public class PersistentFactoryTest {
         accessor.set(x1, 10);
         assertEquals(10, x1.getPk());
     }
-    
+
     @Test
-    public void testPropertyAccessorPrivate() throws Exception { 
+    public void testPropertyAccessorPrivate() throws Exception {
         Accessor<Integer> accessor = new PropertyAccessor<Integer>(X1.class
-            .getDeclaredMethod("privateGetter"), X1.class.getDeclaredMethod("privateSetter",
-            int.class));
+            .getDeclaredMethod("privateGetter"), X1.class.getDeclaredMethod(
+            "privateSetter", int.class));
         X1 x1 = new X1();
         assertEquals(0, x1.getPk());
         accessor.set(x1, 10);
-        assertEquals((Integer)10, accessor.get(x1));
-        
+        assertEquals((Integer) 10, accessor.get(x1));
+
     }
 
     // EntityAccessor test
 
     @Test
     public void testEntityAccessorPkField() {
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X1.class);
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X1.class);
         assertNotNull(accessor);
         assertTrue(accessor.getPk() instanceof FieldAccessor);
         assertNull(accessor.getVersion());
@@ -181,7 +182,8 @@ public class PersistentFactoryTest {
 
     @Test
     public void testEntityAccessorPkProperty() {
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X2.class);
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X2.class);
         assertNotNull(accessor);
         assertNotNull(accessor.getPk());
         assertTrue(accessor.getPk() instanceof PropertyAccessor);
@@ -190,10 +192,11 @@ public class PersistentFactoryTest {
         assertEquals("getPk", property.getGetter().getName());
         assertEquals("setPk", property.getSetter().getName());
     }
-    
+
     @Test
     public void testEntityAccessorPkPropertyPrivate() {
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X3.class);
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X3.class);
         assertNotNull(accessor);
         assertNotNull(accessor.getPk());
         assertTrue(accessor.getPk() instanceof PropertyAccessor);
@@ -205,17 +208,19 @@ public class PersistentFactoryTest {
 
     @Test
     public void testEntityAccessorVersionField() {
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X4.class);
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X4.class);
         assertNotNull(accessor);
         assertTrue(accessor.getVersion() instanceof FieldAccessor);
         assertNull(accessor.getPk());
-        assertEquals("version", ((FieldAccessor) accessor.getVersion()).getField()
-            .getName());
+        assertEquals("version", ((FieldAccessor) accessor.getVersion())
+            .getField().getName());
     }
 
     @Test
     public void testEntityAccessorVersionProperty() {
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X5.class);
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X5.class);
         assertNotNull(accessor);
         assertNotNull(accessor.getVersion());
         assertTrue(accessor.getVersion() instanceof PropertyAccessor);
@@ -224,10 +229,11 @@ public class PersistentFactoryTest {
         assertEquals("getVersion", property.getGetter().getName());
         assertEquals("setVersion", property.getSetter().getName());
     }
-    
+
     @Test
     public void testEntityAccessorVersionPropertyPrivate() {
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X6.class);
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X6.class);
         assertNotNull(accessor);
         assertNotNull(accessor.getVersion());
         assertTrue(accessor.getVersion() instanceof PropertyAccessor);
@@ -236,47 +242,51 @@ public class PersistentFactoryTest {
         assertEquals("getVersion", property.getGetter().getName());
         assertEquals("setVersion", property.getSetter().getName());
     }
-    
+
     @Test
-    public void testNoVersionAndNoPk() { 
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(String.class);
+    public void testNoVersionAndNoPk() {
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(String.class);
         assertNull(accessor);
     }
 
     @Test
-    public void testPkAndVersion() { 
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X7.class);
+    public void testPkAndVersion() {
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X7.class);
         assertNotNull(accessor.getPk());
         assertNotNull(accessor.getVersion());
-        
+
         X7 x = new X7();
         assertEquals(0, x.id);
         assertEquals(0, x.version);
-        
-        accessor.getPk().set(x, 10); 
+
+        accessor.getPk().set(x, 10);
         accessor.getVersion().set(x, 20);
-        
+
         assertEquals(10, x.id);
         assertEquals(20, x.version);
     }
-    
-    @Test 
-    public void testEntityAccessorCache() { 
-        EntityAccessor accessor = PersistentFactory.createEntityAccessor(X1.class);
-        EntityAccessor accessor2 = PersistentFactory.createEntityAccessor(X1.class);
-        
+
+    @Test
+    public void testEntityAccessorCache() {
+        EntityAccessor accessor = PersistentFactory
+            .createEntityAccessor(X1.class);
+        EntityAccessor accessor2 = PersistentFactory
+            .createEntityAccessor(X1.class);
+
         assertSame(accessor, accessor2);
     }
-    
-    // EntityObjectAccessor test for undefined pk and/or version. 
+
+    // EntityObjectAccessor test for undefined pk and/or version.
     @Test
-    public void testEntityObjectAccessorRobustness() { 
-        EntityObjectAccessor accessor =  new EntityObjectAccessor("hello world", 
+    public void testEntityObjectAccessorRobustness() {
+        EntityObjectAccessor accessor = new EntityObjectAccessor("hello world",
             new EntityAccessor(null, null));
         assertNull(accessor.getPrimaryKey());
         assertNull(accessor.getPersistedVersion());
         accessor.setPrimaryKey("bla");
         accessor.setPersistedVersion(100);
-        
+
     }
 }