felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1479811 - in /felix/trunk/ipojo/runtime/core-it/src/it: ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/ ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/
Date Tue, 07 May 2013 08:46:56 GMT
Author: clement
Date: Tue May  7 08:46:55 2013
New Revision: 1479811

URL: http://svn.apache.org/r1479811
Log:
Make tests compiled on KF

Modified:
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCCallback.java
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCController.java
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCCallback.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCCallback.java?rev=1479811&r1=1479810&r2=1479811&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCCallback.java
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCCallback.java
Tue May  7 08:46:55 2013
@@ -115,7 +115,8 @@ public class TestBadLFCCallback extends 
     }
 
     private Element getManipulationForComponent() {
-        String header = getTestBundle().getHeaders().get("iPOJO-Components");
+        // On KF we must cast the result.
+        String header = (String) getTestBundle().getHeaders().get("iPOJO-Components");
         Element elem = null;
         try {
             elem = ManifestMetadataParser.parseHeaderMetadata(header);

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCController.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCController.java?rev=1479811&r1=1479810&r2=1479811&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCController.java
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadLFCController.java
Tue May  7 08:46:55 2013
@@ -53,7 +53,8 @@ public class TestBadLFCController extend
     }
 
     private Element getManipulationForComponent(String comp_name) {
-        String header = getTestBundle().getHeaders().get("iPOJO-Components");
+        // On KF we must cast the result
+        String header = (String) getTestBundle().getHeaders().get("iPOJO-Components");
         Element elem = null;
         try {
             elem = ManifestMetadataParser.parseHeaderMetadata(header);

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java?rev=1479811&r1=1479810&r2=1479811&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/bad/test/TestBadServiceDependencies.java
Tue May  7 08:46:55 2013
@@ -132,7 +132,8 @@ public class TestBadServiceDependencies 
     }
 
     private Element getManipulationForComponent() {
-        String header = getTestBundle().getHeaders().get("iPOJO-Components");
+        // On KF we must cast the result.
+        String header = (String) getTestBundle().getHeaders().get("iPOJO-Components");
         Element elem = null;
         try {
             elem = ManifestMetadataParser.parse(header);

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java?rev=1479811&r1=1479810&r2=1479811&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
Tue May  7 08:46:55 2013
@@ -37,8 +37,6 @@ import org.ops4j.pax.exam.spi.reactors.E
 import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.ops4j.pax.tinybundles.core.TinyBundles;
 import org.osgi.framework.*;
-import org.osgi.framework.wiring.BundleWire;
-import org.osgi.framework.wiring.BundleWiring;
 import org.ow2.chameleon.testing.helpers.Stability;
 import org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOStrategy;
 
@@ -189,11 +187,11 @@ public class VersionConflictTest extends
         }
 
         Bundle consBundle = osgiHelper.getBundle("MyCons");
-        BundleWiring wiring = consBundle.adapt(BundleWiring.class);
-        System.out.println("Bundle Wiring req: ");
-        for (BundleWire wire : wiring.getRequiredWires(null)) {
-            System.out.println(wire.getCapability().getAttributes() + " - " + wire.getCapability().getDirectives());
-        }
+//        BundleWiring wiring = consBundle.adapt(BundleWiring.class);
+//        System.out.println("Bundle Wiring req: ");
+//        for (BundleWire wire : wiring.getRequiredWires(null)) {
+//            System.out.println(wire.getCapability().getAttributes() + " - " + wire.getCapability().getDirectives());
+//        }
 
         osgiHelper.waitForService(Architecture.class.getName(), "(architecture.instance=mycons)",
2000);
 



Mime
View raw message