X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredExternallyRequiredEdgeFilterTest.java;h=bca6303ad5de485860ca61a1f9b5d78c73e3e7a8;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=3fd7c61c03e80873f5657259058c00cbfe745f84;hpb=1a7fade8cf8581099c9cd8edd0bf617979ec1857;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..bca6303a 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,73 +15,72 @@
  */
 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 Container _container;
-    private Edge _edge;
+    private Component<?> comp;
+    private Container container;
+    private Edge edge;
 
     @Override
     protected void setUp() throws Exception {
-        _comp = new Application();
-        _container = new Container("container")
+        comp = new Application();
+        container = new Container("container")
                 .addRequiredInterface(new DefaultRequiredInterface("x",
                         String.class));
-        Node req = new RequiredInterfaceNode(_comp, _comp
-                .getRequiredInterfaces()[0]);
-        Node external = new ExternalRequiredInterfaceNode(_container,
-                _container.getRequiredInterfaces()[0]);
-        _edge = new DefaultEdge(req, external);
+        Node req = new RequiredInterfaceNode(comp, comp
+                .getRequiredInterfaces().get(0));
+        Node external = new ExternalRequiredInterfaceNode(container,
+                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());
-        assertFalse(filter.isViolated(_edge));
+                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());
-        assertFalse(filter.isViolated(_edge));
+                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));
+        assertFalse(filter.isViolated(edge));
     }
 
     public void testWrongExternalInterface() {
         EdgeFilter filter = new ConnectRequiredExternallyRequiredEdgeFilter(
-                _comp.getName(), _comp.getRequiredInterfaces()[0].getName(),
-                _container.getRequiredInterfaces()[0].getName() + "xx");
-        assertTrue(filter.isViolated(_edge));
+                comp.getName(), comp.getRequiredInterfaces().get(0).getName(),
+                container.getRequiredInterfaces().get(0).getName() + "xx");
+        assertTrue(filter.isViolated(edge));
     }
 
     public void testWrongEdgeType() {
         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));
     }
 }