5dd905f suffered from a ClassLoader issue visible only in maven-junit…

…-plugin (not Surefire).
jenkinsci · Sep 5, 2012 · 4557a43 · 4557a43 · kutzi · Jun 16, 2013
1 parent 0805db1
commit 4557a43
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java b/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java
@@ -58,6 +58,7 @@ public TestEnvironment(@Nonnull Description description) {
 
     /**
      * Current test case being run (works for JUnit 3 or 4).
+     * Warning: {@link Description#getTestClass} is currently broken in some environments. Use {@link Description#getClassName} instead.
      */
     public @Nonnull Description description() {
         if (description != null) {

diff --git a/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java b/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java
@@ -65,25 +65,24 @@ protected boolean isActive(AnnotatedElement e) {
         Description description = env.description();
         if (testName.length()>0 && !testName.equals(description.getMethodName()))
             return false;   // doesn't apply to this test
-
+        String className = description.getClassName();
         if (e instanceof Class) {
-            return isActive(description, (Class)e);
+            for (Class<?> outer = (Class) e; outer != null; outer = outer.getEnclosingClass()) {
+                if (outer.getName().equals(className)) {
+                    return true;      // enclosed
+                }
+            }
+            return false;
         }
         if (e instanceof Field) {
             Field f = (Field) e;
-            return f.getDeclaringClass() == description.getTestClass();
+            return f.getDeclaringClass().getName().equals(className);
         }
         if (e instanceof Method) {
             Method m = (Method) e;
-            return m.getDeclaringClass() == description.getTestClass();
+            return m.getDeclaringClass().getName().equals(className);
         }
         return false;
     }
 
-    private boolean isActive(Description description, Class<?> extType) {
-        for (Class<?> outer = extType; outer!=null; outer=outer.getEnclosingClass())
-            if (outer == description.getTestClass())
-                return true;      // enclosed
-        return false;
-    }
 }