(no commit message)

[utils] / system / general / src / test / java / org / wamblee / system / adapters / SetterConfigurationTest.java

diff --git a/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java b/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
index 730dfe6d84329d2d284999a72ccdaf386385af8d..1d7ec75e3648d35b15842da61f216e07e482a3f4 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
@@ -33,6 +33,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 
        public void testOneSetter() {
                SetterConfiguration config = new SetterConfiguration(X5.class);
+               config.initAllSetters();
                List<RequiredInterface> required = config.getRequiredInterfaces();
                assertEquals(1, required.size());
                assertEquals("value", required.get(0).getName());
@@ -40,7 +41,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
                ProvidedInterface provided = new DefaultProvidedInterface("janse",
                                String.class);
                required.get(0).setProvider(provided);
-               provided.publish("hello", _scope);
+               _scope.publishInterface(provided, "hello");
 
                X5 obj = new X5();
                assertNull(obj.getValue());
@@ -51,6 +52,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
        public void testPrivateSetter() {
                SetterConfiguration config = new SetterConfiguration(X5.class);
                config.setNonPublic(true);
+               config.initAllSetters();
                List<RequiredInterface> required = new ArrayList<RequiredInterface>(
                                config.getRequiredInterfaces());
                Collections.sort(required, new Comparator<RequiredInterface>() {
@@ -67,13 +69,13 @@ public class SetterConfigurationTest extends AdapterTestCase {
                                "janse", String.class);
                assertTrue(required.get(0).implementedBy(providedString));
                required.get(0).setProvider(providedString);
-               providedString.publish("hello", _scope);
+               _scope.publishInterface(providedString, "hello");
 
                ProvidedInterface providedInt = new DefaultProvidedInterface("xxx",
                                Integer.class);
                assertTrue(required.get(1).implementedBy(providedInt));
                required.get(1).setProvider(providedInt);
-               providedInt.publish(100, _scope);
+               _scope.publishInterface(providedInt, 100);
 
                X5 obj = new X5();
                assertNull(obj.getValue());
@@ -86,6 +88,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
        public void testInheritance() {
                SetterConfiguration config = new SetterConfiguration(X9.class);
                config.setNonPublic(true);
+               config.initAllSetters();
                List<RequiredInterface> required = new ArrayList<RequiredInterface>(
                                config.getRequiredInterfaces());
                Collections.sort(required, new Comparator<RequiredInterface>() {
@@ -103,19 +106,19 @@ public class SetterConfigurationTest extends AdapterTestCase {
                                "janse", Boolean.class);
                assertTrue(required.get(0).implementedBy(providedBoolean));
                required.get(0).setProvider(providedBoolean);
-               providedBoolean.publish(true, _scope);
+               _scope.publishInterface(providedBoolean, true);
 
                ProvidedInterface providedString = new DefaultProvidedInterface(
                                "janse", String.class);
                assertTrue(required.get(1).implementedBy(providedString));
                required.get(1).setProvider(providedString);
-               providedString.publish("hello", _scope);
+               _scope.publishInterface(providedString, "hello");
 
                ProvidedInterface providedInt = new DefaultProvidedInterface("xxx",
                                Integer.class);
                assertTrue(required.get(2).implementedBy(providedInt));
                required.get(2).setProvider(providedInt);
-               providedInt.publish(100, _scope);
+               _scope.publishInterface(providedInt, 100);
 
                X9 obj = new X9();
                assertNull(obj.getValue());
@@ -128,7 +131,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
        }
 
        public void testMultipleSetters() {
-               SetterConfiguration config = new SetterConfiguration(X6.class);
+               SetterConfiguration config = new SetterConfiguration(X6.class).initAllSetters();
                List<RequiredInterface> required = config.getRequiredInterfaces();
                Collections.sort(required, new RequiredInterfaceComparator());
                assertEquals(2, required.size());
@@ -138,12 +141,12 @@ public class SetterConfigurationTest extends AdapterTestCase {
                ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
                                String.class);
                required.get(0).setProvider(provided0);
-               provided0.publish("hello", _scope);
+               _scope.publishInterface(provided0, "hello");
 
                ProvidedInterface provided1 = new DefaultProvidedInterface("port",
                                Integer.class);
                required.get(1).setProvider(provided1);
-               provided1.publish(10, _scope);
+               _scope.publishInterface(provided1, 10);
 
                X6 obj = new X6();
                assertNull(obj.getHost());
@@ -155,7 +158,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
        }
 
        public void testInvokeWrongType() {
-               final SetterConfiguration config = new SetterConfiguration(X5.class);
+               final SetterConfiguration config = new SetterConfiguration(X5.class).initAllSetters();
                List<RequiredInterface> required = config.getRequiredInterfaces();
                assertEquals(1, required.size());
                assertEquals("value", required.get(0).getName());
@@ -163,7 +166,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
                ProvidedInterface provided = new DefaultProvidedInterface("janse",
                                String.class);
                required.get(0).setProvider(provided);
-               provided.publish("hello", _scope);
+               _scope.publishInterface(provided, "hello");
 
                final X6 obj = new X6();
                AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
@@ -175,7 +178,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
        }
 
        public void testSetExplicitValue() {
-               SetterConfiguration config = new SetterConfiguration(X5.class);
+               SetterConfiguration config = new SetterConfiguration(X5.class).initAllSetters();
                config.values("value").setValue(0, "bladibla");
 
                List<RequiredInterface> required = config.getRequiredInterfaces();
@@ -215,7 +218,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
                ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
                                String.class);
                required.get(0).setProvider(provided0);
-               provided0.publish("hello", _scope);
+               _scope.publishInterface(provided0, "hello");
 
                X6 obj = new X6();
                assertNull(obj.getHost());
@@ -237,7 +240,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
                ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
                                String.class);
                required.get(0).setProvider(provided0);
-               provided0.publish("hello", _scope);
+               _scope.publishInterface(provided0, "hello");
 
                X6 obj = new X6();
                assertNull(obj.getHost());
@@ -294,7 +297,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
        }
 
        public void testRemove() {
-               SetterConfiguration config = new SetterConfiguration(X6.class);
+               SetterConfiguration config = new SetterConfiguration(X6.class).initAllSetters();
                config.remove("port");
                List<RequiredInterface> required = config.getRequiredInterfaces();
                Collections.sort(required, new RequiredInterfaceComparator());
@@ -304,7 +307,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
                ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
                                String.class);
                required.get(0).setProvider(provided0);
-               provided0.publish("hello", _scope);
+               _scope.publishInterface(provided0, "hello");
 
                X6 obj = new X6();
                assertNull(obj.getHost());
@@ -327,7 +330,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
        }
        
        public void testOverridingSetters() { 
-               SetterConfiguration config = new SetterConfiguration(X10.class);
+               SetterConfiguration config = new SetterConfiguration(X10.class).initAllSetters();
                assertEquals(2, config.getRequiredInterfaces().size());
                List<Method> methods = config.getSetters(); 
                assertEquals(2, methods.size());