format and comment

jenkinsci · Oct 27, 2014 · 7e92e89 · 7e92e89
1 parent 2161f1b
commit 7e92e89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/hudson/plugins/fitnesse/FitnesseExecutor.java b/src/main/java/hudson/plugins/fitnesse/FitnesseExecutor.java
@@ -194,7 +194,7 @@ public boolean isFitnesseStarted(URL fitnessePageURL) throws InterruptedExceptio
 		}
 
 		logger.printf(launched // --
-				? "%nFitnesse server started in %sms.%n" // --
+		    ? "%nFitnesse server started in %sms.%n" // --
 		    : "%nFitnesse server NOT started in %sms on URL: %s%n", waitedAlready, fitnessePageURL);
 
 		return launched;
@@ -276,7 +276,7 @@ public byte[] getHttpBytes(URL pageCmdTarget, Resettable timeout, int httpTimeou
 	/* package for test */URL getFitnessePage(AbstractBuild<?, ?> build, boolean withCommand) throws IOException {
 		return new URL("http", //
 		    builder.getFitnesseHost(build, envVars), //
-				builder.getFitnessePort(), //
+		    builder.getFitnessePort(), //
 		    withCommand ? getFitnessePageCmd() : getFitnessePageBase());
 	}
 

diff --git a/src/test/java/hudson/plugins/fitnesse/FitnesseExecutorTest.java b/src/test/java/hudson/plugins/fitnesse/FitnesseExecutorTest.java
@@ -122,7 +122,8 @@ public void javaCmdShouldReferenceJAVAHOME() throws IOException, InterruptedExce
 
 	@Test
 	@Ignore
-	public void javaCmdShouldReferenceFitnesseSpecificJavaHome() throws IOException, InterruptedException {
+	// Can't be test, use Jenkins static instance
+	public void javaCmdShouldReferenceFitnesseSpecificJDK() throws IOException, InterruptedException {
 		File javaHome = File.createTempFile("JavaHome", "");
 		init(new String[] { FitnesseBuilder.PATH_TO_ROOT, FitnesseBuilder.PATH_TO_JAR, FitnesseBuilder.FITNESSE_PORT, FitnesseBuilder.FITNESSE_JDK },
 				new String[] { getTestResourceFitNesseRoot(), getTestResourceFitnesseJar(), "9876", javaHome.getAbsolutePath() });
@@ -143,8 +144,7 @@ public void javaCmdShouldReferenceFitnesseSpecificJavaHome() throws IOException,
 
 	@Test
 	public void javaCmdShouldHandleRelativePaths() throws IOException, InterruptedException {
-		init(new String[] { FitnesseBuilder.PATH_TO_ROOT, FitnesseBuilder.PATH_TO_JAR,
-		    FitnesseBuilder.FITNESSE_PORT },
+		init(new String[] { FitnesseBuilder.PATH_TO_ROOT, FitnesseBuilder.PATH_TO_JAR, FitnesseBuilder.FITNESSE_PORT },
 				new String[] {"FitNesseRoot", "fitnesse.jar", "9000"});
 
 		FilePath workingDirectory = new FilePath(new File(TMP_DIR));