Devops/separate test types 132 (#298)

* Separate phase for integration tests #132

* Move integration tests to separate directory #132

Author: szirbucz

.classpath

@@ -28,5 +28,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/integration-test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -26,17 +26,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+encoding//src/integration-test/java=UTF-8
 encoding//src/main/java=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8

.settings/org.eclipse.wst.common.component

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="PDEngine-0.0.1-master.4a96649">
+    <wb-module deploy-name="PDEngine-0.0.1-devops_separate-test-types-132.0df00bb">
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>

Makefile

@@ -41,7 +41,7 @@ javabuild: target/PDEngine-0.0.1-SNAPSHOT.jar
 
 target/PDEngine-0.0.1-SNAPSHOT.jar:
 	mvn build-helper:parse-version versions:set versions:commit -DnewVersion=\$${parsedVersion.majorVersion}.\$${parsedVersion.minorVersion}.\$${parsedVersion.incrementalVersion}-$$(tools/getbranch|sed 'sA/A_Ag').$$(git rev-parse --short HEAD)
-	mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.pitest:pitest-maven:mutationCoverage site
+	mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.pitest:pitest-maven:mutationCoverage site -Pintegration-test
 	zenta-xslt-runner -xsl:cpd2pmd.xslt -s:target/pmd.xml -o target/pmd_full.xml
 	java -jar /usr/local/lib/mutation-analysis-plugin-1.3-SNAPSHOT.jar
 

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>org.rulez.demokracia</groupId>
   <artifactId>PDEngine</artifactId>
-  <version>0.0.1-feature_for_show_vote_the_user_needs_a_counted_assurance_40.5a79d7b</version>
+  <version>0.0.1-devops_separate-test-types-132.0df00bb</version>
   <packaging>war</packaging>
 
   <name>PDEngine</name>
@@ -53,14 +53,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.7.2</version>
+        <version>2.22.0</version>
         <configuration>
           <b>
             <argLine>
               -javaagent:${sonar.jacoco.jar}=destfile=${sonar.jacoco.reportPath}
             </argLine>
           </b>
-          <test>**/*.java</test>
+          <excludes>
+          	<exclude>**/*IntegrationTest</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -87,8 +89,54 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>3.7.1</version>
       </plugin>
+	  <plugin>
+		<groupId>org.codehaus.mojo</groupId>
+		<artifactId>build-helper-maven-plugin</artifactId>
+		<version>1.9.1</version>
+		<executions>
+			<execution>
+				<id>add-integration-test-sources</id>
+				<phase>generate-test-sources</phase>
+				<goals>
+					<goal>add-test-source</goal>
+				</goals>
+				<configuration>
+					<sources>
+						<source>src/integration-test/java</source>
+					</sources>
+				</configuration>
+			</execution>
+		</executions>
+	  </plugin>
     </plugins>
   </build>
+  
+  <profiles>
+	<profile>
+	<id>integration-test</id>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.22.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<includes>
+						<include>**/*IntegrationTest</include>
+					</includes>
+				</configuration>
+			  </plugin>
+		  </plugins>
+	  </build>
+    </profile>
+  </profiles>
 
   <reporting>
     <plugins>

src/test/java/org/rulez/demokracia/pdengine/integrationtest/JettyThread.java src/integration-test/java/org/rulez/demokracia/pdengine/integrationtest/JettyThread.java

@@ -11,7 +11,7 @@
 
 @TestedFeature("Manage votes")
 @TestedOperation("delete choice")
-public class ChoiceDeleteAdminKeyIsUser extends CreatedDefaultVoteRegistry {
+public class ChoiceDeleteAdminKeyIsUserTest extends CreatedDefaultVoteRegistry {
 
 	private static final String USER = "user";
 	private static final String CHOICE1 = "choice1";

src/test/java/org/rulez/demokracia/pdengine/integrationtest/VoteCreationIntegrationTest.java src/integration-test/java/org/rulez/demokracia/pdengine/integrationtest/VoteCreationIntegrationTest.java

@@ -15,7 +15,7 @@
 @TestedFeature("Manage votes")
 @TestedOperation("show vote")
 @TestedBehaviour("if adminKey is anon, the user should have any of the countedAssurances")
-public class ForShowVoteTheUserNeedsACountedAssurance extends CreatedDefaultVoteRegistry {
+public class ForShowVoteTheUserNeedsACountedAssuranceTest extends CreatedDefaultVoteRegistry {
 
 	@Test
 	public void a_user_with_not_all_assourances_cannot_show_the_vote() throws ReportedException {

src/test/java/org/rulez/demokracia/pdengine/ChoiceDeleteAdminKeyIsUser.java src/test/java/org/rulez/demokracia/pdengine/ChoiceDeleteAdminKeyIsUserTest.java

@@ -21,10 +21,14 @@ then
         -Dsonar.issuesReport.console.enable=true\
         -Dsonar.github.login=magwas\
         -Dsonar.externalIssuesReportPaths=issuesReport.json\
-        -Dsonar.java.pmd.reportPaths=target/pmd_full.xml
+        -Dsonar.java.pmd.reportPaths=target/pmd_full.xml\
+        -Dsonar.tests=src/test,src/integration-test\
+        -Pintegration-test
 else
     mvn sonar:sonar -Dsonar.organization=edemo\
      -Dsonar.java.pmd.reportPaths=target/pmd_full.xml\
      -Dsonar.branch.name=${BRANCH}\
-     -Dsonar.externalIssuesReportPaths=issuesReport.json
+     -Dsonar.externalIssuesReportPaths=issuesReport.json\
+     -Dsonar.tests=src/test,src/integration-test\
+     -Pintegration-test
 fi