From b993da6b4b2da7d49a534302e6115bf43a85363c Mon Sep 17 00:00:00 2001
From: Alexandre Touret <alexandre.touret@free.fr>
Date: Tue, 9 Nov 2021 10:26:19 +0100
Subject: [PATCH] fix: fix unit tests & @arey comments
---
pom.xml | 9 ++++++---
.../samples/petclinic/rest/VisitRestController.java | 2 +-
.../samples/petclinic/rest/VetRestControllerTests.java | 2 +-
.../samples/petclinic/rest/VisitRestControllerTests.java | 2 --
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0c743de6..d35db9f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,9 @@
<jsr305.version>3.0.2</jsr305.version>
<jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>
<mapstruct.version>1.4.1.Final</mapstruct.version>
+ <jaxb-api.version>2.3.0</jaxb-api.version>
+ <openapi-generator-maven-plugin.version>5.2.1</openapi-generator-maven-plugin.version>
+ <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
</properties>
<dependencies>
@@ -156,7 +159,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <version>${jaxb-api.version}</version>
</dependency>
</dependencies>
@@ -252,7 +255,7 @@
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<!-- RELEASE_VERSION -->
- <version>5.2.1</version>
+ <version>${openapi-generator-maven-plugin.version}</version>
<!-- /RELEASE_VERSION -->
<executions>
<execution>
@@ -290,7 +293,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>add-source</id>
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/VisitRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/VisitRestController.java
index c320a328..ee92cf38 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/VisitRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/VisitRestController.java
@@ -82,7 +82,7 @@ public class VisitRestController {
if (bindingResult.hasErrors() || (visitDto == null)) {
errors.addAllErrors(bindingResult);
headers.add("errors", errors.toJSON());
- return new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST);
+ return new ResponseEntity<VisitDto>(headers, HttpStatus.BAD_REQUEST);
}
Visit visit = visitMapper.toVisit(visitDto);
this.clinicService.saveVisit(visit);
diff --git a/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java
index 78edfdc0..7b90a41f 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/VetRestControllerTests.java
@@ -189,7 +189,7 @@ public class VetRestControllerTests {
@WithMockUser(roles="VET_ADMIN")
public void testUpdateVetError() throws Exception {
Vet newVet = vets.get(0);
- newVet.setFirstName("");
+ newVet.setFirstName(null);
ObjectMapper mapper = new ObjectMapper();
String newVetAsJSON = mapper.writeValueAsString(vetMapper.toVetDto(newVet));
this.mockMvc.perform(put("/api/vets/1")
diff --git a/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java b/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java
index 1a760852..cd51385e 100644
--- a/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/rest/VisitRestControllerTests.java
@@ -174,7 +174,6 @@ public class VisitRestControllerTests {
.andExpect(status().isCreated());
}
- @Test(expected = IOException.class)
@WithMockUser(roles="OWNER_ADMIN")
public void testCreateVisitError() throws Exception {
Visit newVisit = visits.get(0);
@@ -208,7 +207,6 @@ public class VisitRestControllerTests {
.andExpect(jsonPath("$.description").value("rabies shot test"));
}
- @Test(expected = IOException.class)
@WithMockUser(roles="OWNER_ADMIN")
public void testUpdateVisitError() throws Exception {
Visit newVisit = visits.get(0);
--
GitLab