X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FRobustIdentifiableTest.java;h=511f583196175a564b5ab64b418818b59469995d;hb=9dbc2844950b55ae552fe74840954ea71b754c7a;hp=257ea93a171d93c99ded1fa7ff9e27e4e027ac18;hpb=747a76582ebfd3e0696c40e6d0ca21fcd2e1be60;p=xmlrouter diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java index 257ea93..511f583 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.*; import org.junit.Before; import org.junit.Test; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.Identifiable; public class RobustIdentifiableTest { @@ -37,26 +36,26 @@ public class RobustIdentifiableTest { public void testIdIsNull() { when(ident.getId()).thenReturn(null); RobustIdentifiable robust = new RobustIdentifiable( - "prefix", ident); + ident); } @Test(expected = ConfigException.class) public void testIdThrowsException() { doThrow(new RuntimeException("xxx")).when(ident).getId(); RobustIdentifiable robust = new RobustIdentifiable( - "prefix", ident); + ident); } @Test public void testNormalCase() { when(ident.getId()).thenReturn(new Id("myid")); RobustIdentifiable robust = new RobustIdentifiable( - "prefix.", ident); - assertEquals("prefix.myid", robust.getId().toString()); + ident); + assertEquals("myid", robust.getId().toString()); // changes later do not have any effect, the id should be immutable. when(ident.getId()).thenReturn(new Id("myid2")); - assertEquals("prefix.myid", robust.getId().toString()); + assertEquals("myid", robust.getId().toString()); } @Test @@ -70,11 +69,11 @@ public class RobustIdentifiableTest { when(ident3.getId()).thenReturn(new Id("x")); RobustIdentifiable robust1 = new RobustIdentifiable( - "prefix.", ident1); + ident1); RobustIdentifiable robust2 = new RobustIdentifiable( - "prefix.", ident2); + ident2); RobustIdentifiable robust3 = new RobustIdentifiable( - "prefix.", ident3); + ident3); assertEquals(robust1, robust1); assertEquals(robust1, robust3);