Fix travis build

jgarec · jgarec · commit 4cf00ef1086a · 2018-05-25T15:53:38.000+02:00
Ignore windows / mac / linux carriage return differences
Ignore test duration differences
diff --git a/utplsql-maven-plugin/src/test/java/org/utpsql/maven/plugin/test/UtPLSQLMojoTest.java b/utplsql-maven-plugin/src/test/java/org/utpsql/maven/plugin/test/UtPLSQLMojoTest.java
@@ -2,6 +2,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.testing.MojoRule;
@@ -29,7 +33,7 @@ public void testDefinition() throws Exception
 			Assert.assertNotNull(myMojo);
 			myMojo.execute();
 
-			checkCoverReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");
+			checkReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");
 		}
 		catch (Exception e)
 		{
@@ -49,7 +53,7 @@ public void testRegexDefinition() throws Exception
             Assert.assertNotNull(myMojo);
             myMojo.execute();
 
-            checkCoverReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");
+            checkReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");
         }
         catch (Exception e)
         {
@@ -62,7 +66,7 @@ public void testRegexDefinition() throws Exception
 	 * 
 	 * @param files
 	 */
-	private void checkCoverReportsGenerated(String projectName, String... files)
+	private void checkReportsGenerated(String projectName, String... files)
 	{
 		for (String filename : files)
 		{
@@ -71,16 +75,23 @@ private void checkCoverReportsGenerated(String projectName, String... files)
             
             Assert.assertTrue("The reporter for " + filename + " was not generated", outputFile.exists());
             try {
-                // Duration is set to 1 before comparing contents.
+                // Duration is set to 1 before comparing contents as it is always different.
+                // Path separator is set to "/" to ensure windows / linux / mac compatibility  
+                Stream<String> stream = Files.lines(Paths.get(TARGET_DIRECTORY,projectName,"target",filename));
+                String outputContent = stream.map(line -> line.replaceAll("(duration=\"[0-9\\.]*\")", "duration=\"1\""))
+                                                .map(line ->  line.replaceAll("\\\\", "/"))
+                                                .map(line -> line.replaceAll("\r", "").replaceAll("\n", ""))
+                                                .collect(Collectors.joining("\n"));
+                                                
+                stream.close();
                 Assert.assertEquals("The files differ!", 
-                        FileUtils.readFileToString(outputFile, "utf-8").replaceAll("(duration=\"[0-9\\.]*\")", "duration=\"1\""), 
-                        FileUtils.readFileToString(expectedOutputFile, "utf-8"));
+                        outputContent,
+                        FileUtils.readFileToString(expectedOutputFile, "utf-8").replace("\r",""));
             } catch (IOException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
                 Assert.fail("Unexpected Exception running the test of Definition");
             }
 		}
 	}
-
 }
diff --git a/utplsql-maven-plugin/src/test/resources/regex-project/expected-output/utplsql/coverage-sonar-reporter.xml b/utplsql-maven-plugin/src/test/resources/regex-project/expected-output/utplsql/coverage-sonar-reporter.xml
@@ -1,5 +1,5 @@
 <coverage version="1">
-<file path="src\test\resources\regex-project\scripts\sources\app\packages\PKG_TEST_ME.bdy">
+<file path="src/test/resources/regex-project/scripts/sources/app/packages/PKG_TEST_ME.bdy">
 <lineToCover lineNumber="8" covered="true"/>
 <lineToCover lineNumber="9" covered="true"/>
 <lineToCover lineNumber="10" covered="true"/>
@@ -9,4 +9,4 @@
 <lineToCover lineNumber="22" covered="true"/>
 <lineToCover lineNumber="23" covered="true"/>
 </file>
-</coverage>
+</coverage>
diff --git a/utplsql-maven-plugin/src/test/resources/regex-project/expected-output/utplsql/sonar-test-reporter.xml b/utplsql-maven-plugin/src/test/resources/regex-project/expected-output/utplsql/sonar-test-reporter.xml
@@ -1,5 +1,5 @@
 <testExecutions version="1">
-<file path="src\test\resources\regex-project\scripts\test\app\packages\TEST_PKG_TEST_ME.bdy">
+<file path="src/test/resources/regex-project/scripts/test/app/packages/TEST_PKG_TEST_ME.bdy">
 <testCase name="test_fc_input_1" duration="1" >
 </testCase>
 <testCase name="test_fc_input_0" duration="1" >
@@ -15,4 +15,4 @@
 <testCase name="test_pr_test_me_cursor" duration="1" >
 </testCase>
 </file>
-</testExecutions>
+</testExecutions>
diff --git a/utplsql-maven-plugin/src/test/resources/simple-project/expected-output/utplsql/coverage-sonar-reporter.xml b/utplsql-maven-plugin/src/test/resources/simple-project/expected-output/utplsql/coverage-sonar-reporter.xml
@@ -1,5 +1,5 @@
 <coverage version="1">
-<file path="src\test\resources\simple-project\scripts\sources\APP.PKG_TEST_ME.bdy">
+<file path="src/test/resources/simple-project/scripts/sources/APP.PKG_TEST_ME.bdy">
 <lineToCover lineNumber="8" covered="true"/>
 <lineToCover lineNumber="9" covered="true"/>
 <lineToCover lineNumber="10" covered="true"/>
@@ -9,4 +9,4 @@
 <lineToCover lineNumber="22" covered="true"/>
 <lineToCover lineNumber="23" covered="true"/>
 </file>
-</coverage>
+</coverage>
diff --git a/utplsql-maven-plugin/src/test/resources/simple-project/expected-output/utplsql/sonar-test-reporter.xml b/utplsql-maven-plugin/src/test/resources/simple-project/expected-output/utplsql/sonar-test-reporter.xml
@@ -1,5 +1,5 @@
 <testExecutions version="1">
-<file path="src\test\resources\simple-project\scripts\tests\APP.TEST_PKG_TEST_ME.bdy">
+<file path="src/test/resources/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.bdy">
 <testCase name="test_fc_input_1" duration="1" >
 </testCase>
 <testCase name="test_fc_input_0" duration="1" >
@@ -15,4 +15,4 @@
 <testCase name="test_pr_test_me_cursor" duration="1" >
 </testCase>
 </file>
-</testExecutions>
+</testExecutions>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@`
`2`	`2`
`3`	`3`	`import java.io.File;`
`4`	`4`	`import java.io.IOException;`
	`5`	`+import java.nio.file.Files;`
	`6`	`+import java.nio.file.Paths;`
	`7`	`+import java.util.stream.Collectors;`
	`8`	`+import java.util.stream.Stream;`
`5`	`9`
`6`	`10`	`import org.apache.commons.io.FileUtils;`
`7`	`11`	`import org.apache.maven.plugin.testing.MojoRule;`
`@@ -29,7 +33,7 @@ public void testDefinition() throws Exception`
`29`	`33`	`Assert.assertNotNull(myMojo);`
`30`	`34`	`myMojo.execute();`
`31`	`35`
`32`		`- checkCoverReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");`
	`36`	`+ checkReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");`
`33`	`37`	`}`
`34`	`38`	`catch (Exception e)`
`35`	`39`	`{`
`@@ -49,7 +53,7 @@ public void testRegexDefinition() throws Exception`
`49`	`53`	`Assert.assertNotNull(myMojo);`
`50`	`54`	`myMojo.execute();`
`51`	`55`
`52`		`- checkCoverReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");`
	`56`	`+ checkReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");`
`53`	`57`	`}`
`54`	`58`	`catch (Exception e)`
`55`	`59`	`{`
`@@ -62,7 +66,7 @@ public void testRegexDefinition() throws Exception`
`62`	`66`	`*`
`63`	`67`	`* @param files`
`64`	`68`	`*/`
`65`		`- private void checkCoverReportsGenerated(String projectName, String... files)`
	`69`	`+ private void checkReportsGenerated(String projectName, String... files)`
`66`	`70`	`{`
`67`	`71`	`for (String filename : files)`
`68`	`72`	`{`
`@@ -71,16 +75,23 @@ private void checkCoverReportsGenerated(String projectName, String... files)`
`71`	`75`
`72`	`76`	`Assert.assertTrue("The reporter for " + filename + " was not generated", outputFile.exists());`
`73`	`77`	`try {`
`74`		`- // Duration is set to 1 before comparing contents.`
	`78`	`+ // Duration is set to 1 before comparing contents as it is always different.`
	`79`	`+ // Path separator is set to "/" to ensure windows / linux / mac compatibility`
	`80`	`+ Stream<String> stream = Files.lines(Paths.get(TARGET_DIRECTORY,projectName,"target",filename));`
	`81`	`+ String outputContent = stream.map(line -> line.replaceAll("(duration=\"[0-9\\.]*\")", "duration=\"1\""))`
	`82`	`+ .map(line -> line.replaceAll("\\\\", "/"))`
	`83`	`+ .map(line -> line.replaceAll("\r", "").replaceAll("\n", ""))`
	`84`	`+ .collect(Collectors.joining("\n"));`
	`85`	`+`
	`86`	`+ stream.close();`
`75`	`87`	`Assert.assertEquals("The files differ!",`
`76`		`- FileUtils.readFileToString(outputFile, "utf-8").replaceAll("(duration=\"[0-9\\.]*\")", "duration=\"1\""),`
`77`		`- FileUtils.readFileToString(expectedOutputFile, "utf-8"));`
	`88`	`+ outputContent,`
	`89`	`+ FileUtils.readFileToString(expectedOutputFile, "utf-8").replace("\r",""));`
`78`	`90`	`} catch (IOException e) {`
`79`	`91`	`// TODO Auto-generated catch block`
`80`	`92`	`e.printStackTrace();`
`81`	`93`	`Assert.fail("Unexpected Exception running the test of Definition");`
`82`	`94`	`}`
`83`	`95`	`}`
`84`	`96`	`}`
`85`		`-`
`86`	`97`	`}`