Added unit tests, additional contract tests

Author: schan2023

build.gradle

@@ -100,6 +100,13 @@ jacocoTestReport {
 }
 
 jacocoTestCoverageVerification {
+afterEvaluate {
+classDirectories = files(classDirectories.files.collect {
+fileTree(dir: "${project.buildDir}/classes/main",
+exclude: ['**/controllers/DriverControllerExceptionHandler*',
+ '**/DriverQueryApplication*'])
+})
+}
 violationRules {
 rule {
 limit {

src/main/java/org/aitesting/microservices/driver/query/service/controllers/DriverController.java

@@ -33,7 +33,13 @@ public ResponseEntity<List<Driver>> getDrivers() {
  @GetMapping("driver/{id}")
  public ResponseEntity<Driver> getDriver(@PathVariable UUID id) {
  logger.info(String.format("Request for a driver with id: %s", id));
- return new ResponseEntity<>(driverRepository.findOne(id), HttpStatus.OK);
+ Driver driver = driverRepository.findOne(id);
+ if(driver != null) {
+ logger.info(String.format("Found driver by ID: %s", id));
+ return new ResponseEntity<>(driver, HttpStatus.OK);
+ }
+ logger.info(String.format("No drivers found by ID: %s", id));
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
  }
 
 }

src/test/java/org/aitesting/microservices/driverquery/unit/DriverControllerUnitTests.java

@@ -0,0 +1,45 @@
+package org.aitesting.microservices.driverquery.unit;
+
+import static org.aitesting.microservices.driverquery.configurations.TestConstants.id1;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.aitesting.microservices.driver.query.service.controllers.DriverController;
+import org.aitesting.microservices.driver.query.service.repositories.DriverRepository;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DriverControllerUnitTests {
+
+ @InjectMocks
+ private DriverController driverController = new DriverController();
+
+ @Mock
+ private DriverRepository driverRepository;
+
+ @Test
+ public void getAllDrivers_FindAllIsCalled() {
+ //arrange
+
+ //act
+ driverController.getDrivers();
+
+ //assert
+ verify(driverRepository, times(1)).findAll();
+ }
+
+ @Test
+ public void getDriver_FindOneIsCalled() {
+ //arrange
+
+ //act
+ driverController.getDriver(id1);
+
+ //assert
+ verify(driverRepository, times(1)).findOne(id1);
+ }
+}

src/test/resources/contracts/driverquery/GetDriver.groovy

@@ -0,0 +1,35 @@
+package driverquery
+
+import org.springframework.cloud.contract.spec.*
+[
+ Contract.make {
+ description("When a GET request with a driverId is made, the driver is returned")
+ request {
+ method 'GET'
+ url '/api/v1/driver/1f13bafe-9236-4edf-ac47-bf2f1d3caec6'
+ }
+ response {
+ status 200
+ }
+ },
+ Contract.make {
+ description("When a GET request with driver not in DB, should get 404")
+ request {
+ method 'GET'
+ url 'api/v1/driver/7a7ec638-7793-4bfe-a043-1dc667d7cb19444'
+ }
+ response {
+ status 404
+ }
+ },
+ Contract.make {
+ description("When GET request with bad string id, should get 400")
+ request {
+ method 'GET'
+ url 'api/v1/driver/badString'
+ }
+ response {
+ status 400
+ }
+ }
+]