From 479a8ee97f9e21ad0f6f452281685ea752a118a5 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Mon, 13 Feb 2012 13:48:04 -0800
Subject: [PATCH] more test fixes

---
 .../main/java/org/jvnet/hudson/test/TestExtensionLoader.java  | 3 +--
 test/src/test/java/hudson/ExtensionFinderTest.java            | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

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 6cc943ffaf..4f4a3a3370 100644
--- a/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java
+++ b/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java
@@ -54,12 +54,11 @@ public class TestExtensionLoader extends GuiceExtensionAnnotation<TestExtension>
     @Override
     protected boolean isActive(AnnotatedElement e) {
         TestEnvironment env = TestEnvironment.get();
-        if (env==null)  return false;
 
         TestExtension a = e.getAnnotation(TestExtension.class);
         if (a==null)        return false;   // stale index
         String testName = a.value();
-        if (testName.length()>0 && !env.testCase.getName().equals(testName))
+        if (testName.length()>0 && env!=null && env.testCase!=null && !env.testCase.getName().equals(testName))
             return false;   // doesn't apply to this test
 
         if (e instanceof Class) {
diff --git a/test/src/test/java/hudson/ExtensionFinderTest.java b/test/src/test/java/hudson/ExtensionFinderTest.java
index 9efdc2decd..c71f6d6ce5 100644
--- a/test/src/test/java/hudson/ExtensionFinderTest.java
+++ b/test/src/test/java/hudson/ExtensionFinderTest.java
@@ -111,10 +111,10 @@ public class ExtensionFinderTest extends HudsonTestCase {
 
     @TestExtension("testErrorRecovery")
     public static class BrokenExtension extends PageDecorator {
-        @Inject Comparable c;
-        
         public BrokenExtension() {
             super(InjectingExtension.class);
+            
+            throw new Error();
         }
     }
 }
-- 
GitLab