You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2008/04/07 15:29:37 UTC
svn commit: r645516 [2/2] - in /felix/trunk/ipojo: ./ ant/ arch/ composite/
core/ core/src/main/java/org/apache/felix/ipojo/handlers/configuration/
core/src/main/java/org/apache/felix/ipojo/util/ event.admin.handler/
examples/junit4osgi/felix-command/ ...
Modified: felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java?rev=645516&r1=645515&r2=645516&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java (original)
+++ felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java Mon Apr 7 06:29:34 2008
@@ -124,23 +124,23 @@
assertEquals("Check c", c, new Character('a'));
assertEquals("Check bool", bool, new Boolean("true"));
- Integer upb = (Integer) props.get("upb");
- Integer ups = (Integer) props.get("ups");
- Integer upi = (Integer) props.get("upi");
- Integer upl = (Integer) props.get("upl");
- Integer upd = (Integer) props.get("upd");
- Integer upf = (Integer) props.get("upf");
- Integer upc = (Integer) props.get("upc");
- Integer upbool = (Integer) props.get("upbool");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upb");
+// Integer ups = (Integer) props.get("ups");
+// Integer upi = (Integer) props.get("upi");
+// Integer upl = (Integer) props.get("upl");
+// Integer upd = (Integer) props.get("upd");
+// Integer upf = (Integer) props.get("upf");
+// Integer upc = (Integer) props.get("upc");
+// Integer upbool = (Integer) props.get("upbool");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigure(instance);
@@ -167,23 +167,23 @@
assertEquals("2) Check c", c, new Character('b'));
assertEquals("2) Check bool", bool, new Boolean("false"));
- upb = (Integer) props.get("upb");
- ups = (Integer) props.get("ups");
- upi = (Integer) props.get("upi");
- upl = (Integer) props.get("upl");
- upd = (Integer) props.get("upd");
- upf = (Integer) props.get("upf");
- upc = (Integer) props.get("upc");
- upbool = (Integer) props.get("upbool");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upb");
+// ups = (Integer) props.get("ups");
+// upi = (Integer) props.get("upi");
+// upl = (Integer) props.get("upl");
+// upd = (Integer) props.get("upd");
+// upf = (Integer) props.get("upf");
+// upc = (Integer) props.get("upc");
+// upbool = (Integer) props.get("upbool");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -211,24 +211,24 @@
assertEquals("Check c", c, new Character('a'));
assertEquals("Check bool", bool, new Boolean("true"));
- Integer upb = (Integer) props.get("upb");
- Integer ups = (Integer) props.get("ups");
- Integer upi = (Integer) props.get("upi");
- Integer upl = (Integer) props.get("upl");
- Integer upd = (Integer) props.get("upd");
- Integer upf = (Integer) props.get("upf");
- Integer upc = (Integer) props.get("upc");
- Integer upbool = (Integer) props.get("upbool");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
-
+// Integer upb = (Integer) props.get("upb");
+// Integer ups = (Integer) props.get("ups");
+// Integer upi = (Integer) props.get("upi");
+// Integer upl = (Integer) props.get("upl");
+// Integer upd = (Integer) props.get("upd");
+// Integer upf = (Integer) props.get("upf");
+// Integer upc = (Integer) props.get("upc");
+// Integer upbool = (Integer) props.get("upbool");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
+//
reconfigureString(instance);
ref = Utils.getServiceReferenceByName(context, CheckService.class.getName(), instance.getInstanceName());
@@ -254,23 +254,23 @@
assertEquals("2) Check c", c, new Character('b'));
assertEquals("2) Check bool", bool, new Boolean("false"));
- upb = (Integer) props.get("upb");
- ups = (Integer) props.get("ups");
- upi = (Integer) props.get("upi");
- upl = (Integer) props.get("upl");
- upd = (Integer) props.get("upd");
- upf = (Integer) props.get("upf");
- upc = (Integer) props.get("upc");
- upbool = (Integer) props.get("upbool");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upb");
+// ups = (Integer) props.get("ups");
+// upi = (Integer) props.get("upi");
+// upl = (Integer) props.get("upl");
+// upd = (Integer) props.get("upd");
+// upf = (Integer) props.get("upf");
+// upc = (Integer) props.get("upc");
+// upbool = (Integer) props.get("upbool");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -314,23 +314,23 @@
assertTrue("Check bool 1", bool[0]);
assertTrue("Check bool 2", bool[0]);
- Integer upb = (Integer) props.get("upbs");
- Integer ups = (Integer) props.get("upss");
- Integer upi = (Integer) props.get("upis");
- Integer upl = (Integer) props.get("upls");
- Integer upd = (Integer) props.get("upds");
- Integer upf = (Integer) props.get("upfs");
- Integer upc = (Integer) props.get("upcs");
- Integer upbool = (Integer) props.get("upbools");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upbs");
+// Integer ups = (Integer) props.get("upss");
+// Integer upi = (Integer) props.get("upis");
+// Integer upl = (Integer) props.get("upls");
+// Integer upd = (Integer) props.get("upds");
+// Integer upf = (Integer) props.get("upfs");
+// Integer upc = (Integer) props.get("upcs");
+// Integer upbool = (Integer) props.get("upbools");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigure(instance);
@@ -373,23 +373,23 @@
assertFalse("2) Check bool 1", bool[0]);
assertFalse("2) Check bool 2", bool[0]);
- upb = (Integer) props.get("upbs");
- ups = (Integer) props.get("upss");
- upi = (Integer) props.get("upis");
- upl = (Integer) props.get("upls");
- upd = (Integer) props.get("upds");
- upf = (Integer) props.get("upfs");
- upc = (Integer) props.get("upcs");
- upbool = (Integer) props.get("upbools");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upbs");
+// ups = (Integer) props.get("upss");
+// upi = (Integer) props.get("upis");
+// upl = (Integer) props.get("upls");
+// upd = (Integer) props.get("upds");
+// upf = (Integer) props.get("upfs");
+// upc = (Integer) props.get("upcs");
+// upbool = (Integer) props.get("upbools");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -433,23 +433,23 @@
assertTrue("Check bool 1", bool[0]);
assertTrue("Check bool 2", bool[0]);
- Integer upb = (Integer) props.get("upbs");
- Integer ups = (Integer) props.get("upss");
- Integer upi = (Integer) props.get("upis");
- Integer upl = (Integer) props.get("upls");
- Integer upd = (Integer) props.get("upds");
- Integer upf = (Integer) props.get("upfs");
- Integer upc = (Integer) props.get("upcs");
- Integer upbool = (Integer) props.get("upbools");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upbs");
+// Integer ups = (Integer) props.get("upss");
+// Integer upi = (Integer) props.get("upis");
+// Integer upl = (Integer) props.get("upls");
+// Integer upd = (Integer) props.get("upds");
+// Integer upf = (Integer) props.get("upfs");
+// Integer upc = (Integer) props.get("upcs");
+// Integer upbool = (Integer) props.get("upbools");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigureString(instance);
@@ -492,23 +492,23 @@
assertFalse("2) Check bool 1", bool[0]);
assertFalse("2) Check bool 2", bool[0]);
- upb = (Integer) props.get("upbs");
- ups = (Integer) props.get("upss");
- upi = (Integer) props.get("upis");
- upl = (Integer) props.get("upls");
- upd = (Integer) props.get("upds");
- upf = (Integer) props.get("upfs");
- upc = (Integer) props.get("upcs");
- upbool = (Integer) props.get("upbools");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upbs");
+// ups = (Integer) props.get("upss");
+// upi = (Integer) props.get("upis");
+// upl = (Integer) props.get("upls");
+// upd = (Integer) props.get("upds");
+// upf = (Integer) props.get("upfs");
+// upc = (Integer) props.get("upcs");
+// upbool = (Integer) props.get("upbools");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -526,11 +526,11 @@
assertEquals("Check strings 1", ss[1], "bar");
assertEquals("Check strings 2", ss[2], "baz");
- Integer upString = (Integer) props.get("upstring");
- Integer upStrings = (Integer) props.get("upstrings");
-
- assertEquals("Check upString", upString, new Integer(1));
- assertEquals("Check upStrings", upStrings, new Integer(1));
+// Integer upString = (Integer) props.get("upstring");
+// Integer upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("Check upString", upString, new Integer(1));
+// assertEquals("Check upStrings", upStrings, new Integer(1));
reconfigure(instance);
@@ -547,11 +547,11 @@
assertEquals("2) Check strings 1", ss[1], "bar");
assertEquals("2) Check strings 2", ss[2], "foo");
- upString = (Integer) props.get("upstring");
- upStrings = (Integer) props.get("upstrings");
-
- assertEquals("2) Check upString", upString, new Integer(2));
- assertEquals("2) Check upStrings", upStrings, new Integer(2));
+// upString = (Integer) props.get("upstring");
+// upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("2) Check upString", upString, new Integer(2));
+// assertEquals("2) Check upStrings", upStrings, new Integer(2));
}
public void testConfigurationObjString() {
@@ -568,11 +568,11 @@
assertEquals("Check strings 1", ss[1], "bar");
assertEquals("Check strings 2", ss[2], "baz");
- Integer upString = (Integer) props.get("upstring");
- Integer upStrings = (Integer) props.get("upstrings");
-
- assertEquals("Check upString", upString, new Integer(1));
- assertEquals("Check upStrings", upStrings, new Integer(1));
+// Integer upString = (Integer) props.get("upstring");
+// Integer upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("Check upString", upString, new Integer(1));
+// assertEquals("Check upStrings", upStrings, new Integer(1));
reconfigureString(instance);
@@ -589,11 +589,11 @@
assertEquals("2) Check strings 1", ss[1], "bar");
assertEquals("2) Check strings 2", ss[2], "foo");
- upString = (Integer) props.get("upstring");
- upStrings = (Integer) props.get("upstrings");
-
- assertEquals("2) Check upString", upString, new Integer(2));
- assertEquals("2) Check upStrings", upStrings, new Integer(2));
+// upString = (Integer) props.get("upstring");
+// upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("2) Check upString", upString, new Integer(2));
+// assertEquals("2) Check upStrings", upStrings, new Integer(2));
}
public void testConfigurationPrimitive2() {
@@ -620,23 +620,23 @@
assertEquals("Check c", c, new Character('a'));
assertEquals("Check bool", bool, new Boolean("true"));
- Integer upb = (Integer) props.get("upb");
- Integer ups = (Integer) props.get("ups");
- Integer upi = (Integer) props.get("upi");
- Integer upl = (Integer) props.get("upl");
- Integer upd = (Integer) props.get("upd");
- Integer upf = (Integer) props.get("upf");
- Integer upc = (Integer) props.get("upc");
- Integer upbool = (Integer) props.get("upbool");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upb");
+// Integer ups = (Integer) props.get("ups");
+// Integer upi = (Integer) props.get("upi");
+// Integer upl = (Integer) props.get("upl");
+// Integer upd = (Integer) props.get("upd");
+// Integer upf = (Integer) props.get("upf");
+// Integer upc = (Integer) props.get("upc");
+// Integer upbool = (Integer) props.get("upbool");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigure(instance2);
@@ -663,23 +663,23 @@
assertEquals("2) Check c", c, new Character('b'));
assertEquals("2) Check bool", bool, new Boolean("false"));
- upb = (Integer) props.get("upb");
- ups = (Integer) props.get("ups");
- upi = (Integer) props.get("upi");
- upl = (Integer) props.get("upl");
- upd = (Integer) props.get("upd");
- upf = (Integer) props.get("upf");
- upc = (Integer) props.get("upc");
- upbool = (Integer) props.get("upbool");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upb");
+// ups = (Integer) props.get("ups");
+// upi = (Integer) props.get("upi");
+// upl = (Integer) props.get("upl");
+// upd = (Integer) props.get("upd");
+// upf = (Integer) props.get("upf");
+// upc = (Integer) props.get("upc");
+// upbool = (Integer) props.get("upbool");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -707,23 +707,23 @@
assertEquals("Check c", c, new Character('a'));
assertEquals("Check bool", bool, new Boolean("true"));
- Integer upb = (Integer) props.get("upb");
- Integer ups = (Integer) props.get("ups");
- Integer upi = (Integer) props.get("upi");
- Integer upl = (Integer) props.get("upl");
- Integer upd = (Integer) props.get("upd");
- Integer upf = (Integer) props.get("upf");
- Integer upc = (Integer) props.get("upc");
- Integer upbool = (Integer) props.get("upbool");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upb");
+// Integer ups = (Integer) props.get("ups");
+// Integer upi = (Integer) props.get("upi");
+// Integer upl = (Integer) props.get("upl");
+// Integer upd = (Integer) props.get("upd");
+// Integer upf = (Integer) props.get("upf");
+// Integer upc = (Integer) props.get("upc");
+// Integer upbool = (Integer) props.get("upbool");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigureString(instance2);
@@ -750,23 +750,23 @@
assertEquals("2) Check c", c, new Character('b'));
assertEquals("2) Check bool", bool, new Boolean("false"));
- upb = (Integer) props.get("upb");
- ups = (Integer) props.get("ups");
- upi = (Integer) props.get("upi");
- upl = (Integer) props.get("upl");
- upd = (Integer) props.get("upd");
- upf = (Integer) props.get("upf");
- upc = (Integer) props.get("upc");
- upbool = (Integer) props.get("upbool");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upb");
+// ups = (Integer) props.get("ups");
+// upi = (Integer) props.get("upi");
+// upl = (Integer) props.get("upl");
+// upd = (Integer) props.get("upd");
+// upf = (Integer) props.get("upf");
+// upc = (Integer) props.get("upc");
+// upbool = (Integer) props.get("upbool");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -810,23 +810,23 @@
assertTrue("Check bool 1", bool[0]);
assertTrue("Check bool 2", bool[0]);
- Integer upb = (Integer) props.get("upbs");
- Integer ups = (Integer) props.get("upss");
- Integer upi = (Integer) props.get("upis");
- Integer upl = (Integer) props.get("upls");
- Integer upd = (Integer) props.get("upds");
- Integer upf = (Integer) props.get("upfs");
- Integer upc = (Integer) props.get("upcs");
- Integer upbool = (Integer) props.get("upbools");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upbs");
+// Integer ups = (Integer) props.get("upss");
+// Integer upi = (Integer) props.get("upis");
+// Integer upl = (Integer) props.get("upls");
+// Integer upd = (Integer) props.get("upds");
+// Integer upf = (Integer) props.get("upfs");
+// Integer upc = (Integer) props.get("upcs");
+// Integer upbool = (Integer) props.get("upbools");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigure(instance2);
@@ -869,23 +869,23 @@
assertFalse("2) Check bool 1", bool[0]);
assertFalse("2) Check bool 2", bool[0]);
- upb = (Integer) props.get("upbs");
- ups = (Integer) props.get("upss");
- upi = (Integer) props.get("upis");
- upl = (Integer) props.get("upls");
- upd = (Integer) props.get("upds");
- upf = (Integer) props.get("upfs");
- upc = (Integer) props.get("upcs");
- upbool = (Integer) props.get("upbools");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upbs");
+// ups = (Integer) props.get("upss");
+// upi = (Integer) props.get("upis");
+// upl = (Integer) props.get("upls");
+// upd = (Integer) props.get("upds");
+// upf = (Integer) props.get("upfs");
+// upc = (Integer) props.get("upcs");
+// upbool = (Integer) props.get("upbools");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -929,23 +929,23 @@
assertTrue("Check bool 1", bool[0]);
assertTrue("Check bool 2", bool[0]);
- Integer upb = (Integer) props.get("upbs");
- Integer ups = (Integer) props.get("upss");
- Integer upi = (Integer) props.get("upis");
- Integer upl = (Integer) props.get("upls");
- Integer upd = (Integer) props.get("upds");
- Integer upf = (Integer) props.get("upfs");
- Integer upc = (Integer) props.get("upcs");
- Integer upbool = (Integer) props.get("upbools");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upbs");
+// Integer ups = (Integer) props.get("upss");
+// Integer upi = (Integer) props.get("upis");
+// Integer upl = (Integer) props.get("upls");
+// Integer upd = (Integer) props.get("upds");
+// Integer upf = (Integer) props.get("upfs");
+// Integer upc = (Integer) props.get("upcs");
+// Integer upbool = (Integer) props.get("upbools");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigureString(instance2);
@@ -988,26 +988,26 @@
assertFalse("2) Check bool 1", bool[0]);
assertFalse("2) Check bool 2", bool[0]);
- upb = (Integer) props.get("upbs");
- ups = (Integer) props.get("upss");
- upi = (Integer) props.get("upis");
- upl = (Integer) props.get("upls");
- upd = (Integer) props.get("upds");
- upf = (Integer) props.get("upfs");
- upc = (Integer) props.get("upcs");
- upbool = (Integer) props.get("upbools");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upbs");
+// ups = (Integer) props.get("upss");
+// upi = (Integer) props.get("upis");
+// upl = (Integer) props.get("upls");
+// upd = (Integer) props.get("upds");
+// upf = (Integer) props.get("upfs");
+// upc = (Integer) props.get("upcs");
+// upbool = (Integer) props.get("upbools");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
-
+
public void testConfigurationObj2() {
ServiceReference ref = Utils.getServiceReferenceByName(context, CheckService.class.getName(), instance2.getInstanceName());
assertNotNull("Test check service availability", ref);
@@ -1022,11 +1022,11 @@
assertEquals("Check strings 1", ss[1], "bar");
assertEquals("Check strings 2", ss[2], "baz");
- Integer upString = (Integer) props.get("upstring");
- Integer upStrings = (Integer) props.get("upstrings");
-
- assertEquals("Check upString", upString, new Integer(1));
- assertEquals("Check upStrings", upStrings, new Integer(1));
+// Integer upString = (Integer) props.get("upstring");
+// Integer upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("Check upString", upString, new Integer(1));
+// assertEquals("Check upStrings", upStrings, new Integer(1));
reconfigure(instance2);
@@ -1043,11 +1043,11 @@
assertEquals("2) Check strings 1", ss[1], "bar");
assertEquals("2) Check strings 2", ss[2], "foo");
- upString = (Integer) props.get("upstring");
- upStrings = (Integer) props.get("upstrings");
-
- assertEquals("2) Check upString", upString, new Integer(2));
- assertEquals("2) Check upStrings", upStrings, new Integer(2));
+// upString = (Integer) props.get("upstring");
+// upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("2) Check upString", upString, new Integer(2));
+// assertEquals("2) Check upStrings", upStrings, new Integer(2));
}
public void testConfigurationObj2String() {
@@ -1064,11 +1064,11 @@
assertEquals("Check strings 1", ss[1], "bar");
assertEquals("Check strings 2", ss[2], "baz");
- Integer upString = (Integer) props.get("upstring");
- Integer upStrings = (Integer) props.get("upstrings");
-
- assertEquals("Check upString", upString, new Integer(1));
- assertEquals("Check upStrings", upStrings, new Integer(1));
+// Integer upString = (Integer) props.get("upstring");
+// Integer upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("Check upString", upString, new Integer(1));
+// assertEquals("Check upStrings", upStrings, new Integer(1));
reconfigureString(instance2);
@@ -1085,11 +1085,11 @@
assertEquals("2) Check strings 1", ss[1], "bar");
assertEquals("2) Check strings 2", ss[2], "foo");
- upString = (Integer) props.get("upstring");
- upStrings = (Integer) props.get("upstrings");
-
- assertEquals("2) Check upString", upString, new Integer(2));
- assertEquals("2) Check upStrings", upStrings, new Integer(2));
+// upString = (Integer) props.get("upstring");
+// upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("2) Check upString", upString, new Integer(2));
+// assertEquals("2) Check upStrings", upStrings, new Integer(2));
}
private void reconfigure(ComponentInstance ci) {
Modified: felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java?rev=645516&r1=645515&r2=645516&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java (original)
+++ felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java Mon Apr 7 06:29:34 2008
@@ -92,23 +92,23 @@
assertEquals("Check c", c, new Character('a'));
assertEquals("Check bool", bool, new Boolean("true"));
- Integer upb = (Integer) props.get("upb");
- Integer ups = (Integer) props.get("ups");
- Integer upi = (Integer) props.get("upi");
- Integer upl = (Integer) props.get("upl");
- Integer upd = (Integer) props.get("upd");
- Integer upf = (Integer) props.get("upf");
- Integer upc = (Integer) props.get("upc");
- Integer upbool = (Integer) props.get("upbool");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upb");
+// Integer ups = (Integer) props.get("ups");
+// Integer upi = (Integer) props.get("upi");
+// Integer upl = (Integer) props.get("upl");
+// Integer upd = (Integer) props.get("upd");
+// Integer upf = (Integer) props.get("upf");
+// Integer upc = (Integer) props.get("upc");
+// Integer upbool = (Integer) props.get("upbool");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigure();
@@ -135,23 +135,23 @@
assertEquals("2) Check c", c, new Character('b'));
assertEquals("2) Check bool", bool, new Boolean("false"));
- upb = (Integer) props.get("upb");
- ups = (Integer) props.get("ups");
- upi = (Integer) props.get("upi");
- upl = (Integer) props.get("upl");
- upd = (Integer) props.get("upd");
- upf = (Integer) props.get("upf");
- upc = (Integer) props.get("upc");
- upbool = (Integer) props.get("upbool");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upb");
+// ups = (Integer) props.get("ups");
+// upi = (Integer) props.get("upi");
+// upl = (Integer) props.get("upl");
+// upd = (Integer) props.get("upd");
+// upf = (Integer) props.get("upf");
+// upc = (Integer) props.get("upc");
+// upbool = (Integer) props.get("upbool");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -179,23 +179,23 @@
assertEquals("Check c", c, new Character('a'));
assertEquals("Check bool", bool, new Boolean("true"));
- Integer upb = (Integer) props.get("upb");
- Integer ups = (Integer) props.get("ups");
- Integer upi = (Integer) props.get("upi");
- Integer upl = (Integer) props.get("upl");
- Integer upd = (Integer) props.get("upd");
- Integer upf = (Integer) props.get("upf");
- Integer upc = (Integer) props.get("upc");
- Integer upbool = (Integer) props.get("upbool");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upb");
+// Integer ups = (Integer) props.get("ups");
+// Integer upi = (Integer) props.get("upi");
+// Integer upl = (Integer) props.get("upl");
+// Integer upd = (Integer) props.get("upd");
+// Integer upf = (Integer) props.get("upf");
+// Integer upc = (Integer) props.get("upc");
+// Integer upbool = (Integer) props.get("upbool");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigureString();
@@ -222,23 +222,23 @@
assertEquals("2) Check c", c, new Character('b'));
assertEquals("2) Check bool", bool, new Boolean("false"));
- upb = (Integer) props.get("upb");
- ups = (Integer) props.get("ups");
- upi = (Integer) props.get("upi");
- upl = (Integer) props.get("upl");
- upd = (Integer) props.get("upd");
- upf = (Integer) props.get("upf");
- upc = (Integer) props.get("upc");
- upbool = (Integer) props.get("upbool");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upb");
+// ups = (Integer) props.get("ups");
+// upi = (Integer) props.get("upi");
+// upl = (Integer) props.get("upl");
+// upd = (Integer) props.get("upd");
+// upf = (Integer) props.get("upf");
+// upc = (Integer) props.get("upc");
+// upbool = (Integer) props.get("upbool");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -282,23 +282,23 @@
assertTrue("Check bool 1", bool[0]);
assertTrue("Check bool 2", bool[0]);
- Integer upb = (Integer) props.get("upbs");
- Integer ups = (Integer) props.get("upss");
- Integer upi = (Integer) props.get("upis");
- Integer upl = (Integer) props.get("upls");
- Integer upd = (Integer) props.get("upds");
- Integer upf = (Integer) props.get("upfs");
- Integer upc = (Integer) props.get("upcs");
- Integer upbool = (Integer) props.get("upbools");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upbs");
+// Integer ups = (Integer) props.get("upss");
+// Integer upi = (Integer) props.get("upis");
+// Integer upl = (Integer) props.get("upls");
+// Integer upd = (Integer) props.get("upds");
+// Integer upf = (Integer) props.get("upfs");
+// Integer upc = (Integer) props.get("upcs");
+// Integer upbool = (Integer) props.get("upbools");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigure();
@@ -341,23 +341,23 @@
assertFalse("2) Check bool 1", bool[0]);
assertFalse("2) Check bool 2", bool[0]);
- upb = (Integer) props.get("upbs");
- ups = (Integer) props.get("upss");
- upi = (Integer) props.get("upis");
- upl = (Integer) props.get("upls");
- upd = (Integer) props.get("upds");
- upf = (Integer) props.get("upfs");
- upc = (Integer) props.get("upcs");
- upbool = (Integer) props.get("upbools");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upbs");
+// ups = (Integer) props.get("upss");
+// upi = (Integer) props.get("upis");
+// upl = (Integer) props.get("upls");
+// upd = (Integer) props.get("upds");
+// upf = (Integer) props.get("upfs");
+// upc = (Integer) props.get("upcs");
+// upbool = (Integer) props.get("upbools");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -401,23 +401,23 @@
assertTrue("Check bool 1", bool[0]);
assertTrue("Check bool 2", bool[0]);
- Integer upb = (Integer) props.get("upbs");
- Integer ups = (Integer) props.get("upss");
- Integer upi = (Integer) props.get("upis");
- Integer upl = (Integer) props.get("upls");
- Integer upd = (Integer) props.get("upds");
- Integer upf = (Integer) props.get("upfs");
- Integer upc = (Integer) props.get("upcs");
- Integer upbool = (Integer) props.get("upbools");
-
- assertEquals("Check upb", upb, new Integer(1));
- assertEquals("Check ups", ups, new Integer(1));
- assertEquals("Check upi", upi, new Integer(1));
- assertEquals("Check upl", upl, new Integer(1));
- assertEquals("Check upd", upd, new Integer(1));
- assertEquals("Check upf", upf, new Integer(1));
- assertEquals("Check upc", upc, new Integer(1));
- assertEquals("Check upbool", upbool, new Integer(1));
+// Integer upb = (Integer) props.get("upbs");
+// Integer ups = (Integer) props.get("upss");
+// Integer upi = (Integer) props.get("upis");
+// Integer upl = (Integer) props.get("upls");
+// Integer upd = (Integer) props.get("upds");
+// Integer upf = (Integer) props.get("upfs");
+// Integer upc = (Integer) props.get("upcs");
+// Integer upbool = (Integer) props.get("upbools");
+//
+// assertEquals("Check upb", upb, new Integer(1));
+// assertEquals("Check ups", ups, new Integer(1));
+// assertEquals("Check upi", upi, new Integer(1));
+// assertEquals("Check upl", upl, new Integer(1));
+// assertEquals("Check upd", upd, new Integer(1));
+// assertEquals("Check upf", upf, new Integer(1));
+// assertEquals("Check upc", upc, new Integer(1));
+// assertEquals("Check upbool", upbool, new Integer(1));
reconfigureString();
@@ -460,23 +460,23 @@
assertFalse("2) Check bool 1", bool[0]);
assertFalse("2) Check bool 2", bool[0]);
- upb = (Integer) props.get("upbs");
- ups = (Integer) props.get("upss");
- upi = (Integer) props.get("upis");
- upl = (Integer) props.get("upls");
- upd = (Integer) props.get("upds");
- upf = (Integer) props.get("upfs");
- upc = (Integer) props.get("upcs");
- upbool = (Integer) props.get("upbools");
-
- assertEquals("2) Check upb", upb, new Integer(2));
- assertEquals("2) Check ups", ups, new Integer(2));
- assertEquals("2) Check upi", upi, new Integer(2));
- assertEquals("2) Check upl", upl, new Integer(2));
- assertEquals("2) Check upd", upd, new Integer(2));
- assertEquals("2) Check upf", upf, new Integer(2));
- assertEquals("2) Check upc", upc, new Integer(2));
- assertEquals("2) Check upbool", upbool, new Integer(2));
+// upb = (Integer) props.get("upbs");
+// ups = (Integer) props.get("upss");
+// upi = (Integer) props.get("upis");
+// upl = (Integer) props.get("upls");
+// upd = (Integer) props.get("upds");
+// upf = (Integer) props.get("upfs");
+// upc = (Integer) props.get("upcs");
+// upbool = (Integer) props.get("upbools");
+//
+// assertEquals("2) Check upb", upb, new Integer(2));
+// assertEquals("2) Check ups", ups, new Integer(2));
+// assertEquals("2) Check upi", upi, new Integer(2));
+// assertEquals("2) Check upl", upl, new Integer(2));
+// assertEquals("2) Check upd", upd, new Integer(2));
+// assertEquals("2) Check upf", upf, new Integer(2));
+// assertEquals("2) Check upc", upc, new Integer(2));
+// assertEquals("2) Check upbool", upbool, new Integer(2));
}
@@ -494,11 +494,11 @@
assertEquals("Check strings 1", ss[1], "bar");
assertEquals("Check strings 2", ss[2], "baz");
- Integer upString = (Integer) props.get("upstring");
- Integer upStrings = (Integer) props.get("upstrings");
-
- assertEquals("Check upString", upString, new Integer(1));
- assertEquals("Check upStrings", upStrings, new Integer(1));
+// Integer upString = (Integer) props.get("upstring");
+// Integer upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("Check upString", upString, new Integer(1));
+// assertEquals("Check upStrings", upStrings, new Integer(1));
reconfigure();
@@ -515,11 +515,11 @@
assertEquals("2) Check strings 1", ss[1], "bar");
assertEquals("2) Check strings 2", ss[2], "foo");
- upString = (Integer) props.get("upstring");
- upStrings = (Integer) props.get("upstrings");
-
- assertEquals("2) Check upString", upString, new Integer(2));
- assertEquals("2) Check upStrings", upStrings, new Integer(2));
+// upString = (Integer) props.get("upstring");
+// upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("2) Check upString", upString, new Integer(2));
+// assertEquals("2) Check upStrings", upStrings, new Integer(2));
}
public void testConfigurationObjString() {
@@ -536,11 +536,11 @@
assertEquals("Check strings 1", ss[1], "bar");
assertEquals("Check strings 2", ss[2], "baz");
- Integer upString = (Integer) props.get("upstring");
- Integer upStrings = (Integer) props.get("upstrings");
-
- assertEquals("Check upString", upString, new Integer(1));
- assertEquals("Check upStrings", upStrings, new Integer(1));
+// Integer upString = (Integer) props.get("upstring");
+// Integer upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("Check upString", upString, new Integer(1));
+// assertEquals("Check upStrings", upStrings, new Integer(1));
reconfigureString();
@@ -557,11 +557,11 @@
assertEquals("2) Check strings 1", ss[1], "bar");
assertEquals("2) Check strings 2", ss[2], "foo");
- upString = (Integer) props.get("upstring");
- upStrings = (Integer) props.get("upstrings");
-
- assertEquals("2) Check upString", upString, new Integer(2));
- assertEquals("2) Check upStrings", upStrings, new Integer(2));
+// upString = (Integer) props.get("upstring");
+// upStrings = (Integer) props.get("upstrings");
+//
+// assertEquals("2) Check upString", upString, new Integer(2));
+// assertEquals("2) Check upStrings", upStrings, new Integer(2));
}
private void reconfigure() {
Modified: felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java?rev=645516&r1=645515&r2=645516&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java (original)
+++ felix/trunk/ipojo/tests/tests.core/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java Mon Apr 7 06:29:34 2008
@@ -78,6 +78,7 @@
try {
return fact.createComponentInstance(configuration);
} catch (Exception e) {
+ e.printStackTrace();
Assert.fail("Cannot create the instance from " + factoryName + " : " + e.getMessage());
return null;
}
@@ -152,6 +153,24 @@
return null;
} else {
return refs[0];
+ }
+ }
+
+ public static ServiceReference getServiceReferenceByPID(BundleContext bc, String itf, String pid) {
+ ServiceReference[] refs = null;
+ String filter = "(" + "service.pid" + "=" + pid + ")";
+ try {
+ refs = bc.getServiceReferences(itf, filter);
+ } catch (InvalidSyntaxException e) {
+ System.err.println("Invalid Filter : " + filter);
+ }
+ if (refs == null) {
+ return null;
+ } else if (refs.length == 1) {
+ return refs[0];
+ } else {
+ Assert.fail("A service lookup by PID returned several providers (" + refs.length + ")" + " for " + itf + " with " + pid);
+ return null;
}
}
Modified: felix/trunk/ipojo/tests/tests.core/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core/src/main/resources/metadata.xml?rev=645516&r1=645515&r2=645516&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/tests.core/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/tests.core/src/main/resources/metadata.xml Mon Apr 7 06:29:34 2008
@@ -100,6 +100,19 @@
</component>
<component
className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ factory="FooProviderType-4" architecture="true">
+ <provides>
+ <property name="foo" field="m_foo" />
+ <property name="bar" field="m_bar" />
+ <property name="baz" type="java.lang.String" />
+ </provides>
+ <properties propagation="true" pid="FooProvider-3">
+ <property name="foo" field="m_foo" />
+ <property name="bar" field="m_bar" />
+ </properties>
+ </component>
+ <component
+ className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
factory="FooProviderType-itf" architecture="true">
<provides
interface="org.apache.felix.ipojo.test.scenarios.service.FooService" />
Modified: felix/trunk/ipojo/white.board.pattern.handler/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/white.board.pattern.handler/pom.xml?rev=645516&r1=645515&r2=645516&view=diff
==============================================================================
--- felix/trunk/ipojo/white.board.pattern.handler/pom.xml (original)
+++ felix/trunk/ipojo/white.board.pattern.handler/pom.xml Mon Apr 7 06:29:34 2008
@@ -30,12 +30,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>${pom.version}</version>
+ <version>0.7.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
+ <version>0.7.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>0.7.6-SNAPSHOT</version>
<executions>
<execution>
<goals>