OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google


Mail Archive Home | fractal-commits List | January 2007 Index

<--  Date Index  --> <--  Thread Index  -->

CVS update of julia/test/conform/org/objectweb/fractal/julia/conform (9 files)


    Date: Sunday, January 28, 2007 @ 16:05:19
  Author: seintur
    Path: .../fractal/julia/test/conform/org/objectweb/fractal/julia/conform

Modified: Test.java TestBindingController.java TestCollection.java
          TestComponent.java TestContentController.java
          TestGenericFactory.java TestInterceptor.java
          TestLifeCycleController.java TestTypeFactory.java

Typo.


------------------------------+
 Test.java                    |    2 
 TestBindingController.java   |    2 
 TestCollection.java          |    2 
 TestComponent.java           |    2 
 TestContentController.java   |    2 
 TestGenericFactory.java      |    2 
 TestInterceptor.java         |  298 ++++++++++++++++++++---------------------
 TestLifeCycleController.java |    2 
 TestTypeFactory.java         |    2 
 9 files changed, 157 insertions(+), 157 deletions(-)


Index: julia/test/conform/org/objectweb/fractal/julia/conform/Test.java
diff -u julia/test/conform/org/objectweb/fractal/julia/conform/Test.java:1.2 
julia/test/conform/org/objectweb/fractal/julia/conform/Test.java:1.3
--- julia/test/conform/org/objectweb/fractal/julia/conform/Test.java:1.2      
  Fri Oct 20 21:29:50 2006
+++ julia/test/conform/org/objectweb/fractal/julia/conform/Test.java    Sun 
Jan 28 16:05:19 2007
@@ -124,7 +124,7 @@
     }
   }
 
-  private Set getExternalItfs (Component c) {
+  protected Set getExternalItfs (Component c) {
     HashSet result = new HashSet();
     Object[] extItfs = c.getFcInterfaces();
     for (int i = 0; i < extItfs.length; ++i) {
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java:1.1
 
julia/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java:1.2
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java:1.1
       Thu Jan 29 10:35:25 2004
+++ 
julia/test/conform/org/objectweb/fractal/julia/conform/TestBindingController.java
   Sun Jan 28 16:05:19 2007
@@ -55,7 +55,7 @@
   protected boolean isTemplate;
 
   // 
-------------------------------------------------------------------------
-  // Constructor ans setup
+  // Constructor and setup
   // 
-------------------------------------------------------------------------
 
   public TestBindingController (final String name) {
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestCollection.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestCollection.java:1.1
 
julia/test/conform/org/objectweb/fractal/julia/conform/TestCollection.java:1.2
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestCollection.java:1.1
      Thu Jan 29 10:35:25 2004
+++ 
julia/test/conform/org/objectweb/fractal/julia/conform/TestCollection.java  
Sun Jan 28 16:05:19 2007
@@ -60,7 +60,7 @@
   protected final static String clients3I = 
"clients3/"+PKG+".I/false,true,true";
 
   // 
-------------------------------------------------------------------------
-  // Constructor ans setup
+  // Constructor and setup
   // 
-------------------------------------------------------------------------
 
   public TestCollection (final String name) {
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestComponent.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestComponent.java:1.1 
julia/test/conform/org/objectweb/fractal/julia/conform/TestComponent.java:1.2
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestComponent.java:1.1 
      Thu Jan 29 10:35:25 2004
+++ julia/test/conform/org/objectweb/fractal/julia/conform/TestComponent.java 
  Sun Jan 28 16:05:19 2007
@@ -48,7 +48,7 @@
   protected final static String cI = "client/"+PKG+".I/true,false,false";
 
   // 
-------------------------------------------------------------------------
-  // Constructor ans setup
+  // Constructor and setup
   // 
-------------------------------------------------------------------------
 
   public TestComponent (final String name) {
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestContentController.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestContentController.java:1.1
 
julia/test/conform/org/objectweb/fractal/julia/conform/TestContentController.java:1.2
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestContentController.java:1.1
       Thu Jan 29 10:35:25 2004
+++ 
julia/test/conform/org/objectweb/fractal/julia/conform/TestContentController.java
   Sun Jan 28 16:05:19 2007
@@ -48,7 +48,7 @@
   protected Component c, d, e;
 
   // 
-------------------------------------------------------------------------
-  // Constructor ans setup
+  // Constructor and setup
   // 
-------------------------------------------------------------------------
 
   public TestContentController (final String name) {
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestGenericFactory.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestGenericFactory.java:1.1
 
julia/test/conform/org/objectweb/fractal/julia/conform/TestGenericFactory.java:1.2
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestGenericFactory.java:1.1
  Thu Jan 29 10:35:25 2004
+++ 
julia/test/conform/org/objectweb/fractal/julia/conform/TestGenericFactory.java
      Sun Jan 28 16:05:19 2007
@@ -56,7 +56,7 @@
   protected final static String cI = "client/"+PKG+".I/true,false,false";
 
   // 
-------------------------------------------------------------------------
-  // Constructor ans setup
+  // Constructor and setup
   // 
-------------------------------------------------------------------------
 
   public TestGenericFactory (final String name) {
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestInterceptor.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestInterceptor.java:1.1
 
julia/test/conform/org/objectweb/fractal/julia/conform/TestInterceptor.java:1.2
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestInterceptor.java:1.1
     Thu Jan 29 10:35:25 2004
+++ 
julia/test/conform/org/objectweb/fractal/julia/conform/TestInterceptor.java 
Sun Jan 28 16:05:19 2007
@@ -1,149 +1,149 @@
-/***
- * Julia: France Telecom's implementation of the Fractal API
- * Copyright (C) 2001-2002 France Telecom R&D
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Contact: Eric.Bruneton@xxxxxxxxxxxxxxxxxxxx
- *
- * Author: Eric Bruneton
- */
-
-package org.objectweb.fractal.julia.conform;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.factory.GenericFactory;
-import org.objectweb.fractal.api.type.TypeFactory;
-import org.objectweb.fractal.api.type.ComponentType;
-import org.objectweb.fractal.api.type.InterfaceType;
-
-import org.objectweb.fractal.julia.conform.components.I;
-import org.objectweb.fractal.julia.conform.components.C;
-import org.objectweb.fractal.julia.conform.controllers.StatController;
-
-import org.objectweb.fractal.util.Fractal;
-
-public class TestInterceptor extends Test {
-
-  protected Component boot;
-  protected TypeFactory tf;
-  protected GenericFactory gf;
-
-  protected ComponentType t;
-  protected Component r, c, d;
-
-  // 
-------------------------------------------------------------------------
-  // Constructor ans setup
-  // 
-------------------------------------------------------------------------
-
-  public TestInterceptor (final String name) {
-    super(name);
-  }
-
-  protected void setUp () throws Exception {
-    boot = Fractal.getBootstrapComponent();
-    tf = Fractal.getTypeFactory(boot);
-    gf = Fractal.getGenericFactory(boot);
-    t = tf.createFcType(new InterfaceType[] {
-      tf.createFcItfType("server", I.class.getName(), false, false, false),
-      tf.createFcItfType("servers", I.class.getName(), false, false, true),
-      tf.createFcItfType("client", I.class.getName(), true, true, false),
-      tf.createFcItfType("clients", I.class.getName(), true, true, true)
-    });
-    r = gf.newFcInstance(t, "composite", null);
-    c = gf.newFcInstance(t, "statComposite", null);
-    d = gf.newFcInstance(t, "statPrimitive", C.class.getName());
-    Fractal.getContentController(r).addFcSubComponent(c);
-    Fractal.getContentController(c).addFcSubComponent(d);
-  }
-
-  // 
-------------------------------------------------------------------------
-  // Test interceptors
-  // 
-------------------------------------------------------------------------
-
-  public void testInterceptors () throws Exception {
-    Fractal.getBindingController(d).bindFc(
-      "client",
-      d.getFcInterface("server"));
-    Fractal.getLifeCycleController(d).startFc();
-
-    StatController sd = (StatController)d.getFcInterface("stat-controller");
-    assertEquals(0, sd.getNumberOfMethodCalled());
-
-    I i = (I)d.getFcInterface("server");
-    assertEquals(3, i.n(0, (long)3));
-    assertEquals(7, sd.getNumberOfMethodCalled());
-  }
-
-  public void testCompositeInterceptors () throws Exception {
-    Fractal.getBindingController(c).bindFc(
-      "server",
-      d.getFcInterface("server"));
-    Fractal.getBindingController(d).bindFc(
-      "client",
-      Fractal.getContentController(c).getFcInternalInterface("client"));
-    Fractal.getBindingController(c).bindFc(
-      "client",
-      c.getFcInterface("server"));
-    Fractal.getLifeCycleController(c).startFc();
-
-    StatController sc = (StatController)c.getFcInterface("stat-controller");
-    StatController sd = (StatController)d.getFcInterface("stat-controller");
-    assertEquals(0, sc.getNumberOfMethodCalled());
-    assertEquals(0, sd.getNumberOfMethodCalled());
-
-    I i = (I)c.getFcInterface("server");
-    assertEquals(3, i.n(0, (long)3));
-    assertEquals(7, sc.getNumberOfMethodCalled());
-    assertEquals(7, sd.getNumberOfMethodCalled());
-  }
-
-  public void testCollectionInterceptors () throws Exception {
-    Fractal.getBindingController(d).bindFc(
-      "clients0",
-      d.getFcInterface("servers0"));
-    Fractal.getLifeCycleController(d).startFc();
-
-    StatController sd = (StatController)d.getFcInterface("stat-controller");
-    assertEquals(0, sd.getNumberOfMethodCalled());
-
-    I i = (I)d.getFcInterface("servers0");
-    assertEquals(3, i.n(0, (long)3));
-    assertEquals(7, sd.getNumberOfMethodCalled());
-  }
-
-  public void testCollectionCompositeInterceptors () throws Exception {
-    Fractal.getBindingController(c).bindFc(
-      "servers0",
-      d.getFcInterface("servers0"));
-    Fractal.getBindingController(d).bindFc(
-      "clients0",
-      Fractal.getContentController(c).getFcInternalInterface("clients0"));
-    Fractal.getBindingController(c).bindFc(
-      "clients0",
-      c.getFcInterface("servers0"));
-    Fractal.getLifeCycleController(c).startFc();
-
-    StatController sc = (StatController)c.getFcInterface("stat-controller");
-    StatController sd = (StatController)d.getFcInterface("stat-controller");
-    assertEquals(0, sc.getNumberOfMethodCalled());
-    assertEquals(0, sd.getNumberOfMethodCalled());
-
-    I i = (I)c.getFcInterface("servers0");
-    assertEquals(3, i.n(0, (long)3));
-    assertEquals(7, sc.getNumberOfMethodCalled());
-    assertEquals(7, sd.getNumberOfMethodCalled());
-  }
-}
+/***
+ * Julia: France Telecom's implementation of the Fractal API
+ * Copyright (C) 2001-2002 France Telecom R&D
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Contact: Eric.Bruneton@xxxxxxxxxxxxxxxxxxxx
+ *
+ * Author: Eric Bruneton
+ */
+
+package org.objectweb.fractal.julia.conform;
+
+import org.objectweb.fractal.api.Component;
+import org.objectweb.fractal.api.factory.GenericFactory;
+import org.objectweb.fractal.api.type.TypeFactory;
+import org.objectweb.fractal.api.type.ComponentType;
+import org.objectweb.fractal.api.type.InterfaceType;
+
+import org.objectweb.fractal.julia.conform.components.I;
+import org.objectweb.fractal.julia.conform.components.C;
+import org.objectweb.fractal.julia.conform.controllers.StatController;
+
+import org.objectweb.fractal.util.Fractal;
+
+public class TestInterceptor extends Test {
+
+  protected Component boot;
+  protected TypeFactory tf;
+  protected GenericFactory gf;
+
+  protected ComponentType t;
+  protected Component r, c, d;
+
+  // 
-------------------------------------------------------------------------
+  // Constructor and setup
+  // 
-------------------------------------------------------------------------
+
+  public TestInterceptor (final String name) {
+    super(name);
+  }
+
+  protected void setUp () throws Exception {
+    boot = Fractal.getBootstrapComponent();
+    tf = Fractal.getTypeFactory(boot);
+    gf = Fractal.getGenericFactory(boot);
+    t = tf.createFcType(new InterfaceType[] {
+      tf.createFcItfType("server", I.class.getName(), false, false, false),
+      tf.createFcItfType("servers", I.class.getName(), false, false, true),
+      tf.createFcItfType("client", I.class.getName(), true, true, false),
+      tf.createFcItfType("clients", I.class.getName(), true, true, true)
+    });
+    r = gf.newFcInstance(t, "composite", null);
+    c = gf.newFcInstance(t, "statComposite", null);
+    d = gf.newFcInstance(t, "statPrimitive", C.class.getName());
+    Fractal.getContentController(r).addFcSubComponent(c);
+    Fractal.getContentController(c).addFcSubComponent(d);
+  }
+
+  // 
-------------------------------------------------------------------------
+  // Test interceptors
+  // 
-------------------------------------------------------------------------
+
+  public void testInterceptors () throws Exception {
+    Fractal.getBindingController(d).bindFc(
+      "client",
+      d.getFcInterface("server"));
+    Fractal.getLifeCycleController(d).startFc();
+
+    StatController sd = (StatController)d.getFcInterface("stat-controller");
+    assertEquals(0, sd.getNumberOfMethodCalled());
+
+    I i = (I)d.getFcInterface("server");
+    assertEquals(3, i.n(0, (long)3));
+    assertEquals(7, sd.getNumberOfMethodCalled());
+  }
+
+  public void testCompositeInterceptors () throws Exception {
+    Fractal.getBindingController(c).bindFc(
+      "server",
+      d.getFcInterface("server"));
+    Fractal.getBindingController(d).bindFc(
+      "client",
+      Fractal.getContentController(c).getFcInternalInterface("client"));
+    Fractal.getBindingController(c).bindFc(
+      "client",
+      c.getFcInterface("server"));
+    Fractal.getLifeCycleController(c).startFc();
+
+    StatController sc = (StatController)c.getFcInterface("stat-controller");
+    StatController sd = (StatController)d.getFcInterface("stat-controller");
+    assertEquals(0, sc.getNumberOfMethodCalled());
+    assertEquals(0, sd.getNumberOfMethodCalled());
+
+    I i = (I)c.getFcInterface("server");
+    assertEquals(3, i.n(0, (long)3));
+    assertEquals(7, sc.getNumberOfMethodCalled());
+    assertEquals(7, sd.getNumberOfMethodCalled());
+  }
+
+  public void testCollectionInterceptors () throws Exception {
+    Fractal.getBindingController(d).bindFc(
+      "clients0",
+      d.getFcInterface("servers0"));
+    Fractal.getLifeCycleController(d).startFc();
+
+    StatController sd = (StatController)d.getFcInterface("stat-controller");
+    assertEquals(0, sd.getNumberOfMethodCalled());
+
+    I i = (I)d.getFcInterface("servers0");
+    assertEquals(3, i.n(0, (long)3));
+    assertEquals(7, sd.getNumberOfMethodCalled());
+  }
+
+  public void testCollectionCompositeInterceptors () throws Exception {
+    Fractal.getBindingController(c).bindFc(
+      "servers0",
+      d.getFcInterface("servers0"));
+    Fractal.getBindingController(d).bindFc(
+      "clients0",
+      Fractal.getContentController(c).getFcInternalInterface("clients0"));
+    Fractal.getBindingController(c).bindFc(
+      "clients0",
+      c.getFcInterface("servers0"));
+    Fractal.getLifeCycleController(c).startFc();
+
+    StatController sc = (StatController)c.getFcInterface("stat-controller");
+    StatController sd = (StatController)d.getFcInterface("stat-controller");
+    assertEquals(0, sc.getNumberOfMethodCalled());
+    assertEquals(0, sd.getNumberOfMethodCalled());
+
+    I i = (I)c.getFcInterface("servers0");
+    assertEquals(3, i.n(0, (long)3));
+    assertEquals(7, sc.getNumberOfMethodCalled());
+    assertEquals(7, sd.getNumberOfMethodCalled());
+  }
+}
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestLifeCycleController.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestLifeCycleController.java:1.1
 
julia/test/conform/org/objectweb/fractal/julia/conform/TestLifeCycleController.java:1.2
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestLifeCycleController.java:1.1
     Thu Jan 29 10:35:25 2004
+++ 
julia/test/conform/org/objectweb/fractal/julia/conform/TestLifeCycleController.java
 Sun Jan 28 16:05:19 2007
@@ -46,7 +46,7 @@
   protected Component c, d;
 
   // 
-------------------------------------------------------------------------
-  // Constructor ans setup
+  // Constructor and setup
   // 
-------------------------------------------------------------------------
 
   public TestLifeCycleController (final String name) {
Index: 
julia/test/conform/org/objectweb/fractal/julia/conform/TestTypeFactory.java
diff -u 
julia/test/conform/org/objectweb/fractal/julia/conform/TestTypeFactory.java:1.2
 
julia/test/conform/org/objectweb/fractal/julia/conform/TestTypeFactory.java:1.3
--- 
julia/test/conform/org/objectweb/fractal/julia/conform/TestTypeFactory.java:1.2
     Thu Jun 10 10:49:57 2004
+++ 
julia/test/conform/org/objectweb/fractal/julia/conform/TestTypeFactory.java 
Sun Jan 28 16:05:19 2007
@@ -43,7 +43,7 @@
   protected GenericFactory gf;
 
   // 
-------------------------------------------------------------------------
-  // Constructor ans setup
+  // Constructor and setup
   // 
-------------------------------------------------------------------------
 
   public TestTypeFactory (final String name) {



<--  Date Index  --> <--  Thread Index  -->

Reply via email to:

Powered by MHonArc.

Copyright © 2006-2007, OW2 Consortium | contact | webmaster.