feat: update IT for API

Author: ricardogarfe

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Unit Test
         run: mvn test
       - name: Integration API Test
-        run: mvn verify -P integration-test
+        run: mvn verify -Pintegration-test
       - name: Upload test results
         uses: actions/upload-artifact@v3  # upload test results
         if: success() || failure()        # run this step even if previous step failed

src/main/java/com/geekshubs/calculator/rest/CalculatorAPI.java

@@ -1,6 +1,8 @@
 package com.geekshubs.calculator.rest;
 
 import com.geekshubs.calculator.Calculator;
+import com.geekshubs.calculator.service.CalculatorService;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
@@ -12,6 +14,8 @@
 @Path("/calculator")
 public class CalculatorAPI {
 
+    CalculatorService calculatorService = new CalculatorService();
+
     @GET
     @Path("ping")
     @Produces(MediaType.TEXT_PLAIN)
@@ -23,27 +27,27 @@ public String ping() {
     @Path("add")
     @Produces(MediaType.APPLICATION_JSON)
     public Calculator Add(@QueryParam("x") int x, @QueryParam("y") int y) {
-        return new Calculator(x, y, x + y);
+        return calculatorService.Add(x, y);
     }
 
     @GET
     @Path("sub")
     @Produces(MediaType.APPLICATION_JSON)
     public Calculator Sub(@QueryParam("x") int x, @QueryParam("y") int y) {
-        return new Calculator(x, y, x - y);
+        return calculatorService.Sub(x, y);
     }
 
     @GET
     @Path("mul")
     @Produces(MediaType.APPLICATION_JSON)
     public Calculator Mul(@QueryParam("x") int x, @QueryParam("y") int y) {
-        return new Calculator(x, y, x * y);
+        return calculatorService.Mul(x, y);
     }
 
     @GET
     @Path("div")
     @Produces(MediaType.APPLICATION_JSON)
     public Calculator Div(@QueryParam("x") int x, @QueryParam("y") int y) {
-        return new Calculator(x, y, x / y);
+        return calculatorService.Div(x, y);
     }
 }

src/test/java/com/geekshubs/calculator/integration/ITCalculatorAPITest.java

@@ -25,36 +25,36 @@ public void testPing() throws Exception {
     @Test
     public void testAdd() throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
-        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/add?x=8&y=26");
+        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/add?x=2&y=3");
         HttpResponse response = httpclient.execute(httpGet);
         assertEquals(200, response.getStatusLine().getStatusCode());
-        assertThat(EntityUtils.toString(response.getEntity()), containsString("\"result\":34"));
+        assertThat(EntityUtils.toString(response.getEntity()), containsString("5"));
     }
 
     @Test
     public void testSub() throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
-        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/sub?x=12&y=8");
+        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/sub?x=2&y=3");
         HttpResponse response = httpclient.execute(httpGet);
         assertEquals(200, response.getStatusLine().getStatusCode());
-        assertThat(EntityUtils.toString(response.getEntity()), containsString("\"result\":4"));
+        assertThat(EntityUtils.toString(response.getEntity()), containsString("-1"));
     }
 
     @Test
     public void testMul() throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
-        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/mul?x=11&y=8");
+        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/mul?x=2&y=3");
         HttpResponse response = httpclient.execute(httpGet);
         assertEquals(200, response.getStatusLine().getStatusCode());
-        assertThat(EntityUtils.toString(response.getEntity()), containsString("\"result\":88"));
+        assertThat(EntityUtils.toString(response.getEntity()), containsString("6"));
     }
 
     @Test
     public void testDiv() throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
-        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/div?x=12&y=12");
+        HttpGet httpGet = new HttpGet("http://localhost:8080/calculator/api/calculator/div?x=6&y=3");
         HttpResponse response = httpclient.execute(httpGet);
         assertEquals(200, response.getStatusLine().getStatusCode());
-        assertThat(EntityUtils.toString(response.getEntity()), containsString("\"result\":1"));
+        assertThat(EntityUtils.toString(response.getEntity()), containsString("2"));
     }
 }

src/test/java/com/geekshubs/calculator/rest/CalculatorAPITest.java

@@ -13,23 +13,4 @@ public void testPing() {
         assertThat(new CalculatorAPI().ping(), containsString("Welcome to Java Maven Calculator Web App!!!"));
     }
 
-    @Test
-    public void testAdd() {
-        assertEquals(34, new CalculatorAPI().Add(8, 26).getResult());
-    }
-
-    @Test
-    public void testSub() {
-        assertEquals(4, new CalculatorAPI().Sub(12, 8).getResult());
-    }
-
-    @Test
-    public void testMul() {
-        assertEquals(88, new CalculatorAPI().Mul(11, 8).getResult());
-    }
-
-    @Test
-    public void testDiv() {
-        assertEquals(1, new CalculatorAPI().Div(12, 12).getResult());
-    }
 }