From 3bc72bb9d2fdf3a927293d1002c6c106847c8f86 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 27 Jan 2014 13:51:04 -0800 Subject: [PATCH] jdk5 was correctly failing after d73ea7e. --- core/src/test/java/hudson/slaves/ComputerLauncherTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/hudson/slaves/ComputerLauncherTest.java b/core/src/test/java/hudson/slaves/ComputerLauncherTest.java index 93f5f22c9c..d1533420de 100644 --- a/core/src/test/java/hudson/slaves/ComputerLauncherTest.java +++ b/core/src/test/java/hudson/slaves/ComputerLauncherTest.java @@ -49,8 +49,8 @@ public class ComputerLauncherTest { 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.0"); } - @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.0"); + @Test(expected=IOException.class) public void jdk5() throws IOException { + ComputerLauncher.checkJavaVersion(new PrintStream(new NullOutputStream()), "-", new BufferedReader(new StringReader("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"))); } @Test(expected=IOException.class) public void j2sdk4() throws IOException {