From b864b58da6b011592e3c14f99f3282771d22d9ff Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Thu, 18 Aug 2011 22:48:57 +0200
Subject: [PATCH] cleanest workaround for junit/mockito problems so far by
 putting them on the global classpath instead of using modules.

---
 integrationtest/pom.xml                         | 17 ++++++++++-------
 .../XmlRouterIntegrationTest.java               | 11 ++++++-----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index fe3daa8..cd66194 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -45,16 +45,20 @@
         <!-- Pax exam -->
 
         <!-- only runner -->
+        <!--
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-paxrunner</artifactId>
         </dependency>
+        -->
 
         <!-- only runner -->
+        <!--
         <dependency>
             <groupId>org.ops4j.pax.runner</groupId>
             <artifactId>pax-runner-no-jcl</artifactId>
         </dependency>
+        -->
 
 
         <!-- both runner and native -->
@@ -70,15 +74,15 @@
         </dependency>
 
         <!-- only native -->
-        <!--
+        
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-native</artifactId>
         </dependency>
-        -->
+        
 
         <!-- only native -->
-        <!-- 
+         
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-aether</artifactId>
@@ -87,16 +91,15 @@
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-wrap</artifactId>
         </dependency>
-        -->
+        
 
         <!-- only native -->
-        <!-- 
+         
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
         </dependency>
-        -->
-
+        
 
     </dependencies>
 
diff --git a/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java b/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
index a07a137..4ba0dc8 100644
--- a/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
+++ b/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
@@ -38,13 +38,15 @@ public class XmlRouterIntegrationTest {
         return options(
             cleanCaches(),
             // Test dependencies
-            wrappedBundle(mavenBundle().groupId("junit")
-                .artifactId("junit-dep").version("4.8.2")), //
-            mavenBundle().groupId("org.mockito").artifactId("mockito-all")
-                .version("1.8.5"), //
+            // wrappedBundle(mavenBundle().groupId("junit")
+            // .artifactId("junit-dep").version("4.8.2")), //
+            // mavenBundle().groupId("org.mockito").artifactId("mockito-all")
+            // .version("1.8.5"), //
             // junitBundles(),
             // mockitoBundles(),
 
+            systemPackages("org.mockito", "org.junit"),
+
             // XML Router API packages.
             mavenBundle().groupId("org.wamblee.xmlrouter")
                 .artifactId("xmlrouter-common").versionAsInProject(),//
@@ -70,7 +72,6 @@ public class XmlRouterIntegrationTest {
         System.out.println("=== Got context " + aContext);
 
         Destination dest = mock(Destination.class);
-        // verify(dest, never()).receive(any(DOMSource.class));
         ServiceRegistration registration = aContext.registerService(
             Destination.class.getName(), dest, null);
 
-- 
2.31.1