X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FSystemAssemblerTest.java;h=df08998e4b7351b2b1cd82963da44efa32b9b4e5;hb=e055966cbba51cbf35546dbc50f29516cf6e304f;hp=ab8bae6902debd4b49c16554c57345166f9f19fd;hpb=c46775f3e159ba9db714cfa9636881f2c6d4e873;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java b/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java
index ab8bae69..df08998e 100644
--- a/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java
@@ -42,21 +42,22 @@ public class SystemAssemblerTest extends TestCase {
 				SystemAssembler.filterRequiredServices(prov1, Arrays
 						.asList(new RequiredInterfaceDescriptor[] { req1 })));
 		AssertionUtils.assertEquals(new RequiredInterfaceDescriptor[] { req1 },
-				SystemAssembler
-						.filterRequiredServices(prov1, Arrays
-								.asList(new RequiredInterfaceDescriptor[] { req1,
-										req2 })));
+				SystemAssembler.filterRequiredServices(prov1,
+						Arrays.asList(new RequiredInterfaceDescriptor[] { req1,
+								req2 })));
 		AssertionUtils.assertEquals(new RequiredInterfaceDescriptor[] { req1,
 				req2 }, SystemAssembler.filterRequiredServices(prov3, Arrays
 				.asList(new RequiredInterfaceDescriptor[] { req1, req2 })));
 
-		AssertionUtils.assertEquals(new ProvidedInterfaceDescriptor[] { prov1 },
+		AssertionUtils.assertEquals(
+				new ProvidedInterfaceDescriptor[] { prov1 },
 				SystemAssembler.filterProvidedServices(req1, Arrays
 						.asList(new ProvidedInterfaceDescriptor[] { prov1 })));
-		AssertionUtils.assertEquals(new ProvidedInterfaceDescriptor[] { prov1 },
-				SystemAssembler.filterProvidedServices(req1,
-						Arrays.asList(new ProvidedInterfaceDescriptor[] { prov1,
-								prov2 })));
+		AssertionUtils.assertEquals(
+				new ProvidedInterfaceDescriptor[] { prov1 }, SystemAssembler
+						.filterProvidedServices(req1, Arrays
+								.asList(new ProvidedInterfaceDescriptor[] {
+										prov1, prov2 })));
 		AssertionUtils.assertEquals(new ProvidedInterfaceDescriptor[] { prov1,
 				prov3 }, SystemAssembler.filterProvidedServices(req1, Arrays
 				.asList(new ProvidedInterfaceDescriptor[] { prov1, prov3 })));
@@ -101,9 +102,9 @@ public class SystemAssemblerTest extends TestCase {
 		Component application = new Application(_registry);
 		assertEquals(Status.NOT_STARTED, environment.getStatus());
 		assertEquals(Status.NOT_STARTED, application.getStatus());
-		CompositeComponent system = new CompositeComponent("all", _registry,
-				new Component[] { environment, application },
-				new InterfaceDescriptor[0], new InterfaceDescriptor[0]);
+		Container system = new Container("all", _registry, new Component[] {
+				environment, application }, new ProvidedInterfaceDescriptor[0],
+				new RequiredInterfaceDescriptor[0]);
 		assertEquals(Status.NOT_STARTED, system.getStatus());
 		system.start("root", new Service[0]);
 		InterfaceDescriptor[] required = system.getRequiredServices();
@@ -113,7 +114,7 @@ public class SystemAssemblerTest extends TestCase {
 		assertEquals(Status.RUNNING, environment.getStatus());
 		assertEquals(Status.RUNNING, application.getStatus());
 		assertEquals(Status.RUNNING, system.getStatus());
-		
+
 		system.stop();
 		assertEquals(Status.STOPPED, environment.getStatus());
 		assertEquals(Status.STOPPED, application.getStatus());
@@ -124,11 +125,11 @@ public class SystemAssemblerTest extends TestCase {
 		try {
 			Component environment = new Environment(_registry);
 			Component application = new Application(_registry);
-			CompositeComponent system = new CompositeComponent(
+			Container system = new Container(
 					"all",
 					_registry,
 					new Component[] { environment, application },
-					new InterfaceDescriptor[] { new DefaultProvidedInterfaceDescriptor(
+					new ProvidedInterfaceDescriptor[] { new DefaultProvidedInterfaceDescriptor(
 							"string", String.class) },
 					new DefaultRequiredInterfaceDescriptor[0]);
 		} catch (SystemAssemblyException e) {
@@ -140,15 +141,17 @@ public class SystemAssemblerTest extends TestCase {
 	public void testCompositeWithSuperfluousRequiredInfo() {
 		Component environment = new Environment(_registry);
 		Component application = new Application(_registry);
-		CompositeComponent system = new CompositeComponent("all", _registry,
+		Container system = new Container(
+				"all",
+				_registry,
 				new Component[] { environment, application },
-				new InterfaceDescriptor[0],
-				new InterfaceDescriptor[] { new DefaultRequiredInterfaceDescriptor(
+				new ProvidedInterfaceDescriptor[0],
+				new RequiredInterfaceDescriptor[] { new DefaultRequiredInterfaceDescriptor(
 						"string", String.class) });
 		system.start("root", new Service[0]);
-		InterfaceDescriptor[] required = system.getRequiredServices();
+		RequiredInterfaceDescriptor[] required = system.getRequiredServices();
 		assertEquals(1, required.length);
-		InterfaceDescriptor[] provided = system.getProvidedServices();
+		ProvidedInterfaceDescriptor[] provided = system.getProvidedServices();
 		assertEquals(0, provided.length);
 	}
 
@@ -156,9 +159,10 @@ public class SystemAssemblerTest extends TestCase {
 		try {
 			Component environment = new Environment(_registry);
 			Component application = new Application(_registry);
-			CompositeComponent system = new CompositeComponent("all", _registry,
-					new Component[] { application }, new InterfaceDescriptor[0],
-					application.getRequiredServices());
+			Container system = new Container("all", _registry,
+					new Component[] { application },
+					new ProvidedInterfaceDescriptor[0], application
+							.getRequiredServices());
 			system.start("root", new Service[0]);
 		} catch (SystemAssemblyException e) {
 			return;
@@ -171,14 +175,15 @@ public class SystemAssemblerTest extends TestCase {
 
 		Component environment = new Environment(_registry);
 		Component application = new Application(_registry);
-		CompositeComponent system = new CompositeComponent("all", _registry,
-				new Component[] { application }, new InterfaceDescriptor[0],
-				application.getRequiredServices());
+		Container system = new Container("all", _registry,
+				new Component[] { application },
+				new ProvidedInterfaceDescriptor[0], application
+						.getRequiredServices());
 		Service[] envServices = environment.start("env", new Service[0]);
 		system.start("root", envServices);
-		InterfaceDescriptor[] required = system.getRequiredServices();
+		RequiredInterfaceDescriptor[] required = system.getRequiredServices();
 		assertEquals(2, required.length);
-		InterfaceDescriptor[] provided = system.getProvidedServices();
+		ProvidedInterfaceDescriptor[] provided = system.getProvidedServices();
 		assertEquals(0, provided.length);
 
 	}
@@ -192,12 +197,25 @@ public class SystemAssemblerTest extends TestCase {
 					environment1, environment2, application },
 					new ProvidedInterfaceDescriptor[0]);
 			assembler.start(_registry, new Service[0]);
-			
+
+		} catch (SystemAssemblyException e) {
+			return;
+		}
+		fail();
+	}
+
+	public void testIncompleteRequirements() {
+		try {
+			Component application = new Application(_registry);
+			Container system = new Container("all", _registry,
+					new Component[] { application },
+					new ProvidedInterfaceDescriptor[0],
+					new RequiredInterfaceDescriptor[0]);
+			system.start("root", new Service[0]);
 		} catch (SystemAssemblyException e) {
 			return;
 		}
 		fail();
 	}
 
-	
 }