Refactor test project

* Move test project to a dedicated location
* Fix generated coverage, and check file paths for #11
* Checks output file content (duration should be set to 1)

Author: jgarec

utplsql-maven-plugin/src/test/java/org/utpsql/maven/plugin/test/UtPLSQLMojoTest.java

@@ -1,7 +1,9 @@
 package org.utpsql.maven.plugin.test;
 
 import java.io.File;
+import java.io.IOException;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.testing.MojoRule;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -10,9 +12,7 @@
 
 public class UtPLSQLMojoTest
 {
-	public static final String POM_PATH = "src/test/resources/";
-
-	public static final String OUTPUT_DIRECTORY = "target/test-classes";
+	public static final String TARGET_DIRECTORY = "target/test-classes";
 
 	@Rule
 	public MojoRule rule = new MojoRule();
@@ -23,12 +23,13 @@ public void testDefinition() throws Exception
 
 		try
 		{
-			UtPLSQLMojo myMojo = (UtPLSQLMojo) rule.lookupConfiguredMojo(new File(POM_PATH), "test");
+		    final String PROJECT_NAME =  "simple-project";
+			UtPLSQLMojo myMojo = (UtPLSQLMojo) rule.lookupConfiguredMojo(new File(TARGET_DIRECTORY+"/"+PROJECT_NAME), "test");
 
 			Assert.assertNotNull(myMojo);
 			myMojo.execute();
 
-			checkCoverReportsGenerated("utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");
+			checkCoverReportsGenerated(PROJECT_NAME,"utplsql/coverage-sonar-reporter.xml", "utplsql/sonar-test-reporter.xml");
 		}
 		catch (Exception e)
 		{
@@ -41,12 +42,24 @@ public void testDefinition() throws Exception
 	 * 
 	 * @param files
 	 */
-	private void checkCoverReportsGenerated(String... files)
+	private void checkCoverReportsGenerated(String projectName, String... files)
 	{
 		for (String filename : files)
 		{
-			File file = new File(OUTPUT_DIRECTORY, filename);
-			Assert.assertTrue("The reporter for " + filename + " was not generated", file.exists());
+		    File outputFile = new File(TARGET_DIRECTORY+"/"+projectName+"/target/", filename);
+            File expectedOutputFile = new File(TARGET_DIRECTORY+"/"+projectName+"/expected-output/", filename);
+            
+            Assert.assertTrue("The reporter for " + filename + " was not generated", outputFile.exists());
+            try {
+                // Duration is set to 1 before comparing contents.
+                Assert.assertEquals("The files differ!", 
+                        FileUtils.readFileToString(outputFile, "utf-8").replaceAll("(duration=\"[0-9\\.]*\")", "duration=\"1\""), 
+                        FileUtils.readFileToString(expectedOutputFile, "utf-8"));
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                Assert.fail("Unexpected Exception running the test of Definition");
+            }
 		}
 	}
 

utplsql-maven-plugin/src/test/resources/simple-project/expected-output/utplsql/coverage-sonar-reporter.xml

@@ -0,0 +1,12 @@
+<coverage version="1">
+<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"/>
+<lineToCover lineNumber="11" covered="true"/>
+<lineToCover lineNumber="13" covered="true"/>
+<lineToCover lineNumber="19" covered="true"/>
+<lineToCover lineNumber="22" covered="true"/>
+<lineToCover lineNumber="23" covered="true"/>
+</file>
+</coverage>

utplsql-maven-plugin/src/test/resources/simple-project/expected-output/utplsql/sonar-test-reporter.xml

@@ -0,0 +1,18 @@
+<testExecutions version="1">
+<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" >
+</testCase>
+<testCase name="test_fc_input_null" duration="1" >
+</testCase>
+<testCase name="test_pr_test_me_null" duration="1" >
+</testCase>
+<testCase name="test_pr_test_me_not_null" duration="1" >
+</testCase>
+<testCase name="test_pr_test_me_exists" duration="1" >
+</testCase>
+<testCase name="test_pr_test_me_cursor" duration="1" >
+</testCase>
+</file>
+</testExecutions>

…-maven-plugin/src/test/resources/pom.xml …rc/test/resources/simple-project/pom.xmlutplsql-maven-plugin/src/test/resources/pom.xml renamed to utplsql-maven-plugin/src/test/resources/simple-project/pom.xml utplsql-maven-plugin/src/test/resources/pom.xml renamed to utplsql-maven-plugin/src/test/resources/simple-project/pom.xml

@@ -11,16 +11,14 @@
 
 
     <properties>
-      	<dbUrl>jdbc:oracle:thin:@127.0.0.1:1521:xe</dbUrl>  
+    	<dbUrl>jdbc:oracle:thin:@127.0.0.1:1521:xe</dbUrl>  
 		<!-- 
  		<dbUser>ut3</dbUser> 
   		<dbPass>XNtxj8eEgA6X6b6f</dbPass> 
  		--> 
     </properties>
 
     <build>
-    	<directory>../../../target/test-classes</directory>
-    
         <plugins>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
@@ -35,7 +33,7 @@
 					<ignoreFailure>false</ignoreFailure>
 
 					<paths>
-            			<path>ut3</path>
+            			<path>app</path>
           			</paths>
 
 					<reporters>
@@ -53,7 +51,7 @@
 
                     <sources>
                     	<source>
-                    		<directory>src/test/resources/scripts/sources</directory>
+                    		<directory>src/test/resources/simple-project/scripts/sources</directory>
 							<includes>
 								<include>**/*bdy</include>
 								<include>**/*spc</include>
@@ -63,7 +61,7 @@
 
                     <tests>
                     	<test>
-                    		<directory>src/test/resources/scripts/test</directory>
+                    		<directory>src/test/resources/simple-project/scripts/tests</directory>
 							<includes>
 								<include>**/*bdy</include>
 								<include>**/*spc</include>