X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredExternallyRequiredEdgeFilterTest.java;h=7e8e02ce6914fbd541edc5c2378a150f479bab2f;hb=ee26f9544a0bf7f49390990c68981676e0e51014;hp=3fd7c61c03e80873f5657259058c00cbfe745f84;hpb=5a43ae8a88c0ae4ef3cd4fdd1c9439c8e2e455c7;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java
index 3fd7c61c..7e8e02ce 100644
--- a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilterTest.java
@@ -15,22 +15,21 @@
  */
 package org.wamblee.system.graph.component;
 
+import junit.framework.TestCase;
+
 import org.wamblee.system.container.Application;
 import org.wamblee.system.container.Container;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.DefaultRequiredInterface;
-import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.system.graph.DefaultEdge;
 import org.wamblee.system.graph.DefaultNode;
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
 import org.wamblee.system.graph.Node;
 
-import junit.framework.TestCase;
-
 public class ConnectRequiredExternallyRequiredEdgeFilterTest extends TestCase {
 
-    private Component _comp;
+    private Component<?> _comp;
     private Container _container;
     private Edge _edge;
 
@@ -41,38 +40,38 @@ public class ConnectRequiredExternallyRequiredEdgeFilterTest extends TestCase {
                 .addRequiredInterface(new DefaultRequiredInterface("x",
                         String.class));
         Node req = new RequiredInterfaceNode(_comp, _comp
-                .getRequiredInterfaces()[0]);
+                .getRequiredInterfaces().get(0));
         Node external = new ExternalRequiredInterfaceNode(_container,
-                _container.getRequiredInterfaces()[0]);
+                _container.getRequiredInterfaces().get(0));
         _edge = new DefaultEdge(req, external);
     }
 
     public void testRightComponentRightInterface() {
         EdgeFilter filter = new ConnectRequiredExternallyRequiredEdgeFilter(
-                _comp.getName(), _comp.getRequiredInterfaces()[0].getName(),
-                _container.getRequiredInterfaces()[0].getName());
+                _comp.getName(), _comp.getRequiredInterfaces().get(0).getName(),
+                _container.getRequiredInterfaces().get(0).getName());
         assertFalse(filter.isViolated(_edge));
     }
 
     public void testWrongInterface() {
         EdgeFilter filter = new ConnectRequiredExternallyRequiredEdgeFilter(
-                _comp.getName(), _comp.getRequiredInterfaces()[0].getName()
-                        + "xx", _container.getRequiredInterfaces()[0].getName());
+                _comp.getName(), _comp.getRequiredInterfaces().get(0).getName()
+                        + "xx", _container.getRequiredInterfaces().get(0).getName());
         assertFalse(filter.isViolated(_edge));
     }
 
     public void testWrongComponent() {
         EdgeFilter filter = new ConnectRequiredExternallyRequiredEdgeFilter(
-                _comp.getName() + "xx", _comp.getRequiredInterfaces()[0]
-                        .getName(), _container.getRequiredInterfaces()[0]
+                _comp.getName() + "xx", _comp.getRequiredInterfaces().get(0)
+                        .getName(), _container.getRequiredInterfaces().get(0)
                         .getName());
         assertFalse(filter.isViolated(_edge));
     }
 
     public void testWrongExternalInterface() {
         EdgeFilter filter = new ConnectRequiredExternallyRequiredEdgeFilter(
-                _comp.getName(), _comp.getRequiredInterfaces()[0].getName(),
-                _container.getRequiredInterfaces()[0].getName() + "xx");
+                _comp.getName(), _comp.getRequiredInterfaces().get(0).getName(),
+                _container.getRequiredInterfaces().get(0).getName() + "xx");
         assertTrue(filter.isViolated(_edge));
     }
 
@@ -80,8 +79,8 @@ public class ConnectRequiredExternallyRequiredEdgeFilterTest extends TestCase {
         DefaultEdge edge = new DefaultEdge(new DefaultNode("x"),
                 new DefaultNode("y"));
         EdgeFilter filter = new ConnectRequiredExternallyRequiredEdgeFilter(
-                _comp.getName(), _comp.getRequiredInterfaces()[0].getName(),
-                _container.getRequiredInterfaces()[0].getName());
+                _comp.getName(), _comp.getRequiredInterfaces().get(0).getName(),
+                _container.getRequiredInterfaces().get(0).getName());
         assertFalse(filter.isViolated(edge));
     }
 }