X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FContainerTest.java;h=27a1937ff59f4f7e845022f1bb056397d3c3aa20;hb=971e905b3afccdf5b17e9303cee353a33a6db030;hp=dfd8ed58fc87484130ba82cb307589701a3c6d52;hpb=8a6ee427cf3de42d9dd9d8fea09ee9fd059ee53e;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 dfd8ed58..27a1937f 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
@@ -290,6 +290,8 @@ public class ContainerTest extends TestCase {
 					Thread.currentThread()).toArray(new String[0]));
 			ProvidedInterface[] envServices = environment.getRunningInterfaces();
 			assertEquals(0, envServices.length);
+			assertNull(environment.getProvidedInterfaces()[0].getImplementation());
+			assertNull(environment.getProvidedInterfaces()[0].getImplementation());
 			return;
 		}
 		fail();
@@ -330,8 +332,56 @@ public class ContainerTest extends TestCase {
 					Thread.currentThread()).toArray(new String[0]));
 			ProvidedInterface[] envServices = environment.getRunningInterfaces();
 			assertEquals(0, envServices.length);
+			assertNull(environment.getProvidedInterfaces()[0].getImplementation());
+			assertNull(environment.getProvidedInterfaces()[0].getImplementation());
 			return;
 		}
 		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());	
+	}
 }