From a01d014286aeeaddbd89917a2197dc16552f4645 Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhay Date: Tue, 19 Mar 2019 10:02:12 +0300 Subject: [PATCH 1/4] Create README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..022fe89 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# ci-jenkins-junit +Continuous Integration with Jenkins: Repo using JUnit tests From 83789796bcf84097d61278ee530d1787095cd36f Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhay Date: Tue, 19 Mar 2019 10:21:46 +0300 Subject: [PATCH 2/4] Add multiply function --- src/main/java/com/example/math/Calculator.java | 4 ++++ src/test/java/com/example/math/TestCalculator.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/example/math/Calculator.java b/src/main/java/com/example/math/Calculator.java index c0978bb..a3ac843 100644 --- a/src/main/java/com/example/math/Calculator.java +++ b/src/main/java/com/example/math/Calculator.java @@ -10,4 +10,8 @@ public int subtract(int a, int b) { return a - b; } + public int multiply(int a, int b) { + return a * b; + } + } diff --git a/src/test/java/com/example/math/TestCalculator.java b/src/test/java/com/example/math/TestCalculator.java index 2e06237..7c7cac4 100644 --- a/src/test/java/com/example/math/TestCalculator.java +++ b/src/test/java/com/example/math/TestCalculator.java @@ -17,4 +17,10 @@ public void subtract() { assertEquals(2, calculator.subtract(8, 6)); } + @Test + public void multiply() { + Calculator calculator = new Calculator(); + assertEquals(30, calculator.multiply(5, 6)); + } + } From cb7726fa04ac91d3fc484ae2a3f61738a4539edb Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhay Date: Tue, 19 Mar 2019 10:26:31 +0300 Subject: [PATCH 3/4] Create Jenkinsfile --- Jenkinsfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..a4ef1e7 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,21 @@ +pipeline { + agent any + stages { + stage('Build') { + steps { + // Download the code + checkout scm + // Compile the main class + sh 'javac -d target -sourcepath src/main/java src/main/java/com/example/math/Calculator.java' + } + } + stage('Test') { + steps { + // Compile the tests + sh 'javac -d target -cp target:junit-platform-console-standalone-1.4.0.jar src/test/java/com/example/math/TestCalculator.java' + // Run the tests + sh 'java -jar junit-platform-console-standalone-1.4.0.jar --class-path target --scan-class-path --reports-dir=target/surefire-reports/' + } + } + } +} From d9fb46e400e36b203dd49f3f9226a66eb8b833da Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhay Date: Tue, 19 Mar 2019 10:33:07 +0300 Subject: [PATCH 4/4] updates --- src/test/java/com/example/math/TestCalculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/example/math/TestCalculator.java b/src/test/java/com/example/math/TestCalculator.java index 7c7cac4..8d89862 100644 --- a/src/test/java/com/example/math/TestCalculator.java +++ b/src/test/java/com/example/math/TestCalculator.java @@ -21,6 +21,7 @@ public void subtract() { public void multiply() { Calculator calculator = new Calculator(); assertEquals(30, calculator.multiply(5, 6)); + assertEquals(5, calculator.multiply(5, 1)); } }