CVS update of aokell (2 files)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Wednesday, March 29, 2006 @ 20:57:15
  Author: seintur
    Path: /cvsroot/fractal/aokell

Modified: src/org/objectweb/fractal/aokell/overview.html
          
test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java

Test issue solved.
Two tests which were behaving differently under AOKell no longer do.


-----------------------------------------------------------------------------+
 src/org/objectweb/fractal/aokell/overview.html                              
|   10 
 test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java 
|  133 +++-------
 2 files changed, 45 insertions(+), 98 deletions(-)


Index: aokell/src/org/objectweb/fractal/aokell/overview.html
diff -u aokell/src/org/objectweb/fractal/aokell/overview.html:1.10 
aokell/src/org/objectweb/fractal/aokell/overview.html:1.11
--- aokell/src/org/objectweb/fractal/aokell/overview.html:1.10  Wed Mar 22 
20:55:41 2006
+++ aokell/src/org/objectweb/fractal/aokell/overview.html       Wed Mar 29 
20:57:15 2006
@@ -729,7 +729,7 @@
 <h3>6.1 Compliance Tests</h3>
 
 <p>Julia is distributed with a set of 142 <a 
href="http://www.junit.org";>JUnit</a> compliance tests. On the 142 
-tests, 136 run successfully with AOKell. This section comments on the 6 
tests where the behavior of AOKell differs from that of Julia.</p>
+tests, 138 run successfully with AOKell. This section comments on the 6 
tests where the behavior of AOKell differs from that of Julia.</p>
 
 <p>The test testParametricPrimitiveTemplate in TestComponent reports an 
error, 
 because the setter method for the attribute X11 is named setWriteOnlyX11. As 
@@ -741,12 +741,6 @@
 Specifications but with the semantics chosen by Julia for lifecycle 
controllers. AOKell chooses instead to throw an exception. This test is then 
not a Fractal 
 test, but a Julia specific one.</p>
 
-<p>Two tests, testCompositeSelfBindLookupUnbind and 
-testCompositeCollectionSelfBindLookupUnbind, in TestBindingController report 
an 
-error. The issue needs further investigations, but it seems that the test 
tries 
-to bind a server interface to another server interface. This is not 
permitted 
-with AOKell.</p>
-
 <p>The test testWouldCreateNonLocalImportBinding in TestContentController 
fails. 
 It seems that the test tries to bind a mandatory interface to an optional 
one.&nbsp; 
 This is not permitted with AOKell.</p>
@@ -1263,6 +1257,6 @@
 <a href="mailto:Nicolas.Pessemier@xxxxxxx";>Nicolas Pessemier</a>,
 <a href="mailto:thierry.coupaye@xxxxxxxxxxxxxxxxx";>Thierry Coupaye</a>.<br>
 </i>Last modified:
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%y" startspan 
-->03/22/06<!--webbot bot="Timestamp" endspan i-checksum="13026" -->.</p>
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%y" startspan 
-->03/28/06<!--webbot bot="Timestamp" endspan i-checksum="13122" -->.</p>
 </body>
 </html>
\ No newline at end of file
Index: 
aokell/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java
diff -u 
aokell/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java:1.1
 
aokell/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java:1.2
--- 
aokell/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java:1.1
      Sat Feb 11 06:43:54 2006
+++ 
aokell/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java
  Wed Mar 29 20:57:15 2006
@@ -109,66 +109,17 @@
     assertEquals(null, bc.lookupFc("client"));
   }
 
-  /**
-   * @author Eric Bruneton
-   * @author Lionel Seinturier
-   */
   public void testCollectionBindLookupUnbind () throws Exception {
-    BindingController bc = Fractal.getBindingController(c);
-    
-    // Test on client collection interfaces
-    bc.bindFc("clients0", d.getFcInterface("server"));
-    checkList(bc, new String[] { "client", "clients0" });
-    if(isComposite) {
-        if(isTemplate)
-            checkFcInterfaces(c, new String[] { clientI, clients0I, serverI, 
COMP, BC, NC, SC, F });
-        else
-            checkFcInterfaces(c, new String[] { clientI, clients0I, serverI, 
COMP, BC, LC, NC, SC });
-    }
-    else {
-        if(isTemplate)
-            checkFcInterfaces(c, new String[] { clientI, clients0I, serverI, 
COMP, BC, NC, F });
-        else
-            checkFcInterfaces(c, new String[] { clientI, clients0I, serverI, 
COMP, BC, LC, NC });
-    }
-    assertEquals(d.getFcInterface("server"), bc.lookupFc("clients0"));
-    bc.unbindFc("clients0");
-    try {
-      assertEquals(null, bc.lookupFc("clients0"));
-    } catch (NoSuchInterfaceException e) {
-      checkList(bc, new String[] { "client" });
-      checkFcInterfaces(c, new String[] { "client", COMP, BC, LC, NC });
-    }
-    
-    // Test on server collection interfaces
-    bc.bindFc("clients0", d.getFcInterface("servers"));
-    bc.bindFc("clients1", d.getFcInterface("servers"));
-    if(isComposite) {
-        if(isTemplate)
-            checkFcInterfaces(d, new String[] { clientI, serverI, serversI, 
COMP, BC, NC, SC, F, CC });
-        else
-            checkFcInterfaces(d, new String[] { clientI, serverI, serversI, 
COMP, BC, LC, NC, SC, CC });
-    }
-    else {
-        if(isTemplate)
-            checkFcInterfaces(d, new String[] { clientI, serverI, serversI, 
COMP, BC, F, NC });
-        else
-            checkFcInterfaces(d, new String[] { clientI, serverI, serversI, 
COMP, BC, LC, NC });
-    }
-    bc.unbindFc("clients0");
-    bc.unbindFc("clients1");
-    if(isComposite) {
-        if(isTemplate)
-            checkFcInterfaces(d, new String[] { clientI, serverI, COMP, BC, 
NC, SC, F, CC });
-        else
-            checkFcInterfaces(d, new String[] { clientI, serverI, COMP, BC, 
LC, NC, SC, CC });
-    }
-    else {
-        if(isTemplate)
-            checkFcInterfaces(d, new String[] { clientI, serverI, COMP, BC, 
F, NC });
-        else
-            checkFcInterfaces(d, new String[] { clientI, serverI, COMP, BC, 
LC, NC });
-    }
+      BindingController bc = Fractal.getBindingController(c);
+      bc.bindFc("clients0", d.getFcInterface("server"));
+      checkList(bc, new String[] { "client", "clients0" });
+      assertEquals(d.getFcInterface("server"), bc.lookupFc("clients0"));
+      bc.unbindFc("clients0");
+      try {
+        assertEquals(null, bc.lookupFc("clients0"));
+      } catch (NoSuchInterfaceException e) {
+        checkList(bc, new String[] { "client" });
+      }
   }
 
   protected void checkList (BindingController bc, String[] expected) {
@@ -362,44 +313,46 @@
       try {
         assertEquals(null, bc.lookupFc("clients0"));
       } catch (NoSuchInterfaceException e) {
-        checkList(bc, new String[] { "client", "server" });
+        if (isTemplate) {
+            checkList(bc, new String[] { "client", "server", "factory" });   
         
+        } else {
+            checkList(bc, new String[] { "client", "server" });
+        }
       }
     }
 
     public void testCompositeSelfBindLookupUnbind () throws Exception {
-        // TODO test issue: the binding must be established with client, not 
server 
-//        Object itf =
-//          Fractal.getContentController(r).getFcInternalInterface("client");
-//        BindingController bc = Fractal.getBindingController(r);
-//        bc.bindFc("server", itf);
-//        if (isTemplate) {
-//          checkList(bc, new String[] { "client", "server", "factory" });
-//        } else {
-//          checkList(bc, new String[] { "client", "server" });
-//        }
-//        assertEquals(itf, bc.lookupFc("server"));
-//        bc.unbindFc("server");
-//        assertEquals(null, bc.lookupFc("server"));
+        Object itf =
+          Fractal.getContentController(r).getFcInternalInterface("client");
+        BindingController bc = Fractal.getBindingController(r);
+        bc.bindFc("server", itf);
+        if (isTemplate) {
+          checkList(bc, new String[] { "client", "server", "factory" });
+        } else {
+          checkList(bc, new String[] { "client", "server" });
+        }
+        assertEquals(itf, bc.lookupFc("server"));
+        bc.unbindFc("server");
+        assertEquals(null, bc.lookupFc("server"));
       }
 
       public void testCompositeCollectionSelfBindLookupUnbind () throws 
Exception {
-        // TODO test issue: the binding must be established with client, not 
server 
-//        Object itf =
-//          
Fractal.getContentController(r).getFcInternalInterface("clients0");
-//        BindingController bc = Fractal.getBindingController(r);
-//        bc.bindFc("servers0", itf);
-//        if (isTemplate) {
-//          checkList(bc, new String[] { "client", "server", "servers0", 
"factory" });
-//        } else {
-//          checkList(bc, new String[] { "client", "server", "servers0" });
-//        }
-//        assertEquals(itf, bc.lookupFc("servers0"));
-//        bc.unbindFc("servers0");
-//        try {
-//          assertEquals(null, bc.lookupFc("servers0"));
-//        } catch (NoSuchInterfaceException e) {
-//          checkList(bc, new String[] { "client", "server" });
-//        }
+        Object itf =
+          Fractal.getContentController(r).getFcInternalInterface("clients0");
+        BindingController bc = Fractal.getBindingController(r);
+        bc.bindFc("servers0", itf);
+        if (isTemplate) {
+          checkList(bc, new String[] { "client", "server", "servers0", 
"factory" });
+        } else {
+          checkList(bc, new String[] { "client", "server", "servers0" });
+        }
+        assertEquals(itf, bc.lookupFc("servers0"));
+        bc.unbindFc("servers0");
+        try {
+          assertEquals(null, bc.lookupFc("servers0"));
+        } catch (NoSuchInterfaceException e) {
+          checkList(bc, new String[] { "client", "server" });
+        }
       }
 
     public void testCompositeNoSuchInterface () throws Exception {