From 4557a436bf71db6cb18d0838f655a960b1adbd25 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 5 Sep 2012 19:18:43 -0400 Subject: [PATCH] 5dd905f suffered from a ClassLoader issue visible only in maven-junit-plugin (not Surefire). --- .../jvnet/hudson/test/TestEnvironment.java | 1 + .../hudson/test/TestExtensionLoader.java | 19 +++++++++---------- 2 files changed, 10 insertions(+), 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 index 069af156a1..eec59391eb 100644 --- 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 class TestEnvironment { /** * 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 index 436b8ff421..356dfca0e9 100644 --- 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 @@ public class TestExtensionLoader extends GuiceExtensionAnnotation 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; - } }