X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=trunk%2Fsystem%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FSetterConfigurationTest.java;h=e13c9fc03a49f29bc913231a372dd765d14288c9;hb=b6c16040f96c24b4526cfbce3da9dd2c529a7f48;hp=2b7bd9187477d85981057caa10d8580edce682e9;hpb=5faed8f9a51f44c5787220ffb34be9ae53e8e930;p=utils

diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java b/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
index 2b7bd918..e13c9fc0 100644
--- a/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
+++ b/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
@@ -15,11 +15,14 @@
  */
 package org.wamblee.system.adapters;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import javax.sql.DataSource;
+
 import org.wamblee.system.core.DefaultProvidedInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
@@ -30,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());
@@ -48,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>() {
@@ -83,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>() {
@@ -125,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());
@@ -152,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());
@@ -172,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();
@@ -201,7 +207,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		assertNull(obj.getPort());
 	}
 
-	public void testAdd() {
+	public void testAddByName() {
 		SetterConfiguration config = new SetterConfiguration(X6.class);
 		config.clear().add("host");
 		List<RequiredInterface> required = config.getRequiredInterfaces();
@@ -222,6 +228,44 @@ public class SetterConfigurationTest extends AdapterTestCase {
 		assertEquals("hello", obj.getHost());
 		assertNull(obj.getPort());
 	}
+	
+	public void testAddByType() { 
+		SetterConfiguration config = new SetterConfiguration(X6.class);
+		config.clear().add(String.class);
+		List<RequiredInterface> required = config.getRequiredInterfaces();
+		Collections.sort(required, new RequiredInterfaceComparator());
+		assertEquals(1, required.size());
+		assertEquals("host", required.get(0).getName());
+
+		ProvidedInterface provided0 = new DefaultProvidedInterface("janse",
+				String.class);
+		required.get(0).setProvider(provided0);
+		provided0.publish("hello", _scope);
+
+		X6 obj = new X6();
+		assertNull(obj.getHost());
+		assertNull(obj.getPort());
+
+		config.inject(_scope, obj);
+		assertEquals("hello", obj.getHost());
+		assertNull(obj.getPort());
+	}
+	
+	public void testAddPrivate() { 
+		X5 obj = new X5();
+		final SetterConfiguration config = new SetterConfiguration(X5.class);
+		AssertionUtils.assertException(new AssertionUtils.ErroneousCode() { 
+			@Override
+			public void run() throws Exception {
+				config.add("xyz");	
+			}
+		}, IllegalArgumentException.class);
+		
+		config.setNonPublic(true);
+		config.clear();
+		config.add("xyz");
+		assertEquals(1, config.getRequiredInterfaces().size());
+	}
 
 	public void testAddNonExisting() {
 		final SetterConfiguration config = new SetterConfiguration(X6.class);
@@ -233,10 +277,27 @@ public class SetterConfigurationTest extends AdapterTestCase {
 				config.add("bladibla");
 			}
 		}, IllegalArgumentException.class);
+		AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
+			@Override
+			public void run() throws Exception {
+				config.add(DataSource.class);
+			}
+		}, IllegalArgumentException.class);
+	}
+	
+	public void testAddByTypeNonUnique() { 
+		final SetterConfiguration config = new SetterConfiguration(X11.class);
+		config.clear();
+		AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
+			@Override
+			public void run() throws Exception {
+				config.add(String.class);
+			}
+		}, IllegalArgumentException.class);
 	}
 
 	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());
@@ -267,4 +328,15 @@ public class SetterConfigurationTest extends AdapterTestCase {
 			}
 		}, IllegalArgumentException.class);
 	}
+	
+	public void testOverridingSetters() { 
+		SetterConfiguration config = new SetterConfiguration(X10.class).initAllSetters();
+		assertEquals(2, config.getRequiredInterfaces().size());
+		List<Method> methods = config.getSetters(); 
+		assertEquals(2, methods.size());
+		for (Method method: methods) { 
+			assertEquals(X10.class, method.getDeclaringClass());
+		}
+		
+	}
 }