fix: updated report generation to use temp files, it fixes bugs with …

…running tests with multiple workers (and different Java Runtime as well)
serenity-bdd · Feb 29, 2016 · 5afea72 · 5afea72
1 parent e3fabf1
commit 5afea72
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/serenity-core/src/main/java/net/thucydides/core/reports/json/JSONTestOutcomeReporter.java b/serenity-core/src/main/java/net/thucydides/core/reports/json/JSONTestOutcomeReporter.java
@@ -14,9 +14,12 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.List;
 import java.util.Locale;
+import java.util.UUID;
 
 public class JSONTestOutcomeReporter implements AcceptanceTestReporter, AcceptanceTestLoader {
 
@@ -44,11 +47,17 @@ public File generateReportFor(TestOutcome testOutcome,
         TestOutcome storedTestOutcome = testOutcome.withQualifier(qualifier);
         Preconditions.checkNotNull(outputDirectory);
         String reportFilename = reportFor(storedTestOutcome);
+        String unique = UUID.randomUUID().toString();
+        File temporary = new File(getOutputDirectory(), reportFilename.concat(unique));
         File report = new File(getOutputDirectory(), reportFilename);
-        try(OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(report))){
+        LOGGER.debug("Generating JSON report for {} to file {} (using temp file {})", testOutcome.getTitle(), report.getAbsolutePath(), temporary.getAbsolutePath());
+
+        try(OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(temporary))){
             jsonConverter.toJson(storedTestOutcome, outputStream);
+            outputStream.flush();
+            Files.move(temporary.toPath(),report.toPath(), StandardCopyOption.REPLACE_EXISTING);
         }
-        return report;
+        return temporary;
     }
 
     public File getOutputDirectory() {

diff --git a/serenity-core/src/main/java/net/thucydides/core/reports/junit/JUnitXMLOutcomeReporter.java b/serenity-core/src/main/java/net/thucydides/core/reports/junit/JUnitXMLOutcomeReporter.java
@@ -14,8 +14,11 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 public class JUnitXMLOutcomeReporter  {
 
@@ -45,9 +48,14 @@ public void generateReportsFor(TestOutcomes testOutcomes) throws IOException {
             List<TestOutcome> testCaseOutcomes = testOutcomesGroupedByTestCase.get(testCase);
             String reportFilename = reportFilenameFor(testCaseOutcomes.get(0));
             File report = new File(getOutputDirectory(), reportFilename);
-            LOGGER.debug("GENERATING JUNIT REPORT " + reportFilename);
+            String unique = UUID.randomUUID().toString();
+            File temporary = new File(getOutputDirectory(), reportFilename.concat(unique));
+            LOGGER.debug("GENERATING JUNIT REPORT {} using temporary file {}", reportFilename, temporary);
+
             try(OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(report))){
                 junitXMLConverter.write(testCase, testCaseOutcomes, outputStream);
+                outputStream.flush();
+                Files.move(temporary.toPath(), report.toPath(), StandardCopyOption.REPLACE_EXISTING);
             } catch (ParserConfigurationException e) {
                 throw new IOException(e);
             } catch (TransformerException e) {

diff --git a/serenity-core/src/main/java/net/thucydides/core/reports/xml/XMLTestOutcomeReporter.java b/serenity-core/src/main/java/net/thucydides/core/reports/xml/XMLTestOutcomeReporter.java
@@ -16,9 +16,12 @@
 import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.List;
 import java.util.Locale;
+import java.util.UUID;
 
 import static net.thucydides.core.model.ReportType.XML;
 
@@ -69,14 +72,18 @@ public File generateReportFor(final TestOutcome testOutcome, final TestOutcomes
 
         String reportFilename = reportFor(storedTestOutcome);
 
+        String unique = UUID.randomUUID().toString();
+        File temporary = new File(getOutputDirectory(), reportFilename.concat(unique));
         File report = new File(getOutputDirectory(), reportFilename);
 
-        LOGGER.debug("Generating XML report for {} to file {}", testOutcome.getTitle(), report.getAbsolutePath());
+        LOGGER.debug("Generating XML report for {} to file {} (using temp file {})", testOutcome.getTitle(), report.getAbsolutePath(), temporary.getAbsolutePath());
 
         try(
            OutputStream outputStream = new FileOutputStream(report);
            OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)) {
            xstream.toXML(storedTestOutcome, writer);
+           writer.flush();
+            Files.move(temporary.toPath(), report.toPath(), StandardCopyOption.REPLACE_EXISTING);
            LOGGER.debug("XML report generated ({} bytes) {}", report.getAbsolutePath(), report.length());
         }
         return report;