From a1d597dde2e3d756c8932bdc2e9a665438abf596 Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Thu, 17 Aug 2023 15:56:38 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20:=20move=20all=20users=20code=20?= =?UTF-8?q?to=20dedicated=20package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/classrooms/assignments/Assignment.java | 2 +- .../classrooms/assignments/AssignmentController.java | 2 +- .../gitlab/classrooms/assignments/AssignmentService.java | 2 +- .../classrooms/assignments/AssignmentServiceImpl.java | 1 + .../fr/univ_lille/gitlab/classrooms/domain/Classroom.java | 1 + .../gitlab/classrooms/domain/ClassroomController.java | 1 + .../gitlab/classrooms/domain/ClassroomService.java | 1 + .../gitlab/classrooms/domain/ClassroomServiceImpl.java | 1 + .../gitlab/classrooms/quiz/QuizAnswerController.java | 2 +- .../fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java | 2 +- .../gitlab/classrooms/quiz/QuizScoreRepository.java | 2 +- .../gitlab/classrooms/quiz/QuizScoreService.java | 2 +- .../gitlab/classrooms/quiz/QuizScoreServiceImpl.java | 2 +- .../gitlab/classrooms/ui/UserControllerAdvice.java | 4 ++-- .../gitlab/classrooms/ui/WebSecurityConfiguration.java | 2 +- .../classrooms/{domain => users}/ClassroomRole.java | 2 +- .../classrooms/{domain => users}/ClassroomUser.java | 2 +- .../{domain => users}/ClassroomUserRepository.java | 2 +- .../{domain => users}/ClassroomUserService.java | 2 +- .../{domain => users}/ClassroomUserServiceImpl.java | 2 +- .../assignments/AssignmentControllerMVCTest.java | 6 ++---- .../classrooms/assignments/AssignmentServiceImplTest.java | 5 +---- .../classrooms/domain/ClassroomControllerMVCTest.java | 8 ++------ .../classrooms/quiz/QuizAnswerControllerMVCTest.java | 4 ++-- .../gitlab/classrooms/quiz/QuizAnswerControllerTest.java | 2 +- .../classrooms/quiz/QuizEditionControllerMVCTest.java | 4 ++-- .../gitlab/classrooms/quiz/QuizScoreServiceImplTest.java | 5 ++--- .../gitlab/classrooms/ui/HomeControllerMVCTest.java | 3 ++- .../{domain => users}/ClassroomUserServiceImplTest.java | 6 +++++- .../classrooms/{ui => users}/WithMockClassroomUser.java | 3 +-- .../WithMockClassroomUserSecurityContextFactory.java | 2 +- 31 files changed, 42 insertions(+), 43 deletions(-) rename src/main/java/fr/univ_lille/gitlab/classrooms/{domain => users}/ClassroomRole.java (52%) rename src/main/java/fr/univ_lille/gitlab/classrooms/{domain => users}/ClassroomUser.java (96%) rename src/main/java/fr/univ_lille/gitlab/classrooms/{domain => users}/ClassroomUserRepository.java (81%) rename src/main/java/fr/univ_lille/gitlab/classrooms/{domain => users}/ClassroomUserService.java (82%) rename src/main/java/fr/univ_lille/gitlab/classrooms/{domain => users}/ClassroomUserServiceImpl.java (97%) rename src/test/java/fr/univ_lille/gitlab/classrooms/{domain => users}/ClassroomUserServiceImplTest.java (90%) rename src/test/java/fr/univ_lille/gitlab/classrooms/{ui => users}/WithMockClassroomUser.java (80%) rename src/test/java/fr/univ_lille/gitlab/classrooms/{ui => users}/WithMockClassroomUserSecurityContextFactory.java (96%) diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/Assignment.java b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/Assignment.java index fd8e7ea..ec55941 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/Assignment.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/Assignment.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.assignments; import fr.univ_lille.gitlab.classrooms.domain.Classroom; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.persistence.*; import java.util.HashSet; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentController.java b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentController.java index 49443d6..030afa1 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentController.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentController.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.assignments; import fr.univ_lille.gitlab.classrooms.domain.ClassroomService; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import fr.univ_lille.gitlab.classrooms.quiz.QuizRepository; import fr.univ_lille.gitlab.classrooms.quiz.QuizScoreService; import jakarta.annotation.security.RolesAllowed; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentService.java b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentService.java index 4e12483..c30986c 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentService.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentService.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.assignments; import fr.univ_lille.gitlab.classrooms.domain.Classroom; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.transaction.Transactional; import org.gitlab4j.api.GitLabApiException; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java index 9c4cd6f..444370b 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImpl.java @@ -2,6 +2,7 @@ package fr.univ_lille.gitlab.classrooms.assignments; import fr.univ_lille.gitlab.classrooms.domain.*; import fr.univ_lille.gitlab.classrooms.quiz.QuizRepository; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.transaction.Transactional; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/Classroom.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/Classroom.java index 9312967..d04a2c3 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/Classroom.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/Classroom.java @@ -1,6 +1,7 @@ package fr.univ_lille.gitlab.classrooms.domain; import fr.univ_lille.gitlab.classrooms.assignments.Assignment; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.persistence.*; import java.net.URL; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java index 1edf0a6..339cba9 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomController.java @@ -1,5 +1,6 @@ package fr.univ_lille.gitlab.classrooms.domain; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.annotation.security.RolesAllowed; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java index 2ce4fd3..54fd873 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomService.java @@ -1,5 +1,6 @@ package fr.univ_lille.gitlab.classrooms.domain; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import org.gitlab4j.api.GitLabApiException; import java.util.List; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java index dcb47c0..77f2444 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomServiceImpl.java @@ -1,5 +1,6 @@ package fr.univ_lille.gitlab.classrooms.domain; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.transaction.Transactional; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerController.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerController.java index fd76d7e..0920f03 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerController.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerController.java @@ -1,6 +1,6 @@ package fr.univ_lille.gitlab.classrooms.quiz; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java index 9b34c24..d34cc3c 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java @@ -1,6 +1,6 @@ package fr.univ_lille.gitlab.classrooms.quiz; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.IdClass; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreRepository.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreRepository.java index 080bb70..8cdda67 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreRepository.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreRepository.java @@ -1,6 +1,6 @@ package fr.univ_lille.gitlab.classrooms.quiz; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import org.springframework.data.repository.CrudRepository; import java.util.Collection; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java index 4d5ff33..d4c6572 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.quiz; import fr.univ_lille.gitlab.classrooms.domain.Classroom; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import java.util.Optional; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java index fdd8ff5..d92857c 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.quiz; import fr.univ_lille.gitlab.classrooms.domain.Classroom; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/ui/UserControllerAdvice.java b/src/main/java/fr/univ_lille/gitlab/classrooms/ui/UserControllerAdvice.java index 80b337f..8b89472 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/ui/UserControllerAdvice.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/ui/UserControllerAdvice.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.ui; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUserService; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUserService; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/ui/WebSecurityConfiguration.java b/src/main/java/fr/univ_lille/gitlab/classrooms/ui/WebSecurityConfiguration.java index 4e1a982..cbf41fc 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/ui/WebSecurityConfiguration.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/ui/WebSecurityConfiguration.java @@ -1,6 +1,6 @@ package fr.univ_lille.gitlab.classrooms.ui; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUserService; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUserService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcOperations; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomRole.java b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomRole.java similarity index 52% rename from src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomRole.java rename to src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomRole.java index 4214162..9cacd2b 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomRole.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomRole.java @@ -1,4 +1,4 @@ -package fr.univ_lille.gitlab.classrooms.domain; +package fr.univ_lille.gitlab.classrooms.users; public enum ClassroomRole { STUDENT, TEACHER, diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUser.java b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUser.java similarity index 96% rename from src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUser.java rename to src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUser.java index baa90f8..f893714 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUser.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUser.java @@ -1,4 +1,4 @@ -package fr.univ_lille.gitlab.classrooms.domain; +package fr.univ_lille.gitlab.classrooms.users; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserRepository.java b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserRepository.java similarity index 81% rename from src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserRepository.java rename to src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserRepository.java index 5957711..2df976c 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserRepository.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserRepository.java @@ -1,4 +1,4 @@ -package fr.univ_lille.gitlab.classrooms.domain; +package fr.univ_lille.gitlab.classrooms.users; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserService.java b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserService.java similarity index 82% rename from src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserService.java rename to src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserService.java index bb4bec5..7f3b900 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserService.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserService.java @@ -1,4 +1,4 @@ -package fr.univ_lille.gitlab.classrooms.domain; +package fr.univ_lille.gitlab.classrooms.users; import org.springframework.security.oauth2.core.user.OAuth2User; diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserServiceImpl.java b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserServiceImpl.java similarity index 97% rename from src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserServiceImpl.java rename to src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserServiceImpl.java index 8355ea2..099c276 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserServiceImpl.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserServiceImpl.java @@ -1,4 +1,4 @@ -package fr.univ_lille.gitlab.classrooms.domain; +package fr.univ_lille.gitlab.classrooms.users; import jakarta.transaction.Transactional; import org.springframework.security.oauth2.core.user.OAuth2User; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentControllerMVCTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentControllerMVCTest.java index b83a3ee..0299674 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentControllerMVCTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentControllerMVCTest.java @@ -1,12 +1,10 @@ package fr.univ_lille.gitlab.classrooms.assignments; -import fr.univ_lille.gitlab.classrooms.assignments.AssignmentService; -import fr.univ_lille.gitlab.classrooms.assignments.QuizAssignment; import fr.univ_lille.gitlab.classrooms.domain.Classroom; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomRole; +import fr.univ_lille.gitlab.classrooms.users.ClassroomRole; import fr.univ_lille.gitlab.classrooms.domain.ClassroomService; import fr.univ_lille.gitlab.classrooms.quiz.*; -import fr.univ_lille.gitlab.classrooms.ui.WithMockClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.WithMockClassroomUser; import org.gitlab4j.api.GitLabApi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImplTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImplTest.java index 842767d..e1ff007 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImplTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/AssignmentServiceImplTest.java @@ -1,9 +1,6 @@ package fr.univ_lille.gitlab.classrooms.assignments; -import fr.univ_lille.gitlab.classrooms.assignments.AssignmentRepository; -import fr.univ_lille.gitlab.classrooms.assignments.AssignmentServiceImpl; -import fr.univ_lille.gitlab.classrooms.assignments.ExerciseAssignment; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomControllerMVCTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomControllerMVCTest.java index 2310891..119f3da 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomControllerMVCTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomControllerMVCTest.java @@ -2,11 +2,9 @@ package fr.univ_lille.gitlab.classrooms.domain; import fr.univ_lille.gitlab.classrooms.quiz.QuizEntity; import fr.univ_lille.gitlab.classrooms.quiz.QuizRepository; -import fr.univ_lille.gitlab.classrooms.ui.WithMockClassroomUser; -import org.checkerframework.checker.units.qual.A; -import org.checkerframework.checker.units.qual.C; +import fr.univ_lille.gitlab.classrooms.users.WithMockClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomRole; import org.gitlab4j.api.GitLabApi; -import org.gitlab4j.api.models.Group; import org.gitlab4j.api.models.GroupParams; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -15,12 +13,10 @@ import org.junit.jupiter.api.Test; import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.data.domain.Example; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.web.servlet.MockMvc; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerMVCTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerMVCTest.java index 014ad20..7752888 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerMVCTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerMVCTest.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.quiz; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomRole; -import fr.univ_lille.gitlab.classrooms.ui.WithMockClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomRole; +import fr.univ_lille.gitlab.classrooms.users.WithMockClassroomUser; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerTest.java index 873ce73..761da87 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizAnswerControllerTest.java @@ -1,6 +1,6 @@ package fr.univ_lille.gitlab.classrooms.quiz; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizEditionControllerMVCTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizEditionControllerMVCTest.java index ddfab04..1a7e0f2 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizEditionControllerMVCTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizEditionControllerMVCTest.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.quiz; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomRole; -import fr.univ_lille.gitlab.classrooms.ui.WithMockClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomRole; +import fr.univ_lille.gitlab.classrooms.users.WithMockClassroomUser; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImplTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImplTest.java index ad15da4..a49a9c9 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImplTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImplTest.java @@ -1,7 +1,7 @@ package fr.univ_lille.gitlab.classrooms.quiz; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUser; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomUserService; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUserService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -14,7 +14,6 @@ import java.time.ZonedDateTime; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class QuizScoreServiceImplTest { diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/ui/HomeControllerMVCTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/ui/HomeControllerMVCTest.java index 9623570..f305825 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/ui/HomeControllerMVCTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/ui/HomeControllerMVCTest.java @@ -1,7 +1,8 @@ package fr.univ_lille.gitlab.classrooms.ui; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomRole; +import fr.univ_lille.gitlab.classrooms.users.ClassroomRole; import fr.univ_lille.gitlab.classrooms.domain.ClassroomService; +import fr.univ_lille.gitlab.classrooms.users.WithMockClassroomUser; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserServiceImplTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserServiceImplTest.java similarity index 90% rename from src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserServiceImplTest.java rename to src/test/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserServiceImplTest.java index 46c553a..33a1b8a 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/domain/ClassroomUserServiceImplTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/users/ClassroomUserServiceImplTest.java @@ -1,5 +1,9 @@ -package fr.univ_lille.gitlab.classrooms.domain; +package fr.univ_lille.gitlab.classrooms.users; +import fr.univ_lille.gitlab.classrooms.users.ClassroomRole; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUserRepository; +import fr.univ_lille.gitlab.classrooms.users.ClassroomUserServiceImpl; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/ui/WithMockClassroomUser.java b/src/test/java/fr/univ_lille/gitlab/classrooms/users/WithMockClassroomUser.java similarity index 80% rename from src/test/java/fr/univ_lille/gitlab/classrooms/ui/WithMockClassroomUser.java rename to src/test/java/fr/univ_lille/gitlab/classrooms/users/WithMockClassroomUser.java index 0503f57..a39f8ca 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/ui/WithMockClassroomUser.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/users/WithMockClassroomUser.java @@ -1,6 +1,5 @@ -package fr.univ_lille.gitlab.classrooms.ui; +package fr.univ_lille.gitlab.classrooms.users; -import fr.univ_lille.gitlab.classrooms.domain.ClassroomRole; import org.springframework.security.test.context.support.WithSecurityContext; import java.lang.annotation.Retention; diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/ui/WithMockClassroomUserSecurityContextFactory.java b/src/test/java/fr/univ_lille/gitlab/classrooms/users/WithMockClassroomUserSecurityContextFactory.java similarity index 96% rename from src/test/java/fr/univ_lille/gitlab/classrooms/ui/WithMockClassroomUserSecurityContextFactory.java rename to src/test/java/fr/univ_lille/gitlab/classrooms/users/WithMockClassroomUserSecurityContextFactory.java index 15c529c..292cce2 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/ui/WithMockClassroomUserSecurityContextFactory.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/users/WithMockClassroomUserSecurityContextFactory.java @@ -1,4 +1,4 @@ -package fr.univ_lille.gitlab.classrooms.ui; +package fr.univ_lille.gitlab.classrooms.users; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContext; -- 2.51.2