Development: Reduce redundant autowires in server tests

src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java

@@ -26,9 +26,12 @@
 import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.VcsRepositoryUri;
+import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.programming.MockDelegate;
+import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
+import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.service.FileService;
 import de.tum.in.www1.artemis.service.ModelingSubmissionService;
 import de.tum.in.www1.artemis.service.TextBlockService;
@@ -169,12 +172,21 @@ public abstract class AbstractArtemisIntegrationTest implements MockDelegate {
     @Autowired
     protected CourseUtilService courseUtilService;
 
+    @Autowired
+    protected ExerciseUtilService exerciseUtilService;
+
+    @Autowired
+    protected UserRepository userRepository;
+
     @Autowired
     protected ExerciseRepository exerciseRepository;
 
     @Autowired
     protected ResultRepository resultRepository;
 
+    @Autowired
+    protected CourseRepository courseRepository;
+
     @BeforeEach
     void mockMailService() {
         doNothing().when(javaMailSender).send(any(MimeMessage.class));

src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java

@@ -9,16 +9,13 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.security.test.context.support.WithMockUser;
 
-import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.BuildPlan;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
 import de.tum.in.www1.artemis.domain.enumeration.ProjectType;
 import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.BuildPlanRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
-import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService;
-import de.tum.in.www1.artemis.user.UserUtilService;
 
 class BuildPlanIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest {
 
@@ -30,15 +27,6 @@ class BuildPlanIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTes
     @Autowired
     private BuildPlanRepository buildPlanRepository;
 
-    @Autowired
-    private ProgrammingTriggerService programmingTriggerService;
-
-    @Autowired
-    private UserUtilService userUtilService;
-
-    @Autowired
-    private CourseUtilService courseUtilService;
-
     @Autowired
     private ProgrammingExerciseUtilService programmingExerciseUtilService;
 

src/test/java/de/tum/in/www1/artemis/ContentVersionIntegrationTest.java

@@ -6,22 +6,17 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.filter.ApiVersionFilter;
 
 class ContentVersionIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
     private static final String TEST_PREFIX = "contentversion";
 
-    @Autowired
-    private UserUtilService userUtilService;
-
     @BeforeEach
     void initTestCase() {
         userUtilService.addUsers(TEST_PREFIX, 1, 0, 0, 0);

src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java

@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.Attachment;
 import de.tum.in.www1.artemis.domain.Lecture;
 import de.tum.in.www1.artemis.domain.User;
@@ -40,7 +39,6 @@
 import de.tum.in.www1.artemis.repository.AttachmentUnitRepository;
 import de.tum.in.www1.artemis.repository.LectureRepository;
 import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository;
-import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO;
 
 class FileIntegrationTest extends AbstractSpringIntegrationIndependentTest {
@@ -59,18 +57,12 @@ class FileIntegrationTest extends AbstractSpringIntegrationIndependentTest {
     @Autowired
     private LectureRepository lectureRepo;
 
-    @Autowired
-    private UserUtilService userUtilService;
-
     @Autowired
     private LectureUtilService lectureUtilService;
 
     @Autowired
     private ObjectMapper objectMapper;
 
-    @Autowired
-    private CourseUtilService courseUtilService;
-
     @Autowired
     private ExamUtilService examUtilService;
 

src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java

@@ -13,26 +13,18 @@
 import de.tum.in.www1.artemis.domain.Feedback;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.Result;
-import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
-import de.tum.in.www1.artemis.user.UserUtilService;
 
 class LongFeedbackResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
     private static final String TEST_PREFIX = "longfeedbackintegration";
 
     private static final String LONG_FEEDBACK = "a".repeat(Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH + 10);
 
-    @Autowired
-    private UserUtilService userUtilService;
-
     @Autowired
     private ProgrammingExerciseUtilService programmingExerciseUtilService;
 
-    @Autowired
-    private ExerciseUtilService exerciseUtilService;
-
     @Autowired
     private ParticipationUtilService participationUtilService;
 

src/test/java/de/tum/in/www1/artemis/Lti13LaunchIntegrationTest.java

@@ -17,13 +17,10 @@
 import org.apache.http.client.utils.URLEncodedUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.security.test.context.support.WithMockUser;
 
-import de.tum.in.www1.artemis.repository.UserRepository;
-import de.tum.in.www1.artemis.user.UserUtilService;
 import io.jsonwebtoken.Jwts;
 
 /**
@@ -51,12 +48,6 @@ class Lti13LaunchIntegrationTest extends AbstractSpringIntegrationIndependentTes
 
     private static final String TEST_PREFIX = "lti13launchintegrationtest";
 
-    @Autowired
-    private UserUtilService userUtilService;
-
-    @Autowired
-    private UserRepository userRepository;
-
     @BeforeEach
     void init() {
         userUtilService.addUsers(TEST_PREFIX, 1, 1, 0, 1);

src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java

@@ -29,34 +29,18 @@
 import com.nimbusds.jose.jwk.RSAKey;
 
 import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer;
-import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.lti.Claims;
 import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.repository.CourseRepository;
-import de.tum.in.www1.artemis.repository.UserRepository;
-import de.tum.in.www1.artemis.user.UserUtilService;
 import io.jsonwebtoken.Jwts;
 
 class LtiDeepLinkingIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
     private static final String TEST_PREFIX = "ltideeplinkingintegrationtest";
 
-    @Autowired
-    private UserRepository userRepository;
-
-    @Autowired
-    private UserUtilService userUtilService;
-
     @Autowired
     private ProgrammingExerciseUtilService programmingExerciseUtilService;
 
-    @Autowired
-    private CourseUtilService courseUtilService;
-
-    @Autowired
-    private CourseRepository courseRepository;
-
     private Course course;
 
     @BeforeEach

src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java

@@ -28,7 +28,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
 import de.tum.in.www1.artemis.domain.enumeration.QuizMode;
@@ -38,26 +37,17 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizSubmission;
 import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
-import de.tum.in.www1.artemis.repository.CourseRepository;
-import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.QuizExerciseRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
 import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService;
-import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.util.RequestUtilService;
 
 @Isolated
 class LtiQuizIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
     private static final String TEST_PREFIX = "ltiquizsubmissiontest";
 
-    @Autowired
-    private CourseRepository courseRepository;
-
-    @Autowired
-    private ExerciseRepository exerciseRepository;
-
     @Autowired
     private QuizExerciseService quizExerciseService;
 
@@ -67,12 +57,6 @@ class LtiQuizIntegrationTest extends AbstractSpringIntegrationIndependentTest {
     @Autowired
     private SubmissionRepository submissionRepository;
 
-    @Autowired
-    private CourseUtilService courseUtilService;
-
-    @Autowired
-    private UserUtilService userUtilService;
-
     @Autowired
     private ParticipationUtilService participationUtilService;
 

src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java

@@ -24,7 +24,6 @@
 import de.tum.in.www1.artemis.domain.PersistentAuditEvent;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
-import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
 import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
@@ -33,7 +32,6 @@
 import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService;
 import de.tum.in.www1.artemis.service.feature.Feature;
 import de.tum.in.www1.artemis.service.feature.FeatureToggleService;
-import de.tum.in.www1.artemis.user.UserUtilService;
 
 class ManagementResourceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest {
 
@@ -48,15 +46,9 @@ class ManagementResourceIntegrationTest extends AbstractSpringIntegrationLocalCI
     @Autowired
     private FeatureToggleService featureToggleService;
 
-    @Autowired
-    private UserUtilService userUtilService;
-
     @Autowired
     private ProgrammingExerciseUtilService programmingExerciseUtilService;
 
-    @Autowired
-    private ExerciseUtilService exerciseUtilService;
-
     @Autowired
     private ParticipationUtilService participationUtilService;
 

src/test/java/de/tum/in/www1/artemis/MetricsIntegrationTest.java

@@ -15,7 +15,6 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -32,9 +31,6 @@ class MetricsIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
     private static final String TEST_PREFIX = "metricsintegration";
 
-    @Autowired
-    private ParticipantScoreScheduleService participantScoreScheduleService;
-
     private Course course;
 
     private static final String STUDENT_OF_COURSE = TEST_PREFIX + "student1";

src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java

@@ -14,16 +14,12 @@
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration;
 import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration;
-import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.OnlineCourseConfigurationRepository;
 
 class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
     private static final String TEST_PREFIX = "oauth2jwksintegrationtest";
 
-    @Autowired
-    private CourseRepository courseRepository;
-
     @Autowired
     private OnlineCourseConfigurationRepository onlineCourseConfigurationRepository;
 

src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java

@@ -31,7 +31,6 @@
 import de.tum.in.www1.artemis.domain.enumeration.StatisticsView;
 import de.tum.in.www1.artemis.domain.metis.AnswerPost;
 import de.tum.in.www1.artemis.domain.metis.Post;
-import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
@@ -40,10 +39,8 @@
 import de.tum.in.www1.artemis.repository.ParticipantScoreRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.repository.TextExerciseRepository;
-import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository;
 import de.tum.in.www1.artemis.repository.metis.PostRepository;
-import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.rest.dto.CourseManagementStatisticsDTO;
 import de.tum.in.www1.artemis.web.rest.dto.ExerciseManagementStatisticsDTO;
 
@@ -54,9 +51,6 @@ class StatisticsIntegrationTest extends AbstractSpringIntegrationIndependentTest
     @Autowired
     private TextExerciseRepository textExerciseRepository;
 
-    @Autowired
-    private UserRepository userRepository;
-
     @Autowired
     private PostRepository postRepository;
 
@@ -72,9 +66,6 @@ class StatisticsIntegrationTest extends AbstractSpringIntegrationIndependentTest
     @Autowired
     private StudentParticipationRepository studentParticipationRepository;
 
-    @Autowired
-    private UserUtilService userUtilService;
-
     @Autowired
     private ModelingExerciseUtilService modelingExerciseUtilService;
 
@@ -84,9 +75,6 @@ class StatisticsIntegrationTest extends AbstractSpringIntegrationIndependentTest
     @Autowired
     private TextExerciseUtilService textExerciseUtilService;
 
-    @Autowired
-    private ExerciseUtilService exerciseUtilService;
-
     private Course course;
 
     private TextExercise exercise;