git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(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 c906fb19b92be5584e3f1c5ee45da2c6790e8ac2..f6ae20bb8598dd871c325511fa017f169fa4e109 100644
(file)
--- a/
support/general/src/test/java/org/wamblee/persistence/JpaMergeSupportTest.java
+++ b/
support/general/src/test/java/org/wamblee/persistence/JpaMergeSupportTest.java
@@
-33,10
+33,10
@@
public class JpaMergeSupportTest {
private static class X1 {
@Id
private static class X1 {
@Id
- int id;
+
private
int id;
@Version
@Version
- int version;
+
private
int version;
private String value;
private String value;
@@
-62,11
+62,16
@@
public class JpaMergeSupportTest {
}
return value.equals(((X1) aObj).getValue());
}
}
return value.equals(((X1) aObj).getValue());
}
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
}
private static class X2 {
@Id
}
private static class X2 {
@Id
- int id;
+
private
int id;
private List<X1> list;
private List<X1> list;
@@
-81,7
+86,7
@@
public class JpaMergeSupportTest {
private static class X3 {
@Id
private static class X3 {
@Id
- int id;
+
private
int id;
private Set<X1> set;
private Set<X1> set;
@@
-96,7
+101,7
@@
public class JpaMergeSupportTest {
private static class X4 {
@Id
private static class X4 {
@Id
- int id;
+
private
int id;
private Map<String, X1> map;
private Map<String, X1> map;
@@
-111,7
+116,7
@@
public class JpaMergeSupportTest {
private static class X5 {
@Id
private static class X5 {
@Id
- int id;
+
private
int id;
private X1[] array;
private X1[] array;
@@
-127,25
+132,25
@@
public class JpaMergeSupportTest {
return array;
}
}
return array;
}
}
-
- private static class X6 {
+
+ private static class X6 {
@Id
@Id
- int id;
-
- public X1 getNotaGetter(String aMessage) {
- return null;
+ private int id;
+
+ public X1 getNotaGetter(String aMessage) {
+ return null;
}
}
-
- public void getNotaGetter2() {
-
+
+ public void getNotaGetter2() {
+
}
}
}
}
-
- private static class X7 {
+
+ private static class X7 {
@Id
@Id
- int id;
-
- private void getX() {
+ private int id;
+
+ private void getX() {
fail("Private getters should not be used");
}
}
fail("Private getters should not be used");
}
}
@@
-383,21
+388,21
@@
public class JpaMergeSupportTest {
}
@Test
}
@Test
- public void testNotAGetter() {
- X6 x = new X6();
- x.id = 100;
- X6 y = new X6();
-
- JpaMergeSupport.merge(x,y);
+ public void testNotAGetter() {
+ X6 x = new X6();
+ x.id = 100;
+ X6 y = new X6();
+
+ JpaMergeSupport.merge(x,
y);
assertEquals(x.id, y.id);
}
assertEquals(x.id, y.id);
}
-
- @Test
- public void testPrivateGetter() {
- X7 x = new X7();
+
+ @Test
+ public void testPrivateGetter() {
+ X7 x = new X7();
x.id = 100;
x.id = 100;
- X7 y = new X7();
- JpaMergeSupport.merge(x,y);
+ X7 y = new X7();
+ JpaMergeSupport.merge(x,
y);
assertEquals(x.id, y.id);
}
}
assertEquals(x.id, y.id);
}
}