JUnit 4.

test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java

@@ -31,22 +31,26 @@ import hudson.tasks.test.TestObject;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.TouchBuilder;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.JenkinsRule.WebClient;
 
-public class JUnitResultArchiverTest extends HudsonTestCase {
+public class JUnitResultArchiverTest {
 
+    @Rule public JenkinsRule j = new JenkinsRule();
 	private FreeStyleProject project;
 	private JUnitResultArchiver archiver;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		project = createFreeStyleProject("junit");
+	@Before public void setUp() throws Exception {
+		project = j.createFreeStyleProject("junit");
 		archiver = new JUnitResultArchiver("*.xml");
 		project.getPublishersList().add(archiver);
 		
@@ -54,12 +58,12 @@ public class JUnitResultArchiverTest extends HudsonTestCase {
 	}
 	
 	@LocalData
-	public void testBasic() throws Exception {
+	@Test public void basic() throws Exception {
 		FreeStyleBuild build = project.scheduleBuild2(0).get(10, TimeUnit.SECONDS);
 		
 		assertTestResults(build);
 		
-		WebClient wc =new WebClient();
+		WebClient wc = j.new WebClient();
 		wc.getPage(project); // project page
 		wc.getPage(build); // build page
 		wc.getPage(build, "testReport");  // test report
@@ -71,17 +75,17 @@ public class JUnitResultArchiverTest extends HudsonTestCase {
 	}
 
    @LocalData
-    public void testSlave() throws Exception {
-        DumbSlave s = createOnlineSlave();
+   @Test public void slave() throws Exception {
+        DumbSlave s = j.createOnlineSlave();
         project.setAssignedLabel(s.getSelfLabel());
 
-        FilePath src = new FilePath(jenkins.getRootPath(), "jobs/junit/workspace/");
+        FilePath src = new FilePath(j.jenkins.getRootPath(), "jobs/junit/workspace/");
         assertNotNull(src);
         FilePath dest = s.getWorkspaceFor(project);
         assertNotNull(dest);
         src.copyRecursiveTo("*.xml", dest);
         
-        testBasic();
+        basic();
     }
 
 	private void assertTestResults(FreeStyleBuild build) {
@@ -99,7 +103,7 @@ public class JUnitResultArchiverTest extends HudsonTestCase {
 	}
 	
 	@LocalData
-	public void testPersistence() throws Exception {
+	@Test public void persistence() throws Exception {
         project.scheduleBuild2(0).get(60, TimeUnit.SECONDS);
 		
 		reloadJenkins();
@@ -110,12 +114,12 @@ public class JUnitResultArchiverTest extends HudsonTestCase {
 	}
 
 	private void reloadJenkins() throws Exception {
-        jenkins.reload();
-		project = (FreeStyleProject) jenkins.getItem("junit");
+        j.jenkins.reload();
+		project = (FreeStyleProject) j.jenkins.getItem("junit");
 	}
 	
 	@LocalData
-	public void testSetDescription() throws Exception {
+	@Test public void setDescription() throws Exception {
 		FreeStyleBuild build = project.scheduleBuild2(0).get(10, TimeUnit.SECONDS);
 		
 		CaseResult caseResult = build.getAction(TestResultAction.class).getFailedTests().get(0);
@@ -137,10 +141,10 @@ public class JUnitResultArchiverTest extends HudsonTestCase {
         object.doSubmitDescription("description");
 
         // test the roundtrip
-        HtmlPage page = new WebClient().goTo(url);
+        HtmlPage page = j.new WebClient().goTo(url);
 		page.getAnchorByHref("editDescription").click();
 		HtmlForm form = findForm(page, "submitDescription");
-		submit(form);
+		j.submit(form);
 		
 		assertEquals("description", object.getDescription());
 	}