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=0f36c08d881879e4e626a9948c73f5d0493d5cf1;hp=34f06a38443df146c4146e162ffec47778fb1e90;hpb=03db7290e3363088298e5382e94b5e95ec2f2486;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 34f06a38..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("setValue", 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("setValue", required.get(0).getName());
-		assertEquals("setXyz", 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("setFlag", required.get(0).getName());
-		assertEquals("setValue", required.get(1).getName());
-		assertEquals("setXyz", 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("setHost", required.get(0).getName());
-		assertEquals("setPort", 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("setValue", required.get(0).getName());
+		assertEquals("setValue.0", required.get(0).getName());
 
 		ProvidedInterface provided = new DefaultProvidedInterface("janse",
 				String.class);
@@ -213,7 +213,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		List<RequiredInterface> required = config.getRequiredInterfaces();
 		Collections.sort(required, new RequiredInterfaceComparator());
 		assertEquals(1, required.size());
-		assertEquals("setHost", 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("setHost", required.get(0).getName());
+		assertEquals("setHost.0", required.get(0).getName());
 
 		ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
 				String.class);
@@ -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,7 +291,7 @@ 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);
 	}
@@ -302,7 +302,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		List<RequiredInterface> required = config.getRequiredInterfaces();
 		Collections.sort(required, new RequiredInterfaceComparator());
 		assertEquals(1, required.size());
-		assertEquals("setHost", required.get(0).getName());
+		assertEquals("setHost.0", required.get(0).getName());
 
 		ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
 				String.class);
@@ -324,7 +324,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         List<RequiredInterface> required = config.getRequiredInterfaces();
         Collections.sort(required, new RequiredInterfaceComparator());
         assertEquals(1, required.size());
-        assertEquals("setHost", required.get(0).getName());
+        assertEquals("setHost.0", required.get(0).getName());
 
         ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
                 String.class);