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 {
@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) {
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) {
@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) {
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) {