diff --git a/src/Jenkinsfile b/src/Jenkinsfile new file mode 100644 index 00000000..b7fcec7f --- /dev/null +++ b/src/Jenkinsfile @@ -0,0 +1,40 @@ +pipeline{ + + tools{ + jdk 'myjava' + maven 'mymaven' + } + agent {label 'qa_server'} + stages{ + stage('checkout'){ + steps{ + git branch:'qa' , url: 'https://github.com/sonal04devops/JavaWebCalculator.git' + } + } + stage('Compile'){ + + steps{ + echo 'compiling..' + sh 'mvn compile' + } + } + stage('UnitTest'){ + + steps{ + sh 'mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('Package'){ + + steps{ + sh 'mvn package' + } + } + +} +} diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index d49b7aca..0d9a129f 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -18,7 +18,7 @@ public long subFucn(long first, long second){ public long mulFucn(long first, long second){ - return first*second; + return first/second; } diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 9e6f3d27..153d3892 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -17,10 +17,10 @@ public void threeMinusTwoIsOne() throws Exception { assertThat(result, is(1L)); } - @Test + public void threeXThreeIsNine() throws Exception { final long result = new Calculator().mulFucn(3, 3); assertThat(result, is(9L)); } -} \ No newline at end of file +}