From 944e5b5717279db97b435a8f09de4c3f4fd2b88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C5=BEbeta=20Hajn=C3=A1?= <xhajna@fi.muni.cz>
Date: Sun, 16 Apr 2023 15:48:31 +0200
Subject: [PATCH] fix(Service tests): mocked repository return Optional.empty()
instead of throwing exception
---
.../java/cz/muni/pa165/service/CarComponentServiceTest.java | 6 +++---
.../java/cz/muni/pa165/service/DepartmentServiceTest.java | 3 ++-
.../test/java/cz/muni/pa165/service/DriverServiceTest.java | 6 +++---
.../java/cz/muni/pa165/service/EngineerServiceTest.java | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/core/src/test/java/cz/muni/pa165/service/CarComponentServiceTest.java b/core/src/test/java/cz/muni/pa165/service/CarComponentServiceTest.java
index 8e0f226..ea22d3a 100644
--- a/core/src/test/java/cz/muni/pa165/service/CarComponentServiceTest.java
+++ b/core/src/test/java/cz/muni/pa165/service/CarComponentServiceTest.java
@@ -52,7 +52,7 @@ class CarComponentServiceTest {
void updateNonExistingComponent() {
var exceptionToThrow = new ResourceNotFoundException(CarComponent.class, Long.MAX_VALUE);
- when(carComponentRepository.findById(Long.MAX_VALUE)).thenThrow(exceptionToThrow);
+ when(carComponentRepository.findById(Long.MAX_VALUE)).thenReturn(Optional.empty());
assertThrows(exceptionToThrow.getClass(), () -> {
carComponentService.update(Long.MAX_VALUE, null);
@@ -72,7 +72,7 @@ class CarComponentServiceTest {
void findNonExistingComponentById() {
var exceptionToThrow = new ResourceNotFoundException(CarComponent.class, Long.MAX_VALUE);
- when(carComponentRepository.findById(Long.MAX_VALUE)).thenThrow(exceptionToThrow);
+ when(carComponentRepository.findById(Long.MAX_VALUE)).thenReturn(Optional.empty());
assertThrows(exceptionToThrow.getClass(), () -> {
carComponentService.findById(Long.MAX_VALUE);
@@ -117,7 +117,7 @@ class CarComponentServiceTest {
void deleteNonExisting() {
var exceptionToThrow = new ResourceNotFoundException(CarComponent.class, Long.MAX_VALUE);
- when(carComponentRepository.findById(Long.MAX_VALUE)).thenThrow(exceptionToThrow);
+ when(carComponentRepository.findById(Long.MAX_VALUE)).thenReturn(Optional.empty());
assertThrows(exceptionToThrow.getClass(), () -> {
carComponentService.delete(Long.MAX_VALUE);
diff --git a/core/src/test/java/cz/muni/pa165/service/DepartmentServiceTest.java b/core/src/test/java/cz/muni/pa165/service/DepartmentServiceTest.java
index 1f27da6..72dcb8c 100644
--- a/core/src/test/java/cz/muni/pa165/service/DepartmentServiceTest.java
+++ b/core/src/test/java/cz/muni/pa165/service/DepartmentServiceTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.util.HashSet;
+import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -58,7 +59,7 @@ class DepartmentServiceTest {
@Test
void addNonExistingEngineer() {
- when(engineerRepository.findById(1L)).thenThrow(new ResourceNotFoundException(Engineer.class, 1L));
+ when(engineerRepository.findById(1L)).thenReturn(Optional.empty());
when(departmentRepository.findById(emptyDepartment.getId())).thenReturn(java.util.Optional.of(emptyDepartment));
assertThrows(ResourceNotFoundException.class, () -> service.addEngineer(emptyDepartment.getId(), 1L));
diff --git a/core/src/test/java/cz/muni/pa165/service/DriverServiceTest.java b/core/src/test/java/cz/muni/pa165/service/DriverServiceTest.java
index 8dfc26d..842f267 100644
--- a/core/src/test/java/cz/muni/pa165/service/DriverServiceTest.java
+++ b/core/src/test/java/cz/muni/pa165/service/DriverServiceTest.java
@@ -57,7 +57,7 @@ class DriverServiceTest {
void updateNonExistingDriver() {
var exceptionToThrow = new ResourceNotFoundException(CarComponent.class, Long.MAX_VALUE);
- when(driverRepository.findById(Long.MAX_VALUE)).thenThrow(exceptionToThrow);
+ when(driverRepository.findById(Long.MAX_VALUE)).thenReturn(Optional.empty());
assertThrows(exceptionToThrow.getClass(), () -> {
driverService.update(Long.MAX_VALUE, null);
@@ -77,7 +77,7 @@ class DriverServiceTest {
void findNonExistingDriverById() {
var exceptionToThrow = new ResourceNotFoundException(CarComponent.class, Long.MAX_VALUE);
- when(driverRepository.findById(Long.MAX_VALUE)).thenThrow(exceptionToThrow);
+ when(driverRepository.findById(Long.MAX_VALUE)).thenReturn(Optional.empty());
assertThrows(exceptionToThrow.getClass(), () -> {
driverService.findById(Long.MAX_VALUE);
@@ -110,7 +110,7 @@ class DriverServiceTest {
void deleteNonExisting() {
var exceptionToThrow = new ResourceNotFoundException(CarComponent.class, Long.MAX_VALUE);
- when(driverRepository.findById(Long.MAX_VALUE)).thenThrow(exceptionToThrow);
+ when(driverRepository.findById(Long.MAX_VALUE)).thenReturn(Optional.empty());
assertThrows(exceptionToThrow.getClass(), () -> {
driverService.delete(Long.MAX_VALUE);
diff --git a/core/src/test/java/cz/muni/pa165/service/EngineerServiceTest.java b/core/src/test/java/cz/muni/pa165/service/EngineerServiceTest.java
index 06f98ea..c51b597 100644
--- a/core/src/test/java/cz/muni/pa165/service/EngineerServiceTest.java
+++ b/core/src/test/java/cz/muni/pa165/service/EngineerServiceTest.java
@@ -35,7 +35,7 @@ class EngineerServiceTest {
@Test
void findNonExistingEngineerById() {
- when(engineerRepository.findById(1L)).thenThrow(new ResourceNotFoundException(Engineer.class, 1L));
+ when(engineerRepository.findById(1L)).thenReturn(Optional.empty());
assertThrows(ResourceNotFoundException.class, () -> service.findById(1L));
}
--
GitLab