X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredProvidedEdgeFilterTest.java;h=88f29b8d5e051fc17b45907b1f5403b5e0390b6d;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=ac43c9d00ebfb081ca3db3169e7f724df8060abb;hpb=1bfc42afcea288a918e8befe65fd8f87b99ba2e4;p=utils diff --git a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java index ac43c9d0..88f29b8d 100644 --- a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java +++ b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java @@ -31,23 +31,25 @@ import junit.framework.TestCase; public class ConnectRequiredProvidedEdgeFilterTest extends TestCase { - private Application _app1 = new Application("app1", "pf1."); - private Application _app2 = new Application("app2", "pf2."); + private Application app1 = new Application("app1", "pf1."); + private Application app2 = new Application("app2", "pf2."); - private Environment _env1 = new Environment("env1", "pf3."); - private Environment _env2 = new Environment("env2", "pf4."); + private Environment env1 = new Environment("env1", "pf3."); + private Environment env2 = new Environment("env2", "pf4."); private void compare(Boolean[] aExpected, EdgeFilter aRestriction) { List result = new ArrayList(); + + // order will be: // env1, app1 // env1, app2 // env2, app1 // env2, app2 - for (Environment env: new Environment[] { _env1, _env2} ) { - for (Application app: new Application[] { _app1, _app2} ) { + for (Environment env: new Environment[] { env1, env2} ) { + for (Application app: new Application[] { app1, app2} ) { Node from = new RequiredInterfaceNode( app, app.getRequiredInterfaces().get(0)); Node to = new ProvidedInterfaceNode( @@ -88,10 +90,10 @@ public class ConnectRequiredProvidedEdgeFilterTest extends TestCase { } public void testExplicitConfig() { - _app1 = new Application("app1"); - _app2 = new Application("app2"); - _env1 = new Environment("env1"); - _env2 = new Environment("env2"); + app1 = new Application("app1"); + app2 = new Application("app2"); + env1 = new Environment("env1"); + env2 = new Environment("env2"); EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter( "app2", "string", "env1", "datasource");