Project: ProActive

Revision: 10089

Author: cdalmass

Date: 05 Sep 2008 05:27:39

• /trunk/src/Tests/functionalTests/component/conform/TestCollection.java

  ......	@@ -90,7 +90,7 @@
  90	90	public void testPrimitiveWithCollection() throws Exception {
  91	91	Component c = gf.newFcInstance(t, "primitive", C.class.getName());
  92	92	checkComponent(c, new HashSet<Object>(Arrays.asList(new Object[] { COMP, BC, LC, SC, NC, MCC, GC, MC,
  93		serverI, clientI })));
  	93	MoC, serverI, clientI })));
  94	94	// new Object[] { COMP, BC, LC, SC, NC, serverI, clientI })));
  95	95	}
  96	96
  ......	@@ -98,7 +98,7 @@
  98	98	public void testCompositeWithCollection() throws Exception {
  99	99	Component c = gf.newFcInstance(t, "composite", null);
  100	100	checkComponent(c, new HashSet<Object>(Arrays.asList(new Object[] { COMP, BC, CC, LC, SC, NC, MCC, GC,
  101		MC, serverI, clientI })));
  	101	MC, MoC, serverI, clientI })));
  102	102	}
  103	103
  104	104	@Test

• /trunk/src/Tests/functionalTests/component/conform/Conformtest.java

  ......	@@ -44,6 +44,7 @@
  44	44	import org.objectweb.fractal.api.type.InterfaceType;
  45	45	import org.objectweb.proactive.core.component.Constants;
  46	46	import org.objectweb.proactive.core.component.ControllerDescription;
  	47	import org.objectweb.proactive.core.component.controller.MonitorController;
  47	48	import org.objectweb.proactive.core.component.controller.PriorityController;
  48	49
  49	50	import functionalTests.ComponentTest;
  ......	@@ -67,6 +68,8 @@
  67	68	//protected final static String CP = "component-parameters-controller/org.objectweb.proactive.core.component.controller.ComponentParametersController/false,false,false";
  68	69	protected final static String PC = Constants.REQUEST_PRIORITY_CONTROLLER + "/" +
  69	70	PriorityController.class.getCanonicalName() + "/false,false,false";
  	71	protected final static String MoC = Constants.MONITOR_CONTROLLER + "/" +
  	72	MonitorController.class.getCanonicalName() + "/false,false,false";
  70	73
  71	74	// protected final static String COMP = "component/"+ComponentItf.TYPE.getFcItfSignature()+"/false,false,false";
  72	75	// protected final static String BC = "binding-controller/"+BindingControllerDef.TYPE.getFcItfSignature()+"/false,false,false";

• /trunk/src/Tests/functionalTests/component/conform/TestGenericFactory.java

  ......	@@ -99,7 +99,7 @@
  99	99	public void testPrimitive() throws Exception {
  100	100	Component c = gf.newFcInstance(t, "primitive", C.class.getName());
  101	101	checkComponent(c, new HashSet<Object>(Arrays.asList(new Object[] { COMP, BC, LC, SC, NC, MCC, GC, MC,
  102		sI, cI })));
  	102	MoC, sI, cI })));
  103	103	}
  104	104
  105	105	@Test
  ......	@@ -113,7 +113,7 @@
  113	113	public void testComposite() throws Exception {
  114	114	Component c = gf.newFcInstance(t, "composite", null);
  115	115	checkComponent(c, new HashSet<Object>(Arrays.asList(new Object[] { COMP, BC, CC, LC, SC, NC, MCC, GC,
  116		MC, sI, cI })));
  	116	MC, MoC, sI, cI })));
  117	117	}
  118	118
  119	119	@Test

• /trunk/src/Tests/functionalTests/component/conform/TestMulticast.java

  ......	@@ -98,20 +98,20 @@
  98	98	public void testPrimitiveWithMulticast() throws Exception {
  99	99	Component master = gf.newFcInstance(tMaster, "primitive", MasterImpl.class.getName());
  100	100	checkComponent(master, new HashSet<Object>(Arrays.asList(new Object[] { COMP, BC, LC, SC, NC, MCC,
  101		GC, MC, serverMaster, clientSlaveMulticast })));
  	101	GC, MC, MoC, serverMaster, clientSlaveMulticast })));
  102	102	Component slave = gf.newFcInstance(tSlave, "primitive", SlaveImpl.class.getName());
  103	103	checkComponent(slave, new HashSet<Object>(Arrays.asList(new Object[] { COMP, LC, SC, NC, MCC, GC, MC,
  104		serverSlave })));
  	104	MoC, serverSlave })));
  105	105	}
  106	106
  107	107	@Test
  108	108	public void testCompositeWithMulticast() throws Exception {
  109	109	Component master = gf.newFcInstance(tMaster, "composite", null);
  110	110	checkComponent(master, new HashSet<Object>(Arrays.asList(new Object[] { COMP, BC, CC, LC, SC, NC,
  111		MCC, GC, MC, serverMaster, clientSlaveMulticast })));
  	111	MCC, GC, MC, MoC, serverMaster, clientSlaveMulticast })));
  112	112	Component slave = gf.newFcInstance(tSlave, "composite", null);
  113	113	checkComponent(slave, new HashSet<Object>(Arrays.asList(new Object[] { COMP, BC, CC, LC, SC, NC, MCC,
  114		GC, MC, serverSlave })));
  	114	GC, MC, MoC, serverSlave })));
  115	115	}
  116	116
  117	117	@Test(expected = InstantiationException.class)