X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FSingleRouterConfigTest.java;h=280e6dac420fb78b05b89a8c2f0ce6c1051bd0c3;hb=e52385618670b54a5c6a4f2fbfab381bef43a905;hp=af347372a4fdfdc79fec1bbf38dd543dc53cbe89;hpb=0db97b9f39c69528900f915dd2bb463c27debe39;p=xmlrouter

diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java
index af34737..280e6da 100644
--- a/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java
+++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java
@@ -18,68 +18,64 @@ package org.wamblee.xmlrouter.impl;
 import static junit.framework.Assert.*;
 import static org.mockito.Mockito.*;
 
-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.DocumentType;
 import org.wamblee.xmlrouter.config.Filter;
+import org.wamblee.xmlrouter.config.RouterConfig;
 import org.wamblee.xmlrouter.config.Transformation;
 
 public class SingleRouterConfigTest {
 
-    private AtomicLong sequence;
     private ExtendedRouterConfig config;
 
     @Before
     public void setUp() {
-        sequence = new AtomicLong(1L);
-        config = new SingleRouterConfig(sequence);
+        config = new SingleRouterConfig(new Id<RouterConfig>("routerconfig"));
     }
 
     @Test
     public void testDocumentType() {
         DocumentType type1 = mock(DocumentType.class);
+        when(type1.getId()).thenReturn(new Id<DocumentType>("type1"));
         DocumentType type2 = mock(DocumentType.class);
+        when(type1.getId()).thenReturn(new Id<DocumentType>("type2"));
 
-        Id<DocumentType> id1 = config.documentTypeConfig().add(type1);
-
-        Id<DocumentType> id2 = config.documentTypeConfig().add(type2);
-        assertFalse(id1.equals(id2));
-
-        assertEquals(2, config.documentTypeConfig().map().size());
-        assertTrue(config.documentTypeConfig().map().get(id1) instanceof RobustDocumentType);
+        config.documentTypeConfig().add(type1);
+        config.documentTypeConfig().add(type2);
 
+        assertEquals(2, config.documentTypeConfig().values().size());
+        assertTrue(config.documentTypeConfig().values().get(0) instanceof RobustDocumentType);
     }
 
     @Test
     public void testTransformation() {
         Transformation transformation1 = mock(Transformation.class);
+        when(transformation1.getId()).thenReturn(new Id<Transformation>("t1"));
         Transformation transformation2 = mock(Transformation.class);
+        when(transformation1.getId()).thenReturn(new Id<Transformation>("t2"));
 
-        Id<Transformation> id1 = config.transformationConfig().add(
-            transformation1);
+        config.transformationConfig().add(transformation1);
 
-        Id<Transformation> id2 = config.transformationConfig().add(
-            transformation2);
-        assertFalse(id1.equals(id2));
+        config.transformationConfig().add(transformation2);
 
-        assertEquals(2, config.transformationConfig().map().size());
-        assertTrue(config.transformationConfig().map().get(id1) instanceof RobustTransformation);
+        assertEquals(2, config.transformationConfig().values().size());
+        assertTrue(config.transformationConfig().values().get(0) instanceof RobustTransformation);
     }
 
     @Test
     public void testFilter() {
         Filter filter1 = mock(Filter.class);
+        when(filter1.getId()).thenReturn(new Id<Filter>("f1"));
         Filter filter2 = mock(Filter.class);
+        when(filter1.getId()).thenReturn(new Id<Filter>("f2"));
 
-        Id<Filter> id1 = config.filterConfig().add(filter1);
+        config.filterConfig().add(filter1);
 
-        Id<Filter> id2 = config.filterConfig().add(filter2);
-        assertFalse(id1.equals(id2));
+        config.filterConfig().add(filter2);
 
-        assertEquals(2, config.filterConfig().map().size());
-        assertTrue(config.filterConfig().map().get(id1) instanceof RobustFilter);
+        assertEquals(2, config.filterConfig().values().size());
+        assertTrue(config.filterConfig().values().get(0) instanceof RobustFilter);
     }
 }