X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FContainerTest.java;h=86d5760b430918fbfd3b5bf094c306f9b622910e;hb=2768257dc89eeac0398e8b5ec42b0ff031e0e344;hp=5a7fa90bf1c4137af659cae507d726b70e6eb858;hpb=987883c7c81d612ff26eaf43e58a443f5a9b77ba;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java b/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
index 5a7fa90b..86d5760b 100644
--- a/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
@@ -161,7 +161,7 @@ public class ContainerTest extends TestCase {
 			Container system = new Container("all", new Component[] {
 					environment, application },
 					new ProvidedInterface[] { new DefaultProvidedInterface(
-							"string", String.class) },
+							"float", Float.class) },
 					new DefaultRequiredInterface[0]);
 		} catch (SystemAssemblyException e) {
 			return;
@@ -190,9 +190,9 @@ public class ContainerTest extends TestCase {
 		Container system = new Container("all", new Component[] { environment,
 				application }, new ProvidedInterface[0],
 				new RequiredInterface[] { new DefaultRequiredInterface(
-						"string", String.class) });
+						"float", Float.class) });
 		system.getRequiredInterfaces()[0]
-				.setProvider(new DefaultProvidedInterface("hallo", String.class));
+				.setProvider(new DefaultProvidedInterface("hallo", Float.class));
 		system.start();
 		RequiredInterface[] required = system.getRequiredInterfaces();
 		assertEquals(1, required.length);
@@ -338,4 +338,50 @@ public class ContainerTest extends TestCase {
 		}
 		fail();
 	}
+	
+	public void testOptionalRequiredInterfaceProvidedOptionalInternal() {
+		Application application = new Application(true);
+		Container container = new Container("top", new Component[] { application }, 
+				new ProvidedInterface[0], Application.required(true));
+		Environment env = new Environment();
+		container.getRequiredInterfaces()[0].setProvider(
+				env.getProvidedInterfaces()[0]); 
+		container.getRequiredInterfaces()[1].setProvider(
+				env.getProvidedInterfaces()[1]);
+	    container.start();
+	    assertSame(env.getProvidedInterfaces()[0], container.getRequiredInterfaces()[0].getProvider());
+	    assertSame(env.getProvidedInterfaces()[1], container.getRequiredInterfaces()[1].getProvider());
+	    assertSame(env.getProvidedInterfaces()[0], application.getRequiredInterfaces()[0].getProvider());
+	    assertSame(env.getProvidedInterfaces()[1], application.getRequiredInterfaces()[1].getProvider());
+	}
+	
+	public void testOptionalRequiredInterfaceNotProvidedOptionalInternal() {
+		Application application = new Application(true);
+		Container container = new Container("top", new Component[] { application }, 
+				new ProvidedInterface[0], Application.required(true));
+		Environment env = new Environment();
+		container.getRequiredInterfaces()[0].setProvider(
+				env.getProvidedInterfaces()[0]); 
+	    container.start();
+	    assertSame(env.getProvidedInterfaces()[0], container.getRequiredInterfaces()[0].getProvider());
+	    assertNull(container.getRequiredInterfaces()[1].getProvider());
+	    assertSame(env.getProvidedInterfaces()[0], application.getRequiredInterfaces()[0].getProvider());
+	    assertNull(application.getRequiredInterfaces()[1].getProvider());
+	}
+	
+	public void testOptionalRequiredInterfaceProvidedMandatoryInternal() { 
+		Application application = new Application();
+		Container container = new Container("top", new Component[] { application }, 
+				new ProvidedInterface[0], Application.required(true));
+		Environment env = new Environment();
+		container.getRequiredInterfaces()[0].setProvider(
+				env.getProvidedInterfaces()[0]); 
+		container.getRequiredInterfaces()[1].setProvider(
+				env.getProvidedInterfaces()[1]);
+	    container.start();
+	    assertSame(env.getProvidedInterfaces()[0], container.getRequiredInterfaces()[0].getProvider());
+	    assertSame(env.getProvidedInterfaces()[1], container.getRequiredInterfaces()[1].getProvider());
+	    assertSame(env.getProvidedInterfaces()[0], application.getRequiredInterfaces()[0].getProvider());
+	    assertSame(env.getProvidedInterfaces()[1], application.getRequiredInterfaces()[1].getProvider());	
+	}
 }