From 41fcf1d64b3578346b12c5a403b3860e4919b5ef Mon Sep 17 00:00:00 2001
From: Dominika Zemanovicova <xzemanov@fi.muni.cz>
Date: Sun, 16 Apr 2023 18:27:28 +0200
Subject: [PATCH] Fix AnswerServiceTest

---
 .../answer/AnswerServiceTest.java             | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/application/module-exercise/src/test/java/org/fuseri/moduleexercise/answer/AnswerServiceTest.java b/application/module-exercise/src/test/java/org/fuseri/moduleexercise/answer/AnswerServiceTest.java
index 2c67bdc3..ee53178f 100644
--- a/application/module-exercise/src/test/java/org/fuseri/moduleexercise/answer/AnswerServiceTest.java
+++ b/application/module-exercise/src/test/java/org/fuseri/moduleexercise/answer/AnswerServiceTest.java
@@ -3,7 +3,6 @@ package org.fuseri.moduleexercise.answer;
 import jakarta.persistence.EntityNotFoundException;
 import org.fuseri.moduleexercise.exercise.Exercise;
 import org.fuseri.moduleexercise.question.Question;
-import org.fuseri.moduleexercise.question.QuestionRepository;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,23 +19,21 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @SpringBootTest
-public class AnswerServiceTest {
-    @MockBean
-    AnswerRepository repository;
-
-    @MockBean
-    QuestionRepository questionRepository;
+class AnswerServiceTest {
 
     @Autowired
     AnswerService service;
 
+    @MockBean
+    AnswerRepository answerRepository;
+
     Answer answer;
     Question question;
     Exercise exercise;
 
     @BeforeEach
     void setup() {
-        exercise = new Exercise("idioms", "exercise on basic idioms", 2, 1L, new HashSet<Question>());
+        exercise = new Exercise("idioms", "exercise on basic idioms", 2, 1L, new HashSet<>());
         question = new Question("text", new HashSet<>(), exercise);
         answer = new Answer("text", false, question);
     }
@@ -44,39 +41,38 @@ public class AnswerServiceTest {
 
     @Test
     void create() {
-        when(repository.save(answer)).thenReturn(answer);
+        when(answerRepository.save(answer)).thenReturn(answer);
         Answer result = service.create(answer);
         Assertions.assertEquals(answer, result);
-        verify(repository).save(answer);
+        verify(answerRepository).save(answer);
     }
 
     @Test
     void notFound() {
-        when(repository.findById(anyLong())).thenReturn(Optional.empty());
-
+        when(answerRepository.findById(anyLong())).thenReturn(Optional.empty());
         Assertions.assertThrows(EntityNotFoundException.class, () -> service.find(anyLong()));
     }
 
     @Test
     void find() {
-        when(repository.findById(anyLong())).thenReturn(Optional.of(answer));
+        when(answerRepository.findById(anyLong())).thenReturn(Optional.of(answer));
 
         Answer result = service.find(anyLong());
 
         Assertions.assertEquals(answer, result);
-        verify(repository).findById(anyLong());
+        verify(answerRepository).findById(anyLong());
     }
 
     @Test
-    void findByQuestionId() {
+    void findAllByQuestionId() {
         long id = 1;
         List<Answer> list = Collections.emptyList();
 
-        when(repository.existsById(id)).thenReturn(true);
-        when(repository.findByQuestionId(id)).thenReturn(list);
+        when(answerRepository.existsById(id)).thenReturn(true);
+        when(answerRepository.findByQuestionId(id)).thenReturn(list);
         List<Answer> result = service.findAllByQuestionId(1L);
 
         Assertions.assertEquals(list, result);
-        verify(repository).findByQuestionId(id);
+        verify(answerRepository).findByQuestionId(id);
     }
 }
-- 
GitLab