X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FSystemAssemblerTest.java;h=885cff39739a748fbd1e015c4f45f66b461128db;hb=6f277575685808a5c5a76555dd3e839dc5255031;hp=2dba056e63197879c35e4e9e30a96c70b0516843;hpb=fd4cca82a8da5d7e347a1ae40f25db245f0ad235;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 2dba056e..885cff39 100644
--- a/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java
@@ -26,46 +26,46 @@ public class SystemAssemblerTest extends TestCase {
 	}
 
 	public void testFilterProvided() {
-		RequiredServiceDescriptor req1 = new DefaultRequiredServiceDescriptor(
+		RequiredInterfaceDescriptor req1 = new DefaultRequiredInterfaceDescriptor(
 				"name", Runnable.class);
-		RequiredServiceDescriptor req2 = new DefaultRequiredServiceDescriptor(
+		RequiredInterfaceDescriptor req2 = new DefaultRequiredInterfaceDescriptor(
 				"name", Serializable.class);
-		ProvidedServiceDescriptor prov1 = new DefaultProvidedServiceDescriptor(
+		ProvidedInterfaceDescriptor prov1 = new DefaultProvidedInterfaceDescriptor(
 				"name", Runnable.class);
-		ProvidedServiceDescriptor prov2 = new DefaultProvidedServiceDescriptor(
+		ProvidedInterfaceDescriptor prov2 = new DefaultProvidedInterfaceDescriptor(
 				"name", Serializable.class);
-		ProvidedServiceDescriptor prov3 = new DefaultProvidedServiceDescriptor(
+		ProvidedInterfaceDescriptor prov3 = new DefaultProvidedInterfaceDescriptor(
 				"name", MyMultiple.class);
 
-		AssertionUtils.assertEquals(new RequiredServiceDescriptor[] { req1 },
+		AssertionUtils.assertEquals(new RequiredInterfaceDescriptor[] { req1 },
 				SystemAssembler.filterRequiredServices(prov1, Arrays
-						.asList(new RequiredServiceDescriptor[] { req1 })));
-		AssertionUtils.assertEquals(new RequiredServiceDescriptor[] { req1 },
+						.asList(new RequiredInterfaceDescriptor[] { req1 })));
+		AssertionUtils.assertEquals(new RequiredInterfaceDescriptor[] { req1 },
 				SystemAssembler
 						.filterRequiredServices(prov1, Arrays
-								.asList(new RequiredServiceDescriptor[] { req1,
+								.asList(new RequiredInterfaceDescriptor[] { req1,
 										req2 })));
-		AssertionUtils.assertEquals(new RequiredServiceDescriptor[] { req1,
+		AssertionUtils.assertEquals(new RequiredInterfaceDescriptor[] { req1,
 				req2 }, SystemAssembler.filterRequiredServices(prov3, Arrays
-				.asList(new RequiredServiceDescriptor[] { req1, req2 })));
+				.asList(new RequiredInterfaceDescriptor[] { req1, req2 })));
 
-		AssertionUtils.assertEquals(new ProvidedServiceDescriptor[] { prov1 },
+		AssertionUtils.assertEquals(new ProvidedInterfaceDescriptor[] { prov1 },
 				SystemAssembler.filterProvidedServices(req1, Arrays
-						.asList(new ProvidedServiceDescriptor[] { prov1 })));
-		AssertionUtils.assertEquals(new ProvidedServiceDescriptor[] { prov1 },
+						.asList(new ProvidedInterfaceDescriptor[] { prov1 })));
+		AssertionUtils.assertEquals(new ProvidedInterfaceDescriptor[] { prov1 },
 				SystemAssembler.filterProvidedServices(req1,
-						Arrays.asList(new ProvidedServiceDescriptor[] { prov1,
+						Arrays.asList(new ProvidedInterfaceDescriptor[] { prov1,
 								prov2 })));
-		AssertionUtils.assertEquals(new ProvidedServiceDescriptor[] { prov1,
+		AssertionUtils.assertEquals(new ProvidedInterfaceDescriptor[] { prov1,
 				prov3 }, SystemAssembler.filterProvidedServices(req1, Arrays
-				.asList(new ProvidedServiceDescriptor[] { prov1, prov3 })));
+				.asList(new ProvidedInterfaceDescriptor[] { prov1, prov3 })));
 	}
 
 	public void testEnvironmentApplication() {
-		SubSystem environment = new Environment(_registry);
-		SubSystem application = new Application(_registry);
-		SystemAssembler assembler = new SystemAssembler(new SubSystem[] {
-				environment, application }, new ProvidedServiceDescriptor[0]);
+		Component environment = new Environment(_registry);
+		Component application = new Application(_registry);
+		SystemAssembler assembler = new SystemAssembler(new Component[] {
+				environment, application }, new ProvidedInterfaceDescriptor[0]);
 		assembler.start(_registry, new Service[0]);
 		Service[] envServices = environment.getRunningServices();
 		assertEquals(2, envServices.length);
@@ -82,11 +82,11 @@ public class SystemAssemblerTest extends TestCase {
 
 	public void testApplicationEnvironment() {
 		try {
-			SubSystem environment = new Environment(_registry);
-			SubSystem application = new Application(_registry);
-			SystemAssembler assembler = new SystemAssembler(new SubSystem[] {
+			Component environment = new Environment(_registry);
+			Component application = new Application(_registry);
+			SystemAssembler assembler = new SystemAssembler(new Component[] {
 					application, environment },
-					new ProvidedServiceDescriptor[0]);
+					new ProvidedInterfaceDescriptor[0]);
 			assembler.start(_registry, new Service[0]);
 		} catch (SystemAssemblyException e) {
 			// e.printStackTrace();
@@ -96,29 +96,29 @@ public class SystemAssemblerTest extends TestCase {
 	}
 
 	public void testComposite() {
-		SubSystem environment = new Environment(_registry);
-		SubSystem application = new Application(_registry);
+		Component environment = new Environment(_registry);
+		Component application = new Application(_registry);
 		CompositeSystem system = new CompositeSystem("all", _registry,
-				new SubSystem[] { environment, application },
-				new ServiceDescriptor[0], new ServiceDescriptor[0]);
+				new Component[] { environment, application },
+				new InterfaceDescriptor[0], new InterfaceDescriptor[0]);
 		system.start("root", new Service[0]);
-		ServiceDescriptor[] required = system.getRequiredServices();
+		InterfaceDescriptor[] required = system.getRequiredServices();
 		assertEquals(0, required.length);
-		ServiceDescriptor[] provided = system.getProvidedServices();
+		InterfaceDescriptor[] provided = system.getProvidedServices();
 		assertEquals(0, provided.length);
 	}
 
 	public void testCompositeWithWrongProvidedInfo() {
 		try {
-			SubSystem environment = new Environment(_registry);
-			SubSystem application = new Application(_registry);
+			Component environment = new Environment(_registry);
+			Component application = new Application(_registry);
 			CompositeSystem system = new CompositeSystem(
 					"all",
 					_registry,
-					new SubSystem[] { environment, application },
-					new ServiceDescriptor[] { new DefaultProvidedServiceDescriptor(
+					new Component[] { environment, application },
+					new InterfaceDescriptor[] { new DefaultProvidedInterfaceDescriptor(
 							"string", String.class) },
-					new DefaultRequiredServiceDescriptor[0]);
+					new DefaultRequiredInterfaceDescriptor[0]);
 		} catch (SystemAssemblyException e) {
 			return;
 		}
@@ -126,26 +126,26 @@ public class SystemAssemblerTest extends TestCase {
 	}
 
 	public void testCompositeWithSuperfluousRequiredInfo() {
-		SubSystem environment = new Environment(_registry);
-		SubSystem application = new Application(_registry);
+		Component environment = new Environment(_registry);
+		Component application = new Application(_registry);
 		CompositeSystem system = new CompositeSystem("all", _registry,
-				new SubSystem[] { environment, application },
-				new ServiceDescriptor[0],
-				new ServiceDescriptor[] { new DefaultRequiredServiceDescriptor(
+				new Component[] { environment, application },
+				new InterfaceDescriptor[0],
+				new InterfaceDescriptor[] { new DefaultRequiredInterfaceDescriptor(
 						"string", String.class) });
 		system.start("root", new Service[0]);
-		ServiceDescriptor[] required = system.getRequiredServices();
+		InterfaceDescriptor[] required = system.getRequiredServices();
 		assertEquals(1, required.length);
-		ServiceDescriptor[] provided = system.getProvidedServices();
+		InterfaceDescriptor[] provided = system.getProvidedServices();
 		assertEquals(0, provided.length);
 	}
 
 	public void testCompositeWithExternalDependencesNotProvided() {
 		try {
-			SubSystem environment = new Environment(_registry);
-			SubSystem application = new Application(_registry);
+			Component environment = new Environment(_registry);
+			Component application = new Application(_registry);
 			CompositeSystem system = new CompositeSystem("all", _registry,
-					new SubSystem[] { application }, new ServiceDescriptor[0],
+					new Component[] { application }, new InterfaceDescriptor[0],
 					application.getRequiredServices());
 			system.start("root", new Service[0]);
 		} catch (SystemAssemblyException e) {
@@ -157,33 +157,35 @@ public class SystemAssemblerTest extends TestCase {
 
 	public void testCompositeWithExternalDependencesProvided() {
 
-		SubSystem environment = new Environment(_registry);
-		SubSystem application = new Application(_registry);
+		Component environment = new Environment(_registry);
+		Component application = new Application(_registry);
 		CompositeSystem system = new CompositeSystem("all", _registry,
-				new SubSystem[] { application }, new ServiceDescriptor[0],
+				new Component[] { application }, new InterfaceDescriptor[0],
 				application.getRequiredServices());
 		Service[] envServices = environment.start("env", new Service[0]);
 		system.start("root", envServices);
-		ServiceDescriptor[] required = system.getRequiredServices();
+		InterfaceDescriptor[] required = system.getRequiredServices();
 		assertEquals(2, required.length);
-		ServiceDescriptor[] provided = system.getProvidedServices();
+		InterfaceDescriptor[] provided = system.getProvidedServices();
 		assertEquals(0, provided.length);
 
 	}
 
 	public void testAmbiguousInterfaces() {
 		try {
-			SubSystem environment1 = new Environment(_registry);
-			SubSystem environment2 = new Environment(_registry);
-			SubSystem application = new Application(_registry);
-			SystemAssembler assembler = new SystemAssembler(new SubSystem[] {
+			Component environment1 = new Environment(_registry);
+			Component environment2 = new Environment(_registry);
+			Component application = new Application(_registry);
+			SystemAssembler assembler = new SystemAssembler(new Component[] {
 					environment1, environment2, application },
-					new ProvidedServiceDescriptor[0]);
+					new ProvidedInterfaceDescriptor[0]);
 			assembler.start(_registry, new Service[0]);
+			
 		} catch (SystemAssemblyException e) {
 			return;
 		}
 		fail();
 	}
 
+	
 }