Merge pull request #6 from cpfeiffer/no_results_found

Avoid NPE when build aborts prematurely and produces no results
swestcott · May 3, 2012 · 47864bc · 47864bc
2 parents c01c78f + f9552c5
commit 47864bc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/fitnesse/FitnesseResultsRecorder.java b/src/main/java/hudson/plugins/fitnesse/FitnesseResultsRecorder.java
@@ -71,6 +71,8 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
 		try {
 			FilePath[] resultFiles = getResultFiles(build);
 			FitnesseResults results = getResults(listener.getLogger(), resultFiles);
+			if (results == null) return true; // no Fitnesse results found at all
+
 			FitnesseResultsAction action = new FitnesseResultsAction(build, results);
 			if (results.getBuildResult() != null) build.setResult(results.getBuildResult());
 			build.addAction(action);

diff --git a/src/test/java/hudson/plugins/fitnesse/HudsonDependentTest.java b/src/test/java/hudson/plugins/fitnesse/HudsonDependentTest.java
@@ -157,4 +157,17 @@ public void testBuildStartingFitnesseAndExplodingTheJarFile() throws Exception {
 		Assert.assertTrue(resultsAction.getResult().getPassCount() > 0);
 		Assert.assertEquals(2, resultsAction.getResult().getFailCount());
 	}
+
+	public void testBuildWithoutResults() throws Exception {
+		FreeStyleProject project = createFreeStyleProject(getName());
+		project.getBuildersList().clear();
+		project.getPublishersList().clear();
+		String resultsFile = "fitnesse-results-inexistant.xml";
+		project.getPublishersList().add(new FitnesseResultsRecorder(resultsFile));
+
+		FreeStyleBuild build = project.scheduleBuild2(0).get();
+		Assert.assertTrue(build.getLogFile().getAbsolutePath(), Result.SUCCESS.equals(build.getResult()));
+		FitnesseResultsAction resultsAction = build.getAction(FitnesseResultsAction.class);
+		Assert.assertNull(resultsAction);
+	}
 }