Config no longer implements Identifiable because this was in violation of the contrac...

[xmlrouter] / impl / src / test / java / org / wamblee / xmlrouter / impl / ConfigImplTest.java

diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java
index aa197eaf54274e44fee6d9ba87555d0381833735..c7b1d9c8660d2d95849411741734017d20620ba0 100644 (file)
--- a/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java
+++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.junit.Before;
 import org.junit.Test;
 import org.wamblee.xmlrouter.common.Id;
-import org.wamblee.xmlrouter.config.Config;
 import org.wamblee.xmlrouter.config.Identifiable;
 
 public class ConfigImplTest {
@@ -35,11 +34,9 @@ public class ConfigImplTest {
     }
 
     private static class MyTypeWrapper implements MyType {
-        private String prefix;
         private MyType type;
 
-        public MyTypeWrapper(String aPrefix, MyType aType) {
-            prefix = aPrefix;
+        public MyTypeWrapper(MyType aType) {
             type = aType;
         }
 
@@ -49,13 +46,13 @@ public class ConfigImplTest {
 
         @Override
         public Id getId() {
-            return new Id(prefix + type.getId().getId());
+            return type.getId();
         }
     }
 
     public static final class MyTypeConfig extends ConfigImpl<MyType> {
-        public MyTypeConfig(Id<Config> aId) {
-            super(aId);
+        public MyTypeConfig(String aId) {
+            super(MyType.class, aId);
         }
 
         public MyTypeConfig(MyTypeConfig aConfig) {
@@ -63,8 +60,8 @@ public class ConfigImplTest {
         }
 
         @Override
-        public MyType wrap(String aPrefix, MyType aT) {
-            return new MyTypeWrapper(aPrefix, aT);
+        public MyType wrap(MyType aT) {
+            return new MyTypeWrapper(aT);
         }
     }
 
@@ -74,7 +71,7 @@ public class ConfigImplTest {
     @Before
     public void setUp() {
         sequence = new AtomicLong(1L);
-        config = new MyTypeConfig(new Id<Config>(CONFIG_TYPE));
+        config = new MyTypeConfig(CONFIG_TYPE);
     }
 
     @Test
@@ -89,8 +86,7 @@ public class ConfigImplTest {
 
         assertTrue(firstValue instanceof MyTypeWrapper);
         assertSame(type1, ((MyTypeWrapper) firstValue).getType());
-        assertEquals(CONFIG_TYPE + "." + type1.getId().getId(), firstValue
-            .getId().getId());
+        assertEquals(type1.getId().getId(), firstValue.getId().getId());
 
         // add another one.
         MyType type2 = mock(MyType.class);
@@ -121,22 +117,11 @@ public class ConfigImplTest {
     @Test
     public void testEquals() {
 
-        Config<MyType> config1 = new ConfigImpl<MyType>(new Id<Config>(
-            CONFIG_TYPE)) {
-            @Override
-            public MyType wrap(String aPrefix, MyType aT) {
-                return new MyTypeWrapper(aPrefix, aT);
-            }
-        };
+        Config<MyType> config1 = new MyTypeConfig(CONFIG_TYPE);
         assertFalse(config1.equals(null));
         assertFalse(config1.equals("hello"));
-        Config<MyType> config2 = new ConfigImpl<MyType>(new Id<Config>(
-            CONFIG_TYPE)) {
-            @Override
-            public MyType wrap(String aPrefix, MyType aT) {
-                return new MyTypeWrapper(aPrefix, aT);
-            }
-        };
+        Config<MyType> config2 = new MyTypeConfig(CONFIG_TYPE);
+
         assertEquals(config1, config2);
         assertEquals(config1.hashCode(), config2.hashCode());
 
@@ -162,7 +147,7 @@ public class ConfigImplTest {
         testAdd();
         assertEquals(2, config.values().size());
         MyTypeConfig copy = new MyTypeConfig(config);
-        assertEquals(config.getId(), config.getId());
+        assertEquals(config.getPrefix(), copy.getPrefix());
         assertEquals(config, copy);
 
         // verify the copy is not shallow