X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcontainer%2FContainerTest.java;h=8cd119f37e7cbe598bb27c10de80f7e5d0e03a10;hb=32a8562695029cf13d915bc7941a61fe07ff0005;hp=5da0f025b1715a4fa99ecb48228d896ec8e587f9;hpb=49e4054c52db618894cf85eab721aebcbb9c3bc1;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java b/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
index 5da0f025..8cd119f3 100644
--- a/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
@@ -79,7 +79,7 @@ public class ContainerTest extends TestCase {
         AssertionUtils.assertEquals(new String[] { "start.environment",
                 "start.application" }, _tracker.getEvents(
                 Thread.currentThread()).toArray(new String[0]));
-        assertEquals(0, scope.getProvidedInterfaces().length);
+        assertEquals(0, scope.getProvidedInterfaces().size());
 
         assertEquals(environment.getString(), application.getString());
         assertEquals(environment.getInteger(), application.getInteger());
@@ -96,7 +96,7 @@ public class ContainerTest extends TestCase {
         AssertionUtils.assertEquals(new String[] { "start.environment",
                 "start.application" }, _tracker.getEvents(
                 Thread.currentThread()).toArray(new String[0]));
-        assertEquals(0, scope.getProvidedInterfaces().length);
+        assertEquals(0, scope.getProvidedInterfaces().size());
 
         assertEquals(environment.getString(), application.getString());
         assertEquals(environment.getInteger(), application.getInteger());
@@ -105,8 +105,8 @@ public class ContainerTest extends TestCase {
 
     public void testApplicationEnvironment() {
         try {
-            Component environment = new Environment();
-            Component application = new Application();
+            Component<?> environment = new Environment();
+            Component<?> application = new Application();
             Container container = new Container("root", new Component[] {
                     application, environment }, new ProvidedInterface[0],
                     new RequiredInterface[0]);
@@ -119,17 +119,17 @@ public class ContainerTest extends TestCase {
     }
 
     public void testComposite() {
-        Component environment = new Environment(_tracker);
-        Component application = new Application(_tracker);
+        Component<?> environment = new Environment(_tracker);
+        Component<?> application = new Application(_tracker);
         assertEquals(0, _tracker.getEventCount());
 
         Container system = new Container("all", new Component[] { environment,
                 application }, new ProvidedInterface[0],
                 new RequiredInterface[0]);
         Scope runtime = system.start();
-        RequiredInterfaces required = system.getRequiredInterfaces();
+        List<RequiredInterface> required = system.getRequiredInterfaces();
         assertEquals(0, required.size());
-        ProvidedInterfaces provided = system.getProvidedInterfaces();
+        List<ProvidedInterface> provided = system.getProvidedInterfaces();
         assertEquals(0, provided.size());
 
         AssertionUtils.assertEquals(new String[] { "start.environment",
@@ -146,8 +146,8 @@ public class ContainerTest extends TestCase {
 
     public void testCompositeWithWrongProvidedInfo() {
         try {
-            Component environment = new Environment();
-            Component application = new Application();
+            Component<?> environment = new Environment();
+            Component<?> application = new Application();
             Container system = new Container("all", new Component[] {
                     environment, application },
                     new ProvidedInterface[] { new DefaultProvidedInterface(
@@ -162,8 +162,8 @@ public class ContainerTest extends TestCase {
 
     public void testCompositeRequiredInterfaceNotProvided() {
         try {
-            Component environment = new Environment();
-            Component application = new Application();
+            Component<?> environment = new Environment();
+            Component<?> application = new Application();
             Container system = new Container("all", new Component[] {
                     environment, application }, new ProvidedInterface[0],
                     new RequiredInterface[] { new DefaultRequiredInterface(
@@ -176,8 +176,8 @@ public class ContainerTest extends TestCase {
     }
 
     public void testCompositeWithSuperfluousRequiredInfo() {
-        Component environment = new Environment();
-        Component application = new Application();
+        Component<?> environment = new Environment();
+        Component<?> application = new Application();
         Container system = new Container("all", new Component[] { environment,
                 application }, new ProvidedInterface[0],
                 new RequiredInterface[] { new DefaultRequiredInterface("float",
@@ -185,19 +185,19 @@ public class ContainerTest extends TestCase {
         system.getRequiredInterfaces().get(0)
                 .setProvider(new DefaultProvidedInterface("hallo", Float.class));
         system.start();
-        RequiredInterfaces required = system.getRequiredInterfaces();
+        List<RequiredInterface> required = system.getRequiredInterfaces();
         assertEquals(1, required.size());
-        ProvidedInterfaces provided = system.getProvidedInterfaces();
+        List<ProvidedInterface> provided = system.getProvidedInterfaces();
         assertEquals(0, provided.size());
     }
 
     public void testCompositeWithExternalDependencesNotProvided() {
         try {
-            Component environment = new Environment();
-            Component application = new Application();
+            Component<?> application = new Application();
+           
             Container system = new Container("all",
                     new Component[] { application }, new ProvidedInterface[0],
-                    application.getRequiredInterfaces().toArray());
+                    application.getRequiredInterfaces().toArray(new RequiredInterface[0]));
             system.start();
         } catch (SystemAssemblyException e) {
             return;
@@ -207,8 +207,8 @@ public class ContainerTest extends TestCase {
 
     public void testDuplicateComponent() {
         try {
-            Component comp1 = new Application();
-            Component comp2 = new Application();
+            Component<?> comp1 = new Application();
+            Component<?> comp2 = new Application();
             Container system = new Container("top");
             system.addComponent(comp1).addComponent(comp2);
         } catch (SystemAssemblyException e) {
@@ -220,7 +220,7 @@ public class ContainerTest extends TestCase {
 
     public void testInconsistentHierarchy() {
         try {
-            Component comp = new Application();
+            Component<?> comp = new Application();
             Container system = new Container("top").addComponent(comp);
             Container system2 = new Container("top2").addComponent(comp);
         } catch (SystemAssemblyException e) {
@@ -231,11 +231,11 @@ public class ContainerTest extends TestCase {
 
     public void testCompositeWithExternalDependencesProvided() {
 
-        Component environment = new Environment();
-        Component application = new Application();
+        Component<?> environment = new Environment();
+        Component<?> application = new Application();
         Container system = new Container("all",
                 new Component[] { application }, new ProvidedInterface[0],
-                application.getRequiredInterfaces().toArray());
+                application.getRequiredInterfaces().toArray(new RequiredInterface[0]));
         environment.start(new DefaultScope(new ProvidedInterface[0]));
         system.getRequiredInterfaces().get(0).setProvider(environment
                 .getProvidedInterfaces().get(0));
@@ -243,18 +243,18 @@ public class ContainerTest extends TestCase {
                 .getProvidedInterfaces().get(1));
 
         system.start();
-        RequiredInterfaces required = system.getRequiredInterfaces();
+        List<RequiredInterface> required = system.getRequiredInterfaces();
         assertEquals(2, required.size());
-        ProvidedInterfaces provided = system.getProvidedInterfaces();
+        List<ProvidedInterface> provided = system.getProvidedInterfaces();
         assertEquals(0, provided.size());
 
     }
 
     public void testAmbiguousInterfaces() {
         try {
-            Component environment1 = new Environment();
-            Component environment2 = new Environment();
-            Component application = new Application();
+            Component<?> environment1 = new Environment();
+            Component<?> environment2 = new Environment();
+            Component<?> application = new Application();
             Container container = new Container("root", new Component[] {
                     environment1, environment2, application },
                     new ProvidedInterface[0], new RequiredInterface[0]);
@@ -268,7 +268,7 @@ public class ContainerTest extends TestCase {
 
     public void testIncompleteRequirements() {
         try {
-            Component application = new Application();
+            Component<?> application = new Application();
             Container system = new Container("all",
                     new Component[] { application }, new ProvidedInterface[0],
                     new RequiredInterface[0]);
@@ -356,7 +356,7 @@ public class ContainerTest extends TestCase {
                 .getProvidedInterfaces().get(0));
         container.getRequiredInterfaces().get(1).setProvider(env
                 .getProvidedInterfaces().get(1));
-        Scope external = new DefaultScope(env.getProvidedInterfaces().toArray());
+        Scope external = new DefaultScope(env.getProvidedInterfaces());
         env.start(external);
 
         container.start(external);