Fixing issue 14 (conflict with powermock on the classpath) by setting GwtMockito as the context class loader during initialization

Author: ekuefler

gwtmockito/pom.xml

@@ -36,5 +36,13 @@
       <artifactId>javassist</artifactId>
     </dependency>
 
+    <!-- We don't actually depend on PowerMock, but we put it in the classpath
+         for tests to ensure that it doesn't cause a conflict. See
+         https://github.com/google/gwtmockito/issues/14. -->
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+    </dependency>
+
   </dependencies>
 </project>

gwtmockito/src/main/java/com/google/gwtmockito/GwtMockitoTestRunner.java

@@ -118,6 +118,12 @@ public GwtMockitoTestRunner(Class<?> unitTestClass) throws InitializationError {
     }
     gwtMockitoClassLoader = new GwtMockitoClassLoader(getParentClassloader(), classPool);
 
+    // Use this custom classloader as the context classloader during the rest of the initialization
+    // process so that classes loaded via the context classloader will be compatible with the ones
+    // used during test.
+    ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
+    Thread.currentThread().setContextClassLoader(gwtMockitoClassLoader);
+
     try {
       // Reload the test class with our own custom class loader that does things like remove
       // final modifiers, allowing GWT Elements to be mocked. Also load GwtMockito itself so we can
@@ -133,6 +139,8 @@ public GwtMockitoTestRunner(Class<?> unitTestClass) throws InitializationError {
       testClassField.set(this, new TestClass(customLoadedTestClass));
     } catch (Exception e) {
       throw new InitializationError(e);
+    } finally {
+      Thread.currentThread().setContextClassLoader(originalClassLoader);
     }
   }
 
@@ -231,8 +239,11 @@ public void run(RunNotifier notifier) {
     // classloader than the class being mocked.
     ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
     Thread.currentThread().setContextClassLoader(gwtMockitoClassLoader);
-    super.run(notifier);
-    Thread.currentThread().setContextClassLoader(originalClassLoader);
+    try {
+      super.run(notifier);
+    } finally {
+      Thread.currentThread().setContextClassLoader(originalClassLoader);
+    }
   }
 
   /**

pom.xml

@@ -80,6 +80,16 @@
         <artifactId>gwtmockito</artifactId>
         <version>${project.version}</version>
       </dependency>
+
+      <!-- We don't actually depend on PowerMock, but we put it in the classpath
+           for tests to ensure that it doesn't cause a conflict. See
+           https://github.com/google/gwtmockito/issues/14. -->
+      <dependency>
+        <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>