X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredExternallyRequiredEdgeFilterTest.java;h=dba77f642ae4569302ee3b595acbaeebec3cf6d1;hb=49ce7cb8387601982d5e6ef186ce206d38f6e3d7;hp=4f30b538d59c6bbf7f5ef28eef73eb05bf7787a9;hpb=32a8562695029cf13d915bc7941a61fe07ff0005;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 4f30b538..dba77f64 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * Copyright 2005-2010 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,73 +15,78 @@
  */
 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;
-
+/**
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
 public class ConnectRequiredExternallyRequiredEdgeFilterTest extends TestCase {
+    private Component<?> comp;
 
-    private Component<?> _comp;
-    private Container _container;
-    private Edge _edge;
+    private Container container;
+
+    private Edge edge;
 
     @Override
     protected void setUp() throws Exception {
-        _comp = new Application();
-        _container = new Container("container")
-                .addRequiredInterface(new DefaultRequiredInterface("x",
-                        String.class));
-        Node req = new RequiredInterfaceNode(_comp, _comp
-                .getRequiredInterfaces().get(0));
-        Node external = new ExternalRequiredInterfaceNode(_container,
-                _container.getRequiredInterfaces().get(0));
-        _edge = new DefaultEdge(req, external);
+        comp = new Application();
+        container = new Container("container")
+            .addRequiredInterface(new DefaultRequiredInterface("x",
+                String.class));
+
+        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().get(0).getName(),
-                _container.getRequiredInterfaces().get(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().get(0).getName()
-                        + "xx", _container.getRequiredInterfaces().get(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().get(0)
-                        .getName(), _container.getRequiredInterfaces().get(0)
-                        .getName());
-        assertFalse(filter.isViolated(_edge));
+            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().get(0).getName(),
-                _container.getRequiredInterfaces().get(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"));
+        DefaultEdge edge1 = new DefaultEdge(new DefaultNode("x"),
+            new DefaultNode("y"));
         EdgeFilter filter = new ConnectRequiredExternallyRequiredEdgeFilter(
-                _comp.getName(), _comp.getRequiredInterfaces().get(0).getName(),
-                _container.getRequiredInterfaces().get(0).getName());
-        assertFalse(filter.isViolated(edge));
+            comp.getName(), comp.getRequiredInterfaces().get(0).getName(),
+            container.getRequiredInterfaces().get(0).getName());
+        assertFalse(filter.isViolated(edge1));
     }
 }