Merge pull request #8 from RolandDahlemPV/feature/unix_lineendings

Feature/unix lineendings

Author: apegam-pv

modules/core/src/main/java/io/wcm/qa/galenium/persistence/util/TextSampleManager.java

@@ -19,15 +19,27 @@
  */
 package io.wcm.qa.galenium.persistence.util;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.Properties;
 
 import org.apache.commons.collections4.properties.SortedProperties;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.WriterOutputStream;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.wcm.qa.galenium.configuration.GaleniumConfiguration;
 import io.wcm.qa.galenium.configuration.PropertiesUtil;
@@ -39,7 +51,7 @@
  * {@link GaleniumConfiguration#getTextComparisonInputDirectory()}.
  */
 public final class TextSampleManager {
-
+		  
   private static final Charset CHARSET_UTF8 = Charset.forName("utf-8");
   private static final SortedProperties EXPECTED_TEXTS = new SortedProperties();
   private static final String FILE_NAME_EXPECTED_TEXTS = GaleniumConfiguration.getTextComparisonFile();
@@ -101,30 +113,70 @@ public static void persistNewTextSamples() {
       getLogger().debug("no text samples to persist.");
     }
     else {
-      WriterOutputStream writerOutputStream = null;
-      try {
-        getLogger().debug("Persisting " + SAMPLED_TEXTS.size() + " text samples.");
-        writerOutputStream = getOutputStream();
+      writeNewTextSamples();
+      reencodeToUnixLineEndings();
+    }
+  }
 
-        EXPECTED_TEXTS.store(writerOutputStream, "Expected texts");
-        SAMPLED_TEXTS.store(writerOutputStream, "Sampled texts");
-      }
-      catch (IOException ex) {
-        getLogger().error("Could not save sample texts to '" + OUTPUT_FILE + "'");
-      }
-      finally {
-        if (writerOutputStream != null) {
-          try {
-            writerOutputStream.close();
-          }
-          catch (IOException ex) {
-            getLogger().warn("error when closing file output stream: '" + OUTPUT_FILE + "'");
-          }
+  private static void writeNewTextSamples() {
+	WriterOutputStream writerOutputStream = null;
+    try {
+      getLogger().debug("Persisting " + SAMPLED_TEXTS.size() + " text samples.");
+      writerOutputStream = getOutputStream();        
+      EXPECTED_TEXTS.store(writerOutputStream, "Expected texts");
+      SAMPLED_TEXTS.store(writerOutputStream, "Sampled texts");
+    }
+    catch (IOException ex) {
+      getLogger().error("Could not save sample texts to '" + OUTPUT_FILE + "'");
+    }
+    finally {
+      if (writerOutputStream != null) {
+        try {
+          writerOutputStream.close();
+        }
+        catch (IOException ex) {
+          getLogger().warn("error when closing file output stream: '" + OUTPUT_FILE + "'");
         }
       }
     }
   }
 
+  /** to reduce changes in the file we force the lineendings to be in unix format */
+  private static void reencodeToUnixLineEndings() {
+
+    File temp = null;
+    BufferedReader reader = null;
+    BufferedWriter writer = null;
+
+    try {
+      temp = new File(OUTPUT_FILE.getAbsolutePath() + ".unixLines");
+      temp.createNewFile();
+      
+      reader = new BufferedReader(new InputStreamReader(new DataInputStream(new FileInputStream(OUTPUT_FILE))));
+      writer = new BufferedWriter(new OutputStreamWriter(new DataOutputStream(new FileOutputStream(temp))));
+
+      String line;
+      while ((line = reader.readLine()) != null) {
+        writer.write(line);
+        writer.write("\n");
+      }
+      reader.close();
+      writer.close();
+
+      Files.delete(OUTPUT_FILE.toPath());
+      Files.move(temp.toPath(), OUTPUT_FILE.toPath());
+      getLogger().debug("successfully reencoded to unix lineendings: " + OUTPUT_FILE);
+
+    } catch (IOException e) {
+      getLogger().warn("could not reencode: '" + OUTPUT_FILE + "'", e);
+    } finally {
+      FileUtils.deleteQuietly(temp);
+      IOUtils.closeQuietly(reader);
+      IOUtils.closeQuietly(writer);
+    }
+
+  }
+  
   private static Logger getLogger() {
     return GaleniumReportUtil.getLogger();
   }