X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredProvidedEdgeFilterTest.java;fp=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcontainer%2FDefaultInterfaceRestrictionTest.java;h=d9ab61bd458f805d4879c7686cfb547fa7eb4c52;hb=102eebeba2200f9bb2d8523bdfe7ace4ff663628;hp=cf6c3a822319d9e453465011d6247b24417505e1;hpb=531559394b56b0dbf817d52c8c596216550a5cbb;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/container/DefaultInterfaceRestrictionTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java
similarity index 57%
rename from system/general/src/test/java/org/wamblee/system/container/DefaultInterfaceRestrictionTest.java
rename to system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java
index cf6c3a82..d9ab61bd 100644
--- a/system/general/src/test/java/org/wamblee/system/container/DefaultInterfaceRestrictionTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java
@@ -13,18 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.system.container;
+package org.wamblee.system.graph.component;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.TestCase;
-
+import org.wamblee.system.container.Application;
 import org.wamblee.system.core.Environment;
+import org.wamblee.system.graph.DefaultEdge;
+import org.wamblee.system.graph.Edge;
+import org.wamblee.system.graph.EdgeFilter;
+import org.wamblee.system.graph.Node;
 import org.wamblee.test.AssertionUtils;
 
-public class DefaultInterfaceRestrictionTest extends TestCase {
+import junit.framework.TestCase;
+
+public class ConnectRequiredProvidedEdgeFilterTest extends TestCase {
+
     private Application _app1 = new Application("app1", "pf1.");
     private Application _app2 = new Application("app2", "pf2.");
     
@@ -32,7 +38,7 @@ public class DefaultInterfaceRestrictionTest extends TestCase {
     private Environment _env2 = new Environment("env2", "pf4.");
  
     
-    private void compare(Boolean[] aExpected, InterfaceRestriction aRestriction) { 
+    private void compare(Boolean[] aExpected, EdgeFilter aRestriction) { 
        List<Boolean> result = new ArrayList<Boolean>();
        
        // order will be: 
@@ -41,12 +47,13 @@ public class DefaultInterfaceRestrictionTest extends TestCase {
        //     env2, app1
        //     env2, app2
        for (Environment env: new Environment[] { _env1, _env2} ) { 
-           for (Application app: new Application[] { _app1, _app2} ) { 
-               result.add(aRestriction.isViolated(
-                       app, app.getRequiredInterfaces()[0], 
-                       env, 
-                       env.getProvidedInterfaces()[0]
-                       ));
+           for (Application app: new Application[] { _app1, _app2} ) {
+               Node from = new RequiredInterfaceNode(
+                       app, app.getRequiredInterfaces()[0]);
+               Node to = new ProvidedInterfaceNode(
+                       env, env.getProvidedInterfaces()[0]);
+               Edge edge = new DefaultEdge(from, to); 
+               result.add(aRestriction.isViolated(edge));
            }
        }
      
@@ -58,44 +65,26 @@ public class DefaultInterfaceRestrictionTest extends TestCase {
         AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
             @Override
             public void run() throws Exception {
-                InterfaceRestriction restriction = new DefaultInterfaceRestriction(null, null, null, null);
+                EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(null, null, null, null);
                 
             }
         }, IllegalArgumentException.class);
         AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
             @Override
             public void run() throws Exception {
-                InterfaceRestriction restriction = new DefaultInterfaceRestriction(null, null, "x", "y");
-                
-            }
-        }, IllegalArgumentException.class);
-        AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
-            @Override
-            public void run() throws Exception {
-                InterfaceRestriction restriction = new DefaultInterfaceRestriction("x", "y", null, null);
-                
+                EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(null, null, "x", "y");
             }
         }, IllegalArgumentException.class);
     }
     
     public void testClientServer() { 
-        InterfaceRestriction restriction = new DefaultInterfaceRestriction("app1", null, "env1", null);
-        compare(new Boolean[] { false, false, true, false}, restriction);
-    }
-    
-    public void testRequiredServer() { 
-        InterfaceRestriction restriction = new DefaultInterfaceRestriction(null, "pf1.string", "env1", null);
+        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter("app1", null, "env1", null);
         compare(new Boolean[] { false, false, true, false}, restriction);
     }
     
-    public void testClientProvided() { 
-        InterfaceRestriction restriction = new DefaultInterfaceRestriction("app1", null, null, "pf4.datasource");
-        compare(new Boolean[] { true, false, false, false}, restriction);
-    }
-    
-    public void testRequiredProvide() { 
-        InterfaceRestriction restriction = new DefaultInterfaceRestriction(null, "pf1.string", null, "pf4.datasource");
-        compare(new Boolean[] { true, false, false, false}, restriction);
+    public void testNoConnectionsAtAll() { 
+        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter("app1", null, null, null);
+        compare(new Boolean[] { true, false, true, false}, restriction);
     }
     
     public void testExplicitConfig() { 
@@ -104,7 +93,7 @@ public class DefaultInterfaceRestrictionTest extends TestCase {
         _env1 = new Environment("env1");
         _env2 = new Environment("env2");
         
-        InterfaceRestriction restriction = new DefaultInterfaceRestriction(
+        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(
                 "app2", "string", "env1", "datasource");
         compare(new Boolean[] { false, false, false, true}, restriction);