(no commit message)

[utils] / support / general / src / test / java / org / wamblee / persistence / JpaMergeSupportTest.java

diff --git a/support/general/src/test/java/org/wamblee/persistence/JpaMergeSupportTest.java b/support/general/src/test/java/org/wamblee/persistence/JpaMergeSupportTest.java
index 3e92799bbe01c509bf706e65ae30e7240252f19a..c906fb19b92be5584e3f1c5ee45da2c6790e8ac2 100644 (file)
--- a/support/general/src/test/java/org/wamblee/persistence/JpaMergeSupportTest.java
+++ b/support/general/src/test/java/org/wamblee/persistence/JpaMergeSupportTest.java
@@ -127,6 +127,28 @@ public class JpaMergeSupportTest {
             return array;
         }
     }
+    
+    private static class X6 { 
+        @Id
+        int id; 
+        
+        public X1 getNotaGetter(String aMessage) { 
+            return null; 
+        }
+        
+        public void getNotaGetter2() { 
+            
+        }
+    }
+    
+    private static class X7 { 
+        @Id
+        int id; 
+        
+        private void getX() { 
+            fail("Private getters should not be used");
+        }
+    }
 
     @Test
     public void testSimple() {
@@ -360,4 +382,22 @@ public class JpaMergeSupportTest {
         JpaMergeSupport.merge(x, y);
     }
 
+    @Test
+    public void testNotAGetter() { 
+        X6 x = new X6(); 
+        x.id = 100; 
+        X6 y = new X6(); 
+        
+        JpaMergeSupport.merge(x,y);
+        assertEquals(x.id, y.id);
+    }
+    
+    @Test 
+    public void testPrivateGetter() { 
+        X7 x = new X7(); 
+        x.id = 100;
+        X7 y = new X7(); 
+        JpaMergeSupport.merge(x,y);
+        assertEquals(x.id, y.id);
+    }
 }