Remove System.out.println in tests

Author: MarkEWaite

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

@@ -247,7 +247,6 @@ protected FreeStyleProject setupSimpleProject(String branchString) throws Except
 
     protected FreeStyleBuild build(final FreeStyleProject project, final Result expectedResult, final String...expectedNewlyCommittedFiles) throws Exception {
         final FreeStyleBuild build = project.scheduleBuild2(0).get();
-        System.out.println(build.getLog());
         for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
             assertTrue(expectedNewlyCommittedFile + " file not found in workspace", build.getWorkspace().child(expectedNewlyCommittedFile).exists());
         }
@@ -259,7 +258,6 @@ protected FreeStyleBuild build(final FreeStyleProject project, final Result expe
 
     protected FreeStyleBuild build(final FreeStyleProject project, final String parentDir, final Result expectedResult, final String...expectedNewlyCommittedFiles) throws Exception {
         final FreeStyleBuild build = project.scheduleBuild2(0).get();
-        System.out.println(build.getLog());
         for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
             assertTrue(build.getWorkspace().child(parentDir).child(expectedNewlyCommittedFile).exists());
         }
@@ -271,7 +269,6 @@ protected FreeStyleBuild build(final FreeStyleProject project, final String pare
 
     protected MatrixBuild build(final MatrixProject project, final Result expectedResult, final String...expectedNewlyCommittedFiles) throws Exception {
         final MatrixBuild build = project.scheduleBuild2(0).get();
-        System.out.println(build.getLog());
         for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
             assertTrue(expectedNewlyCommittedFile + " file not found in workspace", build.getWorkspace().child(expectedNewlyCommittedFile).exists());
         }
@@ -312,15 +309,6 @@ public String invoke(File f, VirtualChannel channel) throws IOException, Interru
             });
     }
 
-    /* A utility method that displays a git repo. Useful to visualise merges. */
-    public void showRepo(TestGitRepo repo, String msg) throws Exception {
-        System.out.println("*********** "+msg+" ***********");
-        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            int returnCode = new Launcher.LocalLauncher(listener).launch().cmds("git", "log","--all","--graph","--decorate","--oneline").pwd(repo.gitDir.getCanonicalPath()).stdout(out).join();
-            System.out.println(out.toString());
-        }
-    }
-
     public static class HasCredentialBuilder extends Builder {
 
         private final String id;

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

@@ -78,7 +78,6 @@ public void checkoutWithDifferentCredentials() throws Exception {
                         + "  )"
                         + "}"));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
-        System.out.println(JenkinsRule.getLog(b));
         r.assertLogContains("Warning: CredentialId \"github\" could not be found", b);
     }
 
@@ -115,7 +114,6 @@ public void checkoutWithNoCredentialsStoredButUsed() throws Exception {
                         + "  )"
                         + "}"));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
-        System.out.println(JenkinsRule.getLog(b));
         r.assertLogContains("Warning: CredentialId \"github\" could not be found", b);
     }
 
@@ -133,7 +131,6 @@ public void checkoutWithNoCredentialsSpecified() throws Exception {
                         + "  )"
                         + "}"));
         WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
-        System.out.println(JenkinsRule.getLog(b));
         r.assertLogContains("No credentials specified", b);
     }
 

src/test/java/jenkins/plugins/git/GitSampleRepoRule.java

@@ -32,6 +32,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import jenkins.scm.impl.mock.AbstractSampleDVCSRepoRule;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.RepositoryBuilder;
@@ -44,6 +46,8 @@ public final class GitSampleRepoRule extends AbstractSampleDVCSRepoRule {
 
     private static boolean initialized = false;
 
+    private static final Logger LOGGER = Logger.getLogger(GitSampleRepoRule.class.getName());
+
     public void git(String... cmds) throws Exception {
         run("git", cmds);
     }
@@ -74,10 +78,10 @@ public final boolean mkdirs(String rel) throws IOException {
     public void notifyCommit(JenkinsRule r) throws Exception {
         synchronousPolling(r);
         WebResponse webResponse = r.createWebClient().goTo("git/notifyCommit?url=" + bareUrl(), "text/plain").getWebResponse();
-        System.out.println(webResponse.getContentAsString());
+        LOGGER.log(Level.FINE, webResponse.getContentAsString());
         for (NameValuePair pair : webResponse.getResponseHeaders()) {
             if (pair.getName().equals("Triggered")) {
-                System.out.println("Triggered: " + pair.getValue());
+                LOGGER.log(Level.FINE, "Triggered: " + pair.getValue());
             }
         }
         r.waitUntilNoActivity();
@@ -101,24 +105,24 @@ public boolean gitVersionAtLeast(int neededMajor, int neededMinor, int neededPat
         try {
             int returnCode = new Launcher.LocalLauncher(procListener).launch().cmds("git", "--version").stdout(out).join();
             if (returnCode != 0) {
-                System.out.println("Command 'git --version' returned " + returnCode);
+                LOGGER.log(Level.WARNING, "Command 'git --version' returned " + returnCode);
             }
         } catch (IOException | InterruptedException ex) {
-            System.out.println("Error checking git version " + ex);
+            LOGGER.log(Level.WARNING, "Exception checking git version " + ex);
         }
         final String versionOutput = out.toString().trim();
         final String[] fields = versionOutput.split(" ")[2].replaceAll("msysgit.", "").replaceAll("windows.", "").split("\\.");
         final int gitMajor = Integer.parseInt(fields[0]);
         final int gitMinor = Integer.parseInt(fields[1]);
         final int gitPatch = Integer.parseInt(fields[2]);
         if (gitMajor < 1 || gitMajor > 3) {
-            System.out.println("WARNING: Unexpected git major version " + gitMajor + " parsed from '" + versionOutput + "', field:'" + fields[0] + "'");
+            LOGGER.log(Level.WARNING, "Unexpected git major version " + gitMajor + " parsed from '" + versionOutput + "', field:'" + fields[0] + "'");
         }
         if (gitMinor < 0 || gitMinor > 50) {
-            System.out.println("WARNING: Unexpected git minor version " + gitMinor + " parsed from '" + versionOutput + "', field:'" + fields[1] + "'");
+            LOGGER.log(Level.WARNING, "Unexpected git minor version " + gitMinor + " parsed from '" + versionOutput + "', field:'" + fields[1] + "'");
         }
         if (gitPatch < 0 || gitPatch > 20) {
-            System.out.println("WARNING: Unexpected git patch version " + gitPatch + " parsed from '" + versionOutput + "', field:'" + fields[2] + "'");
+            LOGGER.log(Level.WARNING, "Unexpected git patch version " + gitPatch + " parsed from '" + versionOutput + "', field:'" + fields[2] + "'");
         }
 
         return gitMajor >  neededMajor ||