X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FCompositeConfigTest.java;h=9905046d9463998e38f5cb5c4e92cf487b4a3a6a;hb=d7938dd34e22ba8d34b4a89840c6efbb5d866380;hp=1875d4b96d6ab65238eb6b1629a77f22242acaae;hpb=03a6b404471945aed9d48fc1e5b8447b4a9d9413;p=xmlrouter

diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java
index 1875d4b..9905046 100644
--- a/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java
+++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import org.junit.Test;
 import org.wamblee.xmlrouter.common.Id;
 import org.wamblee.xmlrouter.config.Config;
-import org.wamblee.xmlrouter.config.DuplicateException;
+import org.wamblee.xmlrouter.config.ConfigException;
 import org.wamblee.xmlrouter.config.Identifiable;
 
 public class CompositeConfigTest {
@@ -60,24 +60,23 @@ public class CompositeConfigTest {
 
     @Test
     public void testEmptyConfig() {
-        Config<IntClass> composite = composite("c");
-        assertEquals(id("c"), composite.getId());
+        Config<IntClass> composite = composite();
         assertTrue(composite.values().isEmpty());
     }
 
     @Test(expected = RuntimeException.class)
     public void testAddNotAllowed() {
-        composite("c").add(new IntClass(10));
+        composite().add(new IntClass(10));
     }
 
     @Test(expected = RuntimeException.class)
     public void testRemoveNotAllowed() {
-        composite("c").remove(new Id<IntClass>("xxx"));
+        composite().remove(new Id<IntClass>("xxx"));
     }
 
     @Test
     public void testAddConfig() {
-        CompositeConfig<IntClass> composite = composite("c");
+        CompositeConfig<IntClass> composite = composite();
         Config<IntClass> c1 = new ConfigImpl(id("c1")) {
             @Override
             public Identifiable wrap(String aPrefix, Identifiable aT) {
@@ -116,9 +115,9 @@ public class CompositeConfigTest {
         assertTrue(values.contains(i4));
     }
 
-    @Test(expected = DuplicateException.class)
+    @Test(expected = ConfigException.class)
     public void testDuplicatesNotAllowed() {
-        CompositeConfig<IntClass> composite = composite("c");
+        CompositeConfig<IntClass> composite = composite();
         Config<IntClass> c1 = new ConfigImpl(id("c1")) {
             @Override
             public Identifiable wrap(String aPrefix, Identifiable aT) {
@@ -137,7 +136,7 @@ public class CompositeConfigTest {
 
     @Test
     public void testDuplicateItem() {
-        CompositeConfig<IntClass> composite = composite("c");
+        CompositeConfig<IntClass> composite = composite();
         Config<IntClass> c1 = new ConfigImpl(id("c1")) {
             @Override
             public Identifiable wrap(String aPrefix, Identifiable aT) {
@@ -159,15 +158,15 @@ public class CompositeConfigTest {
         try {
             composite.addConfig(c2);
             fail();
-        } catch (DuplicateException e) {
+        } catch (ConfigException e) {
             // ok.
         }
         assertEquals(1, composite.values().size());
         assertTrue(composite.values().contains(i1));
     }
 
-    private CompositeConfig<IntClass> composite(String aId) {
-        return new CompositeConfig<IntClass>(id(aId));
+    private CompositeConfig<IntClass> composite() {
+        return new CompositeConfig<IntClass>();
     }
 
     private Id<Config> id(String aId) {