X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FSystemAssemblerTest.java;h=d862b15e3eb4d08fbe2f1a64b89ebc60fa7b8425;hb=98856488516fbc8ba95bf0fd2fb739575da9ac5a;hp=9412caee08a58029eb5fb9d825ab56099e6f6051;hpb=2aa6c38d06e981a4a6c240e2d371638205c3fb54;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 9412caee..d862b15e 100644
--- a/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java
@@ -24,15 +24,15 @@ public class SystemAssemblerTest extends TestCase {
 	}
 
 	public void testFilterProvided() {
-		RequiredInterface req1 = new DefaultRequiredInterfaceDescriptor("name",
+		RequiredInterface req1 = new DefaultRequiredInterface("name",
 				Runnable.class);
-		RequiredInterface req2 = new DefaultRequiredInterfaceDescriptor("name",
+		RequiredInterface req2 = new DefaultRequiredInterface("name",
 				Serializable.class);
-		ProvidedInterface prov1 = new DefaultProvidedInterfaceDescriptor(
+		ProvidedInterface prov1 = new DefaultProvidedInterface(
 				"name", Runnable.class);
-		ProvidedInterface prov2 = new DefaultProvidedInterfaceDescriptor(
+		ProvidedInterface prov2 = new DefaultProvidedInterface(
 				"name", Serializable.class);
-		ProvidedInterface prov3 = new DefaultProvidedInterfaceDescriptor(
+		ProvidedInterface prov3 = new DefaultProvidedInterface(
 				"name", MyMultiple.class);
 
 		AssertionUtils.assertEquals(new RequiredInterface[] { req1 },
@@ -117,9 +117,9 @@ public class SystemAssemblerTest extends TestCase {
 			Container system = new Container(
 					"all",
 					new Component[] { environment, application },
-					new ProvidedInterface[] { new DefaultProvidedInterfaceDescriptor(
+					new ProvidedInterface[] { new DefaultProvidedInterface(
 							"string", String.class) },
-					new DefaultRequiredInterfaceDescriptor[0]);
+					new DefaultRequiredInterface[0]);
 		} catch (SystemAssemblyException e) {
 			return;
 		}
@@ -134,7 +134,7 @@ public class SystemAssemblerTest extends TestCase {
 					"all",
 					new Component[] { environment, application },
 					new ProvidedInterface[0],
-					new RequiredInterface[] { new DefaultRequiredInterfaceDescriptor(
+					new RequiredInterface[] { new DefaultRequiredInterface(
 							"string", String.class) });
 			system.start("root");
 		} catch (SystemAssemblyException e) {
@@ -150,10 +150,10 @@ public class SystemAssemblerTest extends TestCase {
 				"all",
 				new Component[] { environment, application },
 				new ProvidedInterface[0],
-				new RequiredInterface[] { new DefaultRequiredInterfaceDescriptor(
+				new RequiredInterface[] { new DefaultRequiredInterface(
 						"string", String.class) });
 		system.getRequiredServices()[0].setProvider(
-				new DefaultProvidedInterfaceDescriptor("hallo", String.class));
+				new DefaultProvidedInterface("hallo", String.class));
 		system.start("root");
 		RequiredInterface[] required = system.getRequiredServices();
 		assertEquals(1, required.length);