X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FSetterConfigurationTest.java;h=aebdc3dffee1d3c742a706432cfcb8dd258b0045;hb=4759a6709085fa9426a1fc1842444d61f9f61e94;hp=1d7ec75e3648d35b15842da61f216e07e482a3f4;hpb=db8ff5916d378aae57038356dbf2a3d2fbf9deff;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 1d7ec75e..aebdc3df 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
@@ -36,7 +36,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		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);
@@ -62,8 +62,8 @@ 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);
@@ -98,9 +98,9 @@ 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);
@@ -135,8 +135,8 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		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);
@@ -161,7 +161,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		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);
@@ -179,7 +179,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 
 	public void testSetExplicitValue() {
 		SetterConfiguration config = new SetterConfiguration(X5.class).initAllSetters();
-		config.values("value").setValue(0, "bladibla");
+		config.values("setValue").setValue(0, "bladibla");
 
 		List<RequiredInterface> required = config.getRequiredInterfaces();
 		assertEquals(0, required.size());
@@ -209,11 +209,11 @@ 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);
@@ -231,11 +231,11 @@ public class SetterConfigurationTest extends AdapterTestCase {
 	
 	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);
@@ -263,7 +263,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		
 		config.setNonPublic(true);
 		config.clear();
-		config.add("xyz");
+		config.add("setXyz");
 		assertEquals(1, config.getRequiredInterfaces().size());
 	}
 
@@ -280,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);
 	}
@@ -291,18 +291,18 @@ 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).initAllSetters();
-		config.remove("port");
+		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);
@@ -317,6 +317,28 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		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);