svn commit: r1682591 - in /webservices/axiom/trunk/systests/osgi-tests: pom.xml src/test/java/org/apache/axiom/test/SJSXPTest.java src/test/java/org/apache/axiom/test/UsesConstraintsTest.java

[veithen]

Author: veithen
Date: Sat May 30 09:02:38 2015
New Revision: 1682591

URL: http://svn.apache.org/r1682591
Log:
Update the OSGi tests to use a more recent version of Apache Felix.

Modified:
    webservices/axiom/trunk/systests/osgi-tests/pom.xml
    
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
    
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java

Modified: webservices/axiom/trunk/systests/osgi-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/pom.xml?rev=1682591&r1=1682590&r2=1682591&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/osgi-tests/pom.xml Sat May 30 09:02:38 2015
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>3.2.2</version>
+            <version>5.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: 
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java?rev=1682591&r1=1682590&r2=1682591&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
 (original)
+++ 
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
 Sat May 30 09:02:38 2015
@@ -21,6 +21,7 @@ package org.apache.axiom.test;
 import static org.junit.Assert.assertEquals;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemPackages;
 import static org.ops4j.pax.exam.CoreOptions.url;
 
 import java.io.StringReader;
@@ -53,6 +54,9 @@ public class SJSXPTest {
                 url("link:classpath:org.apache.james.apache-mime4j-core.link"),
                 
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
                 
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
+                // For whatever reason, these packages are no longer exported 
by the system bundle
+                // in Felix >= 4.0.0
+                systemPackages("org.w3c.dom.html", "org.w3c.dom.ranges", 
"org.w3c.dom.traversal"),
                 junitBundles());
     }
     

Modified: 
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java?rev=1682591&r1=1682590&r2=1682591&view=diff
==============================================================================
--- 
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
 (original)
+++ 
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
 Sat May 30 09:02:38 2015
@@ -60,9 +60,9 @@ import org.osgi.framework.launch.Framewo
 public class UsesConstraintsTest {
     static class Listener implements FrameworkListener {
         private final Pattern regex = Pattern.compile(
-                "Uses constraint violation\\. Unable to resolve module 
testbundle. \\[.*\\] because it is exposed to "
-                + "package 'javax\\.xml\\.stream' from modules 
org\\.apache\\.felix\\.framework \\[0\\] and "
-                + "org\\.apache\\.servicemix\\.specs\\.stax-api-1.0 \\[.*\\] 
via two dependency chains\\."
+                "Uses constraint violation\\. Unable to resolve .* testbundle. 
\\[.*\\] because it is exposed to "
+                + "package 'javax\\.xml\\.stream' from .* 
org\\.apache\\.felix\\.framework .* and "
+                + "org\\.apache\\.servicemix\\.specs\\.stax-api-1.0 .* via two 
dependency chains\\."
                 + ".*package=org\\.apache\\.axiom\\.om.*", Pattern.DOTALL); 
         private final CountDownLatch latch = new CountDownLatch(1);
         private boolean gotExpectedError;