Merge pull request #788 from Xylus/feature/issue-765/1.1.x

fix PinpointJUnit4ClassRunner to work with the updated junit
pinpoint-apm · Jul 30, 2015 · 5d5b943 · 5d5b943
2 parents b5f10c2 + 09dfe0b
commit 5d5b943
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -563,7 +563,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8</version>
+                <version>4.12</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/test/junit4/PinpointJUnit4ClassRunner.java b/profiler/src/main/java/com/navercorp/pinpoint/test/junit4/PinpointJUnit4ClassRunner.java
@@ -74,8 +74,8 @@ public PinpointJUnit4ClassRunner(Class<?> clazz) throws InitializationError {
         // Replace test target with a class loaded by TestClassLoader
         // Cannot override getTestClass() which is used to get test class by JUnit because it's final.
         try {
-            // PinpointJunit4ClassRunner -> BlockJUnit4ClassRunner -> ParentRunner.fTestClass
-            Field testClassField = this.getClass().getSuperclass().getSuperclass().getDeclaredField("fTestClass");
+            // PinpointJunit4ClassRunner -> BlockJUnit4ClassRunner -> ParentRunner.testClass
+            Field testClassField = this.getClass().getSuperclass().getSuperclass().getDeclaredField("testClass");
             testClassField.setAccessible(true);
             testClassField.set(this, this.testContext.getTestClass());
         } catch (Exception e) {