devonfw-forge · dependabot · May 16, 2020 · May 16, 2020 · May 18, 2020 · May 18, 2020
diff --git a/CICD/Jenkinsfile b/CICD/Jenkinsfile
@@ -0,0 +1,41 @@
+env.module = "${JOB_NAME}".split('/')[1]
+env.workspace = "mrchecker-framework-modules"
+pipeline{
+	agent {docker {image 'mrchecker/mrchecker:v1.1.3'}}
+	stages{
+		stage('Build'){
+			steps{
+				echo "Building module ${env.module} and it's dependency"
+				sh """
+				cd ${env.workspace}
+				mvn clean compile package install -DskipTests=true --projects ${env.module} --also-make
+				"""
+				//bulid this module and its dependencies deploy them to local repo
+			}
+		}
+		stage('Test'){
+			steps{
+				echo "Testing ${env.module}"
+				sh """
+				cd ${env.workspace}
+				mvn jacoco:prepare-agent verify -Dgroups=UnitTest,IntegrationTest --projects ${env.module}
+				"""
+			}
+		}
+	}
+	post{
+		always{
+			archiveArtifacts artifacts: "${env.workspace}/${env.module}/target/*.jar", fingerprint: true
+			jacoco()
+			junit testResults:'**/surefire-reports/*.xml', healthScaleFactor: 0.8 //as I set the junit treshold to 80%
+		}
+        success{
+            script{
+                def downstreamJob = "${JOB_NAME}".split('/')
+                downstreamJob[0] = 'test'
+                downstreamJob = downstreamJob.join('/')
+                build job: downstreamJob, propagate: false, wait: false
+            }
+        }
+	}
+}
diff --git a/mrchecker-framework-modules/clirunners/0_0_running_tests.bat b/mrchecker-framework-modules/clirunners/0_0_running_tests.bat
@@ -0,0 +1,4 @@
+running tests
+cd ..
+mvn clean verify -Dgroups=UnitTests,IntegrationTests
+
diff --git a/mrchecker-framework-modules/clirunners/0_1_install_to_mvn_local.bat b/mrchecker-framework-modules/clirunners/0_1_install_to_mvn_local.bat
@@ -0,0 +1,4 @@
+running tests
+cd ..
+mvn clean install -Dgroups=UnitTests,IntegrationTests
+
diff --git a/mrchecker-framework-modules/clirunners/2_generate_report.bat b/mrchecker-framework-modules/clirunners/2_generate_report.bat
@@ -0,0 +1,3 @@
+echo starting allure server to display report
+cd ..
+mvn site allure:report
diff --git a/mrchecker-framework-modules/clirunners/3_show_report.bat b/mrchecker-framework-modules/clirunners/3_show_report.bat
@@ -0,0 +1,3 @@
+echo launching default web browser to show test report
+cd ..
+mvn site allure:serve
diff --git a/mrchecker-framework-modules/mrchecker-core-module/pom.xml b/mrchecker-framework-modules/mrchecker-core-module/pom.xml
@@ -4,15 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>mrchecker-core-module</artifactId>
-    <version>4.12.1.4-SNAPSHOT</version>
+    <version>5.6.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>MrChecker - Test core - Module</name>
     <description>MrChecker Test Framework Core is responsible for:
@@ -25,7 +24,7 @@
         * Externalize test environment (DEV, QA, PROD)
         * Adding analytics source code
         * Update Observers
-        Based on Junit4.12
+        Based on Junit5
     </description>
     <url>https://github.com/devonfw/devonfw-testing</url>
 
@@ -57,87 +56,21 @@
     </scm>
 
     <properties>
-
-
         <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
 
-        <!-- Test tools -->
-        <junit.version>4.12</junit.version>
-        <hamcrest.version>1.3</hamcrest.version>
-        <mockito.version>1.8.5</mockito.version>
-        <joda-time.version>2.9.9</joda-time.version>
-        <commons-csv.version>1.1</commons-csv.version>
-        <JUnitParams.version>1.0.4</JUnitParams.version>
-
-        <!-- Tests executors -->
-        <thread.count>1</thread.count>
-        <junit-toolbox.version>2.4</junit-toolbox.version>
-
         <!-- Logger -->
-        <log4j.version>2.2</log4j.version>
+        <log4j.version>2.13.3</log4j.version>
         <slf4j.version>1.7.21</slf4j.version>
 
-
-        <!-- Allure reporting -->
-        <allure-junit4-listener.version>2.6.0
-        </allure-junit4-listener.version> <!-- https://mvnrepository.com/artifact/io.qameta.allure/allure-junit4 -->
-        <allure-maven-report-generator.version>2.9
-        </allure-maven-report-generator.version>  <!-- https://mvnrepository.com/artifact/io.qameta.allure/allure-maven -->
-        <aspectj.version>1.8.10</aspectj.version>
-
-
         <!-- Cucumber version -->
         <cucumber.version>4.2.0</cucumber.version>
         <gherkin.cucumber.version>5.1.0</gherkin.cucumber.version>
         <cucumber-reporting.version>3.7.0</cucumber-reporting.version>
 
-        <!-- JSON support java 1.8 -->
-        <org.json.version>20160810</org.json.version>
-
     </properties>
 
     <dependencies>
 
-
-        <!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest-all -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <version>${hamcrest.version}</version><!--$NO-MVN-MAN-VER$ -->
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-csv</artifactId>
-            <version>${commons-csv.version}</version><!--$NO-MVN-MAN-VER$ -->
-        </dependency>
-
-
-        <!--This dependency is necessary for JUnit plugin. -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version><!--$NO-MVN-MAN-VER$ -->
-        </dependency>
-        <dependency>
-            <groupId>pl.pragmatists</groupId>
-            <artifactId>JUnitParams</artifactId>
-            <version>${JUnitParams.version}</version><!--$NO-MVN-MAN-VER$ -->
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${surefire.provider.version}</version><!--$NO-MVN-MAN-VER$ -->
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version><!--$NO-MVN-MAN-VER$ -->
-        </dependency>
-
-
         <!--This dependency is necessary for Logger. -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -163,39 +96,32 @@
         <dependency>
             <!-- Test listener. Binds Junit exec to Allure annotation -->
             <groupId>io.qameta.allure</groupId>
-            <artifactId>allure-junit4</artifactId>
-
+            <artifactId>allure-junit5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.qameta.allure</groupId>
+            <artifactId>allure-java-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.qameta.allure</groupId>
+            <artifactId>allure-junit-platform</artifactId>
         </dependency>
         <dependency>
             <!-- Allure report generator -->
             <groupId>io.qameta.allure</groupId>
             <artifactId>allure-maven</artifactId>
-            <version>${allure-maven-report-generator.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>${aspectj.version}</version>
         </dependency>
 
-
-        <!--This dependency is necessary for test suites runner with WildcardPatternSuite -->
-        <dependency>
-            <groupId>com.googlecode.junit-toolbox</groupId>
-            <artifactId>junit-toolbox</artifactId>
-            <version>${junit-toolbox.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
         </dependency>
 
-        <!--This dependency is necessary for Dependency Injection plugin. -->
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jasypt</groupId>
             <artifactId>jasypt</artifactId>
@@ -232,16 +158,10 @@
             <artifactId>gherkin</artifactId>
             <version>${gherkin.cucumber.version}</version>
         </dependency>
-
-
     </dependencies>
 
-
     <!-- Build goals/actions -->
     <build>
-        <plugins>
-            <!-- Plugins are taken from parent pom.xml -->
-        </plugins>
     </build>
 
 </project>