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
/
AbstractDetachableTest.java
diff --git
a/support/general/src/test/java/org/wamblee/persistence/AbstractDetachableTest.java
b/support/general/src/test/java/org/wamblee/persistence/AbstractDetachableTest.java
index 0a342e7b43f9f1a55ed3018c1e19ab6e27adfc96..c5745e476b0a579eb624fcbc708cc28aa2cd98f5 100644
(file)
--- a/
support/general/src/test/java/org/wamblee/persistence/AbstractDetachableTest.java
+++ b/
support/general/src/test/java/org/wamblee/persistence/AbstractDetachableTest.java
@@
-54,7
+54,7
@@
public class AbstractDetachableTest {
private DetachableMethods methods;
private AbstractDetachable<X, Integer> detachable;
private DetachableMethods methods;
private AbstractDetachable<X, Integer> detachable;
- private X x;
+ private X x;
@Before
public void setUp() {
@Before
public void setUp() {
@@
-78,18
+78,18
@@
public class AbstractDetachableTest {
assertNull(detachable.getObject());
assertEquals(ref, detachable.getReference());
}
assertNull(detachable.getObject());
assertEquals(ref, detachable.getReference());
}
-
+
@Test
@Test
- public void testDetachTwice() {
- reset(methods);
- testDetach();
- detachable.detach();
- detachable.detach();
+ public void testDetachTwice() {
+ reset(methods);
+ testDetach();
+ detachable.detach();
+ detachable.detach();
verifyNoMoreInteractions(methods);
}
verifyNoMoreInteractions(methods);
}
-
- @Test(expected = IllegalStateException.class)
- public void testDetachWithNullReference() {
+
+ @Test(expected = IllegalStateException.class)
+ public void testDetachWithNullReference() {
x = new X();
Integer ref = 100;
when(methods.getReference(any(X.class))).thenReturn(null);
x = new X();
Integer ref = 100;
when(methods.getReference(any(X.class))).thenReturn(null);
@@
-97,30
+97,29
@@
public class AbstractDetachableTest {
verifyNoMoreInteractions(methods);
detachable.detach();
}
verifyNoMoreInteractions(methods);
detachable.detach();
}
-
+
@Test
public void testReattach() {
@Test
public void testReattach() {
- testDetach();
+ testDetach();
reset(methods);
reset(methods);
-
+
X x2 = new X(); // the new X loaded from persistent storage.
X x2 = new X(); // the new X loaded from persistent storage.
- when(methods.load(detachable.getReference())).thenReturn(x2);
-
+ when(methods.load(detachable.getReference())).thenReturn(x2);
+
X x3 = detachable.get();
X x3 = detachable.get();
- verify(methods).load(100);
- assertSame(x2, x3);
-
+ verify(methods).load(100);
+ assertSame(x2, x3);
+
assertSame(x2, detachable.getObject());
}
assertSame(x2, detachable.getObject());
}
-
+
@Test
@Test
- public void testGetInvokedTwiceNoLoads() {
- testReattach();
- reset(methods);
- detachable.get();
- detachable.get();
+ public void testGetInvokedTwiceNoLoads() {
+ testReattach();
+ reset(methods);
+ detachable.get();
+ detachable.get();
verifyNoMoreInteractions(methods);
}
verifyNoMoreInteractions(methods);
}
-
}
}