X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FSetterConfigurationTest.java;h=ce0a8d89d76dd222d999245d09f2611bf9f05828;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=730dfe6d84329d2d284999a72ccdaf386385af8d;hpb=2680fc967c8e19bcc91d3a62cdb8e7ad25aa204e;p=utils

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 730dfe6d..ce0a8d89 100644
--- 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,24 +33,26 @@ 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());
+		assertEquals("setValue.0", required.get(0).getName());
 
 		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());
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("hello", obj.getValue());
 	}
 
 	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>() {
@@ -60,25 +62,25 @@ public class SetterConfigurationTest extends AdapterTestCase {
 			}
 		});
 		assertEquals(2, required.size());
-		assertEquals("value", required.get(0).getName());
-		assertEquals("xyz", required.get(1).getName());
+		assertEquals("setValue.0", required.get(0).getName());
+		assertEquals("setXyz.0", required.get(1).getName());
 
 		ProvidedInterface providedString = new DefaultProvidedInterface(
 				"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());
 		assertNull(obj.getXyz());
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("hello", obj.getValue());
 		assertEquals(100, obj.getXyz().intValue());
 	}
@@ -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>() {
@@ -95,95 +98,95 @@ public class SetterConfigurationTest extends AdapterTestCase {
 			}
 		});
 		assertEquals(3, required.size());
-		assertEquals("flag", required.get(0).getName());
-		assertEquals("value", required.get(1).getName());
-		assertEquals("xyz", required.get(2).getName());
+		assertEquals("setFlag.0", required.get(0).getName());
+		assertEquals("setValue.0", required.get(1).getName());
+		assertEquals("setXyz.0", required.get(2).getName());
 
 		ProvidedInterface providedBoolean = new DefaultProvidedInterface(
 				"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());
 		assertNull(obj.getXyz());
 		assertFalse(obj.isFlag());
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("hello", obj.getValue());
 		assertEquals(100, obj.getXyz().intValue());
 		assertTrue(obj.isFlag());
 	}
 
 	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());
-		assertEquals("host", required.get(0).getName());
-		assertEquals("port", required.get(1).getName());
+		assertEquals("setHost.0", required.get(0).getName());
+		assertEquals("setPort.0", required.get(1).getName());
 
 		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());
 		assertNull(obj.getPort());
 
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("hello", obj.getHost());
 		assertEquals(10, obj.getPort().intValue());
 	}
 
 	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());
+		assertEquals("setValue.0", required.get(0).getName());
 
 		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() {
 			@Override
 			public void run() throws Exception {
-				config.inject(_scope, obj);
+				config.inject(scope, obj);
 			}
 		}, IllegalArgumentException.class);
 	}
 
 	public void testSetExplicitValue() {
-		SetterConfiguration config = new SetterConfiguration(X5.class);
-		config.values("value").setValue(0, "bladibla");
+		SetterConfiguration config = new SetterConfiguration(X5.class).initAllSetters();
+		config.values("setValue").setValue(0, "bladibla");
 
 		List<RequiredInterface> required = config.getRequiredInterfaces();
 		assertEquals(0, required.size());
 
 		X5 obj = new X5();
 		assertNull(obj.getValue());
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("bladibla", obj.getValue());
 	}
 
@@ -198,7 +201,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		assertNull(obj.getHost());
 		assertNull(obj.getPort());
 
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 
 		assertNull(obj.getHost());
 		assertNull(obj.getPort());
@@ -206,44 +209,44 @@ public class SetterConfigurationTest extends AdapterTestCase {
 
 	public void testAddByName() {
 		SetterConfiguration config = new SetterConfiguration(X6.class);
-		config.clear().add("host");
+		config.clear().add("setHost");
 		List<RequiredInterface> required = config.getRequiredInterfaces();
 		Collections.sort(required, new RequiredInterfaceComparator());
 		assertEquals(1, required.size());
-		assertEquals("host", required.get(0).getName());
+		assertEquals("setHost.0", required.get(0).getName());
 
 		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());
 		assertNull(obj.getPort());
 
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("hello", obj.getHost());
 		assertNull(obj.getPort());
 	}
 	
 	public void testAddByType() { 
 		SetterConfiguration config = new SetterConfiguration(X6.class);
-		config.clear().add(String.class);
+		config.clear().addSetter(String.class);
 		List<RequiredInterface> required = config.getRequiredInterfaces();
 		Collections.sort(required, new RequiredInterfaceComparator());
 		assertEquals(1, required.size());
-		assertEquals("host", required.get(0).getName());
+		assertEquals("setHost.0", required.get(0).getName());
 
 		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());
 		assertNull(obj.getPort());
 
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("hello", obj.getHost());
 		assertNull(obj.getPort());
 	}
@@ -260,7 +263,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		
 		config.setNonPublic(true);
 		config.clear();
-		config.add("xyz");
+		config.add("setXyz");
 		assertEquals(1, config.getRequiredInterfaces().size());
 	}
 
@@ -277,7 +280,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
 			@Override
 			public void run() throws Exception {
-				config.add(DataSource.class);
+				config.addSetter(DataSource.class);
 			}
 		}, IllegalArgumentException.class);
 	}
@@ -288,32 +291,54 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
 			@Override
 			public void run() throws Exception {
-				config.add(String.class);
+				config.addSetter(String.class);
 			}
 		}, IllegalArgumentException.class);
 	}
 
 	public void testRemove() {
-		SetterConfiguration config = new SetterConfiguration(X6.class);
-		config.remove("port");
+		SetterConfiguration config = new SetterConfiguration(X6.class).initAllSetters();
+		config.remove("setPort");
 		List<RequiredInterface> required = config.getRequiredInterfaces();
 		Collections.sort(required, new RequiredInterfaceComparator());
 		assertEquals(1, required.size());
-		assertEquals("host", required.get(0).getName());
+		assertEquals("setHost.0", required.get(0).getName());
 
 		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());
 		assertNull(obj.getPort());
 
-		config.inject(_scope, obj);
+		config.inject(scope, obj);
 		assertEquals("hello", obj.getHost());
 		assertNull(obj.getPort());
 	}
+	
+	public void testRemoveByMethodObject() throws NoSuchMethodException {
+        SetterConfiguration config = new SetterConfiguration(X6.class).initAllSetters();
+        config.remove(X6.class.getMethod("setPort", Integer.class));
+        List<RequiredInterface> required = config.getRequiredInterfaces();
+        Collections.sort(required, new RequiredInterfaceComparator());
+        assertEquals(1, required.size());
+        assertEquals("setHost.0", required.get(0).getName());
+
+        ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
+                String.class);
+        required.get(0).setProvider(provided0);
+        scope.publishInterface(provided0, "hello");
+
+        X6 obj = new X6();
+        assertNull(obj.getHost());
+        assertNull(obj.getPort());
+
+        config.inject(scope, obj);
+        assertEquals("hello", obj.getHost());
+        assertNull(obj.getPort());
+    }
 
 	public void testRemoveNonExisting() {
 		final SetterConfiguration config = new SetterConfiguration(X6.class);
@@ -327,7 +352,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());