Fix test failure and slightly more cleanup

Author: Raihaan Shouhell

src/test/java/hudson/plugins/git/GitChangeSetBadArgsTest.java

@@ -52,73 +52,73 @@ private GitChangeSet createCommitterChangeSet(String committerName, String commi
     public void testFindOrCreateUserAuthorBadEmail() {
         String authorName = "Bad Author Test 1";
         GitChangeSet changeSet = createAuthorChangeSet(authorName, DEGENERATE_EMAIL_ADDRESS);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false, false));
     }
 
     @Test
     public void testFindOrCreateUserCommitterBadEmail() {
         String committerName = "Bad Committer Test 2";
         GitChangeSet changeSet = createCommitterChangeSet(committerName, DEGENERATE_EMAIL_ADDRESS);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, DEGENERATE_EMAIL_ADDRESS, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", DEGENERATE_EMAIL_ADDRESS, false, false));
     }
 
     @Test
     public void testFindOrCreateUserEmptyAuthor() {
         String emptyAuthorName = "";
         String incompleteAuthorEmail = "@test3.example.com";
         GitChangeSet changeSet = createAuthorChangeSet(emptyAuthorName, incompleteAuthorEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyAuthorName, incompleteAuthorEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteAuthorEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteAuthorEmail, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyAuthorName, incompleteAuthorEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteAuthorEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteAuthorEmail, false, false));
     }
 
     @Test
     public void testFindOrCreateEmptyCommitter() {
         String emptyCommitterName = "";
         String incompleteCommitterEmail = "@test4.example.com";
         GitChangeSet changeSet = createCommitterChangeSet(emptyCommitterName, incompleteCommitterEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyCommitterName, incompleteCommitterEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteCommitterEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteCommitterEmail, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(emptyCommitterName, incompleteCommitterEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(null, incompleteCommitterEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser("", incompleteCommitterEmail, false, false));
     }
 
     @Test
     public void testFindOrCreateUserEmptyAuthorEmail() {
         String authorName = "Author Test 5";
         String emptyAuthorEmail = "";
         GitChangeSet changeSet = createAuthorChangeSet(authorName, emptyAuthorEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, emptyAuthorEmail, true, false));
     }
 
     @Test
     public void testFindOrCreateUserNullAuthorEmail() {
         String authorName = "Author Test 6";
         String emptyAuthorEmail = "";
         GitChangeSet changeSet = createAuthorChangeSet(authorName, emptyAuthorEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(authorName, null, true, false));
     }
 
     @Test
     public void testFindOrCreateUserEmptyCommitterEmail() {
         String committerName = "Committer Test 7";
         String emptyCommitterEmail = "";
         GitChangeSet changeSet = createCommitterChangeSet(committerName, emptyCommitterEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, emptyCommitterEmail, true, false));
     }
 
     @Test
     public void testFindOrCreateUserNullCommitterEmail() {
         String committerName = "Committer Test 8";
         String emptyCommitterEmail = "";
         GitChangeSet changeSet = createCommitterChangeSet(committerName, emptyCommitterEmail);
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, false));
-        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, true));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, false, false));
+        assertEquals(User.getUnknown(), changeSet.findOrCreateUser(committerName, null, true, false));
     }
 }

src/test/java/hudson/plugins/git/extensions/impl/PreBuildMergeTest.java

@@ -58,7 +58,7 @@ public void testFailedMerge() throws Exception {
         repo.git.deleteBranch("integration");
         repo.git.checkoutBranch("integration", "master");
         repo.commit(MASTER_FILE, "new content on integration branch", repo.johnDoe, repo.johnDoe, "Commit which should fail!");
-        repo.git.checkout().branch("master");
+        repo.git.checkout().ref("master").execute();
 
         // make a new commit in master branch, this commit should not merge cleanly!
         assertFalse("SCM polling should not detect any more changes after build", project.poll(listener).hasChanges());