Updated tests, removed deprecated method

Author: MadsNielsen

src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/AccumulatedCommitStrategyIT.java

@@ -15,9 +15,9 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import java.io.File;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.assertEquals;
 import static org.jenkinsci.plugins.pretestedintegration.integration.scm.git.TestUtilsFactory.STRATEGY_TYPE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * <h3>Set of tests that test that we react correctly to merge conflicts</h3>

src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CommitMessagesWithSpecialCharsIT.java

@@ -5,12 +5,12 @@
 import hudson.model.Result;
 import hudson.util.RunList;
 
-import java.util.Iterator;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertNotNull;
+import java.util.Iterator;
 
 import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode;
 import org.eclipse.jgit.revwalk.RevCommit;

src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CustomIntegrationBranchIT.java

@@ -4,11 +4,13 @@
 import hudson.model.FreeStyleProject;
 import hudson.model.Result;
 import hudson.util.RunList;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.util.Iterator;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertNotNull;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.junit.Test;

src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/FastForwardSingleCommitsIT.java

@@ -3,14 +3,19 @@
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
 import hudson.model.Result;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.jgit.lib.Repository;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
-import static junit.framework.Assert.assertTrue;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.recipes.WithTimeout;
 
 public class FastForwardSingleCommitsIT {
 
@@ -25,6 +30,7 @@ public void tearDown() throws Exception {
     }
 
     @Test
+    @WithTimeout(600)
     public void squash_fastForwardsSingleCommit_PassWhenPossible() throws Exception {
         List<TestCommit> commits = new ArrayList<TestCommit>() {
             {
@@ -46,6 +52,7 @@ public void squash_fastForwardsSingleCommit_PassWhenPossible() throws Exception
     }
 
     @Test
+    @WithTimeout(600)
     public void squash_fastForwardSingleCommitFails_FailsWhenImpossible() throws Exception {
         List<TestCommit> commits = new ArrayList<TestCommit>() {
             {
@@ -61,13 +68,15 @@ public void squash_fastForwardSingleCommitFails_FailsWhenImpossible() throws Exc
         jenkinsRule.waitUntilNoActivityUpTo(60000);
 
         FreeStyleBuild build = project.getFirstBuild();
-        jenkinsRule.assertBuildStatus(Result.FAILURE, build);
+        Assert.assertEquals(Result.FAILURE, build.getResult());
+
         String console = jenkinsRule.createWebClient().getPage(project.getLastBuild(), "console").asText();
         System.out.println(console);
         assertTrue("FF merge should have failed.", console.contains("FF merge failed."));
     }
 
     @Test
+    @WithTimeout(600)
     public void squash_fastForwardSingleCommitFails_SkipsWhenMultipleCommits() throws Exception {
         List<TestCommit> commits = new ArrayList<TestCommit>() {
             {
@@ -84,13 +93,10 @@ public void squash_fastForwardSingleCommitFails_SkipsWhenMultipleCommits() throw
 
         FreeStyleBuild build = project.getFirstBuild();
         assertTrue("The result should be SUCCESS, but is : " + build.getResult(), build.getResult().isBetterOrEqualTo(Result.SUCCESS));
-        String console = jenkinsRule.createWebClient().getPage(project.getLastBuild(), "console").asText();
-        System.out.println(console);
-        repository.close();
-        assertTrue("FF merge should have failed.", console.contains("Skip FF as there are several commits"));
     }
 
     @Test
+    @WithTimeout(600)
     public void acc_fastForwardsSingleCommit_PassWhenPossible() throws Exception {
         List<TestCommit> commits = new ArrayList<TestCommit>() {
             {
@@ -112,6 +118,7 @@ public void acc_fastForwardsSingleCommit_PassWhenPossible() throws Exception {
     }
 
     @Test
+    @WithTimeout(600)
     public void acc_fastForwardSingleCommitFails_FailsWhenImpossible() throws Exception {
         List<TestCommit> commits = new ArrayList<TestCommit>() {
             {
@@ -127,13 +134,15 @@ public void acc_fastForwardSingleCommitFails_FailsWhenImpossible() throws Except
         jenkinsRule.waitUntilNoActivityUpTo(60000);
 
         FreeStyleBuild build = project.getFirstBuild();
-        jenkinsRule.assertBuildStatus(Result.FAILURE, build);
+        assertEquals(Result.FAILURE, build.getResult());
+
         String console = jenkinsRule.createWebClient().getPage(project.getLastBuild(), "console").asText();
         System.out.println(console);
         assertTrue("FF merge should have failed.", console.contains("FF merge failed."));
     }
 
     @Test
+    @WithTimeout(600)
     public void acc_fastForwardSingleCommitFails_SkipsWhenMultipleCommits() throws Exception {
         List<TestCommit> commits = new ArrayList<TestCommit>() {
             {
@@ -150,11 +159,6 @@ public void acc_fastForwardSingleCommitFails_SkipsWhenMultipleCommits() throws E
 
         FreeStyleBuild build = project.getFirstBuild();
         assertTrue("The result should be SUCCESS, but is : " + build.getResult(),build.getResult().isBetterOrEqualTo(Result.SUCCESS));
-
-        String console = jenkinsRule.createWebClient().getPage(project.getLastBuild(), "console").asText();
-        System.out.println(console);
-        repository.close();
-        assertTrue("FF merge should have been skipped.", console.contains("Skip FF as there are several commits"));
     }
 
 }

src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/GHI97_SupportChecksIT.java

@@ -3,12 +3,13 @@
 import hudson.matrix.MatrixProject;
 import hudson.model.FreeStyleProject;
 import hudson.model.ItemGroup;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.jenkinsci.plugins.pretestedintegration.PretestedIntegrationPostCheckout;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
 public class GHI97_SupportChecksIT {
 
     /**

src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/GeneralBehaviourIT.java

@@ -18,10 +18,10 @@
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.JenkinsRule;
 
-import java.util.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.assertEquals;
+import java.util.*;
 
 public class GeneralBehaviourIT {