[JENKINS-14788] Testing properly.

core/src/main/java/hudson/slaves/ComputerLauncher.java

@@ -172,7 +172,7 @@ public abstract class ComputerLauncher extends AbstractDescribableImpl<ComputerL
      * @param r
      *            the output of "java -version"
      */
-    protected void checkJavaVersion(final PrintStream logger, String javaCommand,
+    protected static void checkJavaVersion(final PrintStream logger, String javaCommand,
                                     final BufferedReader r)
             throws IOException {
         String line;

core/src/test/java/hudson/slaves/ComputerLauncherTest.java

+/*
+ * The MIT License
+ *
+ * Copyright 2012 Jesse Glick.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.slaves;
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.StringReader;
+import org.apache.commons.io.output.NullOutputStream;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+@SuppressWarnings("DM_DEFAULT_ENCODING")
+public class ComputerLauncherTest {
+
+    @Test public void jdk7() throws IOException {
+        assertChecked("java version \"1.7.0_05\"\nJava(TM) SE Runtime Environment (build 1.7.0_05-b05)\nJava HotSpot(TM) Server VM (build 23.1-b03, mixed mode)\n", "1.7");
+    }
+
+    @Test public void openJDK7() throws IOException {
+        assertChecked("openjdk version \"1.7.0-internal\"\nOpenJDK Runtime Environment (build 1.7.0-internal-pkgsrc_2010_01_03_06_54-b00)\nOpenJDK 64-Bit Server VM (build 17.0-b04, mixed mode)\n", "1.7");
+    }
+
+    @Test public void jdk6() throws IOException {
+        assertChecked("java version \"1.6.0_33\"\nJava(TM) SE Runtime Environment (build 1.6.0_33-b03)\nJava HotSpot(TM) Server VM (build 20.8-b03, mixed mode)\n", "1.6");
+    }
+
+    @Test public void jdk5() throws IOException {
+        assertChecked("java version \"1.5.0_22\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_22-b03)\nJava HotSpot(TM) Server VM (build 1.5.0_22-b03, mixed mode)\n", "1.5");
+    }
+
+    @Test(expected=IOException.class) public void j2sdk4() throws IOException {
+        ComputerLauncher.checkJavaVersion(new PrintStream(new NullOutputStream()), "-", new BufferedReader(new StringReader("java version \"1.4.2_19\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_19-b04)\nJava HotSpot(TM) Client VM (build 1.4.2_19-b04, mixed mode)\n")));
+    }
+
+    private static void assertChecked(String text, String spec) throws IOException {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        ComputerLauncher.checkJavaVersion(new PrintStream(os), "bin/java", new BufferedReader(new StringReader(text)));
+        String logged = os.toString();
+        assertTrue(logged, logged.contains(Messages.ComputerLauncher_JavaVersionResult("bin/java", spec)));
+    }
+
+}