X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fpersistence%2FAbstractDetachableTest.java;h=c5745e476b0a579eb624fcbc708cc28aa2cd98f5;hb=4a575582a5c2999bd816b197d9cf274b4b3ddcd7;hp=0a342e7b43f9f1a55ed3018c1e19ab6e27adfc96;hpb=7d3754ca3d757ef89241cdbd679f82941e64cfc6;p=utils 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 0a342e7b..c5745e47 100644 --- 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 detachable; - private X x; + private X x; @Before public void setUp() { @@ -78,18 +78,18 @@ public class AbstractDetachableTest { assertNull(detachable.getObject()); assertEquals(ref, detachable.getReference()); } - + @Test - public void testDetachTwice() { - reset(methods); - testDetach(); - detachable.detach(); - detachable.detach(); + public void testDetachTwice() { + reset(methods); + testDetach(); + detachable.detach(); + detachable.detach(); 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); @@ -97,30 +97,29 @@ public class AbstractDetachableTest { verifyNoMoreInteractions(methods); detachable.detach(); } - + @Test public void testReattach() { - testDetach(); + testDetach(); reset(methods); - + 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(); - verify(methods).load(100); - assertSame(x2, x3); - + verify(methods).load(100); + assertSame(x2, x3); + assertSame(x2, detachable.getObject()); } - + @Test - public void testGetInvokedTwiceNoLoads() { - testReattach(); - reset(methods); - detachable.get(); - detachable.get(); + public void testGetInvokedTwiceNoLoads() { + testReattach(); + reset(methods); + detachable.get(); + detachable.get(); verifyNoMoreInteractions(methods); } - }