X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=trunk%2Fsystem%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcontainer%2FContainerTest.java;h=41ccede4f6cb5c72efcb1cacaf5a1567b0215dd8;hb=1c50799fedc4f092130f57dc7e8e856bfe2c4a08;hp=7aed9f6b98c3469f4e2368fcf9ec132c8750bddd;hpb=e6b6fb93462537cb3a1573d01178a5a026edb98f;p=utils

diff --git a/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java b/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
index 7aed9f6b..41ccede4 100644
--- a/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
+++ b/trunk/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
@@ -463,8 +463,70 @@ public class ContainerTest extends TestCase {
         container.connectRequiredProvided("app", null, "env1", null);
         container.start();
         assertEquals(env1.getString(), app.getString());
+        assertEquals(env1.getInteger(), app.getInteger());
         assertFalse(env2.getString().equals(app.getString()));
+        assertFalse(env2.getInteger().equals(app.getInteger()));
     }
+    
+    public void testRestrictionWithFromAndToInterfaceName() {
+        Environment env1 = new Environment("env1");
+        Environment env2 = new Environment("env2");
+        Application app = new Application("app");
+        Container container = new Container("top").addComponent(env1)
+                .addComponent(env2).addComponent(app);
+        container.connectRequiredProvided("app", app.getRequiredInterfaces().get(0).getName(), 
+        		"env1", env1.getProvidedInterfaces().get(0).getName());
+        container.connectRequiredProvided("app", app.getRequiredInterfaces().get(1).getName(), 
+        		"env2", env2.getProvidedInterfaces().get(1).getName());
+        container.start();
+        assertEquals(env1.getString(), app.getString());
+        assertEquals(env2.getInteger(), app.getInteger());
+        assertFalse(env2.getString().equals(app.getString()));
+        assertFalse(env1.getInteger().equals(app.getInteger()));
+    }
+    
+    public void testRestrictionWrongComponentNames() {
+        Environment env1 = new Environment("env1");
+        Environment env2 = new Environment("env2");
+        Application app = new Application("app");
+        final Container container = new Container("top").addComponent(env1)
+                .addComponent(env2).addComponent(app);
+        AssertionUtils.assertException(new AssertionUtils.ErroneousCode() { 
+        	@Override
+        	public void run() throws Exception {
+        		container.connectRequiredProvided("app2", null, "env1", null);
+        	}
+        }, SystemAssemblyException.class); 
+        AssertionUtils.assertException(new AssertionUtils.ErroneousCode() { 
+        	@Override
+        	public void run() throws Exception {
+        		container.connectRequiredProvided("app", null, "env3", null);
+        	}
+        }, SystemAssemblyException.class); 
+    }
+    
+    public void testRestrictionWrongInterfaceNames() {
+        final Environment env1 = new Environment("env1");
+        Environment env2 = new Environment("env2");
+        final Application app = new Application("app");
+        final Container container = new Container("top").addComponent(env1)
+                .addComponent(env2).addComponent(app);
+        AssertionUtils.assertException(new AssertionUtils.ErroneousCode() { 
+        	@Override
+        	public void run() throws Exception {
+        		container.connectRequiredProvided("app", 
+        				app.getRequiredInterfaces().get(0).getName() + "xxx", "env1", null);
+        	}
+        }, SystemAssemblyException.class); 
+        AssertionUtils.assertException(new AssertionUtils.ErroneousCode() { 
+        	@Override
+        	public void run() throws Exception {
+        		container.connectRequiredProvided("app", null, "env1", 
+        				env1.getProvidedInterfaces().get(0).getName() + "yyy");
+        	}
+        }, SystemAssemblyException.class); 
+    }
+
 
     public void testProvidedInDifferentScopes() {
         // Scoping problem occurred. Externally and internally provided