diff --git a/cli/src/test/java/hudson/cli/ConnectionTest.java b/cli/src/test/java/hudson/cli/ConnectionTest.java index 167198a182..8cfac14fb4 100644 --- a/cli/src/test/java/hudson/cli/ConnectionTest.java +++ b/cli/src/test/java/hudson/cli/ConnectionTest.java @@ -1,8 +1,9 @@ package hudson.cli; +import static org.junit.Assert.assertEquals; + import hudson.remoting.FastPipedInputStream; import hudson.remoting.FastPipedOutputStream; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -13,7 +14,8 @@ import java.io.IOException; /** * @author Kohsuke Kawaguchi */ -public class ConnectionTest extends Assert { +public class ConnectionTest { + Throwable e; private Connection c1; private Connection c2; diff --git a/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java b/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java index cfd8d5f53a..e219b2da1b 100644 --- a/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java +++ b/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java @@ -23,8 +23,9 @@ */ package jenkins.model.lazy; +import static org.junit.Assert.*; + import jenkins.model.lazy.AbstractLazyLoadRunMap.Direction; -import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -44,7 +45,7 @@ import org.jvnet.hudson.test.Issue; /** * @author Kohsuke Kawaguchi */ -public class AbstractLazyLoadRunMapTest extends Assert { +public class AbstractLazyLoadRunMapTest { // A=1, B=3, C=5 @Rule public FakeMapBuilder aBuilder = new FakeMapBuilder(); diff --git a/core/src/test/java/jenkins/model/lazy/SortedListTest.java b/core/src/test/java/jenkins/model/lazy/SortedListTest.java index 025317387e..b4ceb72c11 100644 --- a/core/src/test/java/jenkins/model/lazy/SortedListTest.java +++ b/core/src/test/java/jenkins/model/lazy/SortedListTest.java @@ -23,7 +23,10 @@ */ package jenkins.model.lazy; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import java.util.ArrayList; @@ -32,7 +35,7 @@ import java.util.Arrays; /** * @author Kohsuke Kawaguchi */ -public class SortedListTest extends Assert { +public class SortedListTest { SortedList l = new SortedList(new ArrayList(Arrays.asList("B","D","F"))); @Test diff --git a/test/src/test/groovy/hudson/util/BootFailureTest.groovy b/test/src/test/groovy/hudson/util/BootFailureTest.groovy index aac2771831..389ad757e5 100644 --- a/test/src/test/groovy/hudson/util/BootFailureTest.groovy +++ b/test/src/test/groovy/hudson/util/BootFailureTest.groovy @@ -5,7 +5,6 @@ import hudson.model.Hudson import hudson.model.listeners.ItemListener import jenkins.model.Jenkins import org.junit.After -import org.junit.Assert import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -22,7 +21,7 @@ import javax.servlet.ServletContextEvent * * @author Kohsuke Kawaguchi */ -class BootFailureTest extends Assert { +class BootFailureTest { @Rule public TemporaryFolder tmpDir = new TemporaryFolder(); diff --git a/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java b/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java index c11726fd93..b83327a118 100644 --- a/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java +++ b/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java @@ -1,5 +1,8 @@ package jenkins.security; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequestSettings; @@ -7,7 +10,6 @@ import hudson.model.UnprotectedRootAction; import hudson.model.User; import hudson.util.HttpResponses; import hudson.util.Scrambler; -import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; @@ -22,7 +24,7 @@ import java.net.URL; /** * @author Kohsuke Kawaguchi */ -public class BasicHeaderProcessorTest extends Assert { +public class BasicHeaderProcessorTest { @Rule public JenkinsRule j = new JenkinsRule();