travis

Author: babocode

.travis.yml

@@ -11,5 +11,4 @@ cache:
 
 script:
   - java --version
-  - mvn clean install
-  - mvn test
+  - gradle test

build.gradle

@@ -20,9 +20,12 @@ repositories {
 
 
 dependencies {
+    implementation 'org.projectlombok:lombok:1.18.16'
     compileOnly 'org.projectlombok:lombok'
-    developmentOnly 'org.springframework.boot:spring-boot-devtools'
     annotationProcessor 'org.projectlombok:lombok'
+
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'

src/main/java/net/hofmann/example/springtriangle/controller/GeometricsController.java

@@ -4,13 +4,14 @@
 import net.hofmann.example.springtriangle.data.TriangleCalculator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.awt.*;
 import java.util.List;
 
 @RestController
-class GeometricsController {
+public class GeometricsController {
 
 
     @Autowired
@@ -21,12 +22,16 @@ class GeometricsController {
 
 
     @GetMapping("/numbers")
-    List<Integer> numbers() {
+    public List<Integer> numbers() {
         return numberCalculator.numbers();
     }
 
-    @GetMapping("/triangleArea")
-    Double numbers(Point p1, Point p2, Point p3) {
-        return triangleCalculator.triangleArea(p1, p2, p3);
+    @GetMapping ("/triangleArea/{p1x}-{p1y}/{p2x}-{p2y}/{p3x}-{p3y}")
+//    @GetMapping("/triangleArea")
+    public Float triangleArea(@PathVariable Integer p1x, @PathVariable Integer p1y, @PathVariable Integer p2x, @PathVariable Integer p2y, @PathVariable Integer p3x, @PathVariable Integer p3y) {
+        Float area = triangleCalculator.triangleArea(new Point(p1x, p1y), new Point(p2x, p2y), new Point(p3x, p3y));
+
+        //Send location in response
+        return area;
     }
 }

src/main/java/net/hofmann/example/springtriangle/data/NumberCalculator.java

@@ -3,9 +3,6 @@
 
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 @Component

src/main/java/net/hofmann/example/springtriangle/data/NumberCalculatorImpl.java

@@ -1,6 +1,5 @@
 package net.hofmann.example.springtriangle.data;
 
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;

src/main/java/net/hofmann/example/springtriangle/data/TriangleCalculator.java

@@ -7,5 +7,5 @@
 @Component
 public interface TriangleCalculator {
 
-    Double triangleArea(Point p1, Point p2, Point p3);
+    Float triangleArea(Point p1, Point p2, Point p3);
 }

src/main/java/net/hofmann/example/springtriangle/data/TriangleCalculatorImpl.java

@@ -1,6 +1,5 @@
 package net.hofmann.example.springtriangle.data;
 
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
 import java.awt.*;
@@ -9,21 +8,9 @@
 public class TriangleCalculatorImpl implements TriangleCalculator {
 
     @Override
-    public final Double triangleArea(Point p1, Point p2, Point p3) {
+    public Float triangleArea(Point A, Point B, Point C) {
 
-        double side1 = 0;
-        double side2 = 0;
-        double side3 = 0;
-
-        //find length of sides of triangle
-        side1 = Math.pow(Math.pow((p2.x - p1.x), 2) + Math.pow((p2.y - p1.y), 2) * .05, side1);
-        side2 = Math.pow(Math.pow((p3.x - p2.x), 2) + Math.pow((p3.y - p2.y), 2) * .05, side2);
-        side3 = Math.pow(Math.pow((p1.x - p3.x), 2) + Math.pow((p1.y - p3.y), 2) * .05, side3);
-
-        double s = (side1 + side2 + side3) / 2;
-
-        double area = Math.sqrt(s * (s - side1) * (s - side2) * (s - side3)) * 0.5;
-
-        return area;
+        float area = (A.x * (B.y - C.y) + B.x * (C.y - A.y) + C.x * (A.y - B.y)) / 2.0f;
+        return Math.abs(area);
     }
 }

src/test/java/net/hofmann/example/springtriangle/GeometricsControllerTests.java

@@ -0,0 +1,92 @@
+package net.hofmann.example.springtriangle;
+
+import net.hofmann.example.springtriangle.controller.GeometricsController;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+
+import java.awt.*;
+import java.util.List;
+
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class GeometricsControllerTests {
+
+    @Autowired
+    private GeometricsController geometricsController;
+
+    @LocalServerPort
+    private int port;
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Test
+    void contextLoads() {
+        Assertions.assertNotNull(geometricsController);
+    }
+
+    @Test
+    void testGeoNumbersTen() {
+        List<Integer> tenNumbersExpected = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+        List<Integer> tenNumbersResult = geometricsController.numbers();
+
+        System.out.println("Expected Numbers 1-10: " + tenNumbersExpected);
+        System.out.println("Result   Numbers 1-10: " + tenNumbersResult);
+
+        Assertions.assertEquals(tenNumbersExpected, tenNumbersResult);
+    }
+
+    @Test
+    void testGeoNumbersTenREST() {
+        List<Integer> tenNumbersExpected = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        List tenNumbersResult = restTemplate.getForObject("http://localhost:" + port + "/numbers", List.class);
+
+
+        System.out.println("REST Expected Numbers 1-10: " + tenNumbersExpected);
+        System.out.println("REST Result   Numbers 1-10: " + tenNumbersResult);
+
+        Assertions.assertEquals(tenNumbersExpected, tenNumbersResult);
+    }
+
+    @Test
+    void testGeoTriangleCalc() {
+        Point p1 = new Point(5, 20);
+        Point p2 = new Point(10, 30);
+        Point p3 = new Point(33, 42);
+
+        Float areaExpected = 85f;
+        Float areaResult = geometricsController.triangleArea(p1.x, p1.y, p2.x, p2.y, p3.x, p3.y);
+
+        System.out.println("Expected Triangle Area: 85");
+        System.out.println("Result   Triangle Area: " + areaResult);
+
+        Assertions.assertEquals(areaExpected, areaResult);
+    }
+
+    @Test
+    void testGeoTriangleCalcREST() {
+        Point p1 = new Point(5, 20);
+        Point p2 = new Point(10, 30);
+        Point p3 = new Point(33, 42);
+
+        Float areaExpected = 85f;
+        Float areaResult = restTemplate.getForObject(
+                "http://localhost:" + port +
+                        "/triangleArea/" +
+                        p1.x + "-" + p1.y +
+                        "/" + p2.x + "-" + p2.y +
+                        "/" + p3.x + "-" + p3.y,
+                Float.class);
+
+
+        System.out.println("REST Expected Triangle Area: 85");
+        System.out.println("REST Result   Triangle Area: " + areaResult);
+
+        Assertions.assertEquals(areaExpected, areaResult);
+    }
+}