From 591feae7200c750b31f6dfcef4bf9c2f0abf6a41 Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Sun, 22 Sep 2024 01:29:56 +0200 Subject: [PATCH] add AbstractAtlasIntegrationTest --- .../atlas/AbstractAtlasIntegrationTest.java | 159 ++++++++++++++++++ ...CompetencyPrerequisiteIntegrationTest.java | 53 +----- .../CompetencyJolIntegrationTest.java | 23 +-- .../CourseCompetencyIntegrationTest.java | 93 +--------- ...StandardizedCompetencyIntegrationTest.java | 24 +-- .../LearningPathIntegrationTest.java | 60 +------ .../atlas/science/ScienceIntegrationTest.java | 13 +- .../ScienceSettingsIntegrationTest.java | 9 +- 8 files changed, 176 insertions(+), 258 deletions(-) create mode 100644 src/test/java/de/tum/cit/aet/artemis/atlas/AbstractAtlasIntegrationTest.java diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/AbstractAtlasIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/AbstractAtlasIntegrationTest.java new file mode 100644 index 000000000000..a7c295eba24f --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/AbstractAtlasIntegrationTest.java @@ -0,0 +1,159 @@ +package de.tum.cit.aet.artemis.atlas; + +import org.springframework.beans.factory.annotation.Autowired; + +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.PrerequisiteUtilService; +import de.tum.cit.aet.artemis.atlas.competency.util.StandardizedCompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.learningpath.util.LearningPathUtilService; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyJolRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceSettingRepository; +import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.atlas.test_repository.CompetencyProgressTestRepository; +import de.tum.cit.aet.artemis.atlas.test_repository.LearningPathTestRepository; +import de.tum.cit.aet.artemis.atlas.test_repository.ScienceEventTestRepository; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; + +public abstract class AbstractAtlasIntegrationTest extends AbstractSpringIntegrationIndependentTest { + + // Repositories + @Autowired + protected CompetencyRepository competencyRepository; + + @Autowired + protected CourseCompetencyRepository courseCompetencyRepository; + + @Autowired + protected CompetencyRelationRepository competencyRelationRepository; + + @Autowired + protected CompetencyProgressTestRepository competencyProgressRepository; + + @Autowired + protected KnowledgeAreaRepository knowledgeAreaRepository; + + @Autowired + protected StandardizedCompetencyRepository standardizedCompetencyRepository; + + @Autowired + protected SourceRepository sourceRepository; + + @Autowired + protected LearningPathTestRepository learningPathRepository; + + @Autowired + protected ScienceSettingRepository scienceSettingRepository; + + @Autowired + protected ScienceEventTestRepository scienceEventRepository; + + @Autowired + protected PrerequisiteRepository prerequisiteRepository; + + @Autowired + protected CompetencyJolRepository competencyJolRepository; + + // External Repositories + @Autowired + protected LectureRepository lectureRepository; + + @Autowired + protected LectureUnitRepository lectureUnitRepository; + + @Autowired + protected GradingCriterionRepository gradingCriterionRepository; + + @Autowired + protected TextUnitRepository textUnitRepository; + + @Autowired + protected AttachmentUnitRepository attachmentUnitRepository; + + @Autowired + protected ExerciseUnitRepository exerciseUnitRepository; + + @Autowired + protected SubmissionRepository submissionRepository; + + @Autowired + protected ProgrammingExerciseRepository programmingExerciseRepository; + + @Autowired + protected ProgrammingExerciseBuildConfigRepository programmingExerciseBuildConfigRepository; + + // Services + + @Autowired + protected CompetencyProgressService competencyProgressService; + + @Autowired + protected FeatureToggleService featureToggleService; + + // External Services + @Autowired + protected LectureUnitService lectureUnitService; + + @Autowired + protected ParticipationService participationService; + + // Util Services + @Autowired + protected CompetencyProgressUtilService competencyProgressUtilService; + + @Autowired + protected CompetencyUtilService competencyUtilService; + + @Autowired + protected PrerequisiteUtilService prerequisiteUtilService; + + @Autowired + protected StandardizedCompetencyUtilService standardizedCompetencyUtilService; + + @Autowired + protected LearningPathUtilService learningPathUtilService; + + // External Util Services + @Autowired + protected PageableSearchUtilService pageableSearchUtilService; + + @Autowired + protected TextExerciseUtilService textExerciseUtilService; + + @Autowired + protected LectureUtilService lectureUtilService; + + @Autowired + protected StudentScoreUtilService studentScoreUtilService; + + @Autowired + protected ParticipationUtilService participationUtilService; + + @Autowired + protected TeamUtilService teamUtilService; +} diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index 899bcaa60ec7..0655eb650915 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -13,12 +13,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.PrerequisiteUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.StandardizedCompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; @@ -26,9 +23,6 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; @@ -39,53 +33,10 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; -import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; -abstract class AbstractCompetencyPrerequisiteIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { - - @Autowired - protected LectureRepository lectureRepository; - - @Autowired - protected TextUnitRepository textUnitRepository; - - @Autowired - protected AttachmentUnitRepository attachmentUnitRepository; - - @Autowired - protected ExerciseUnitRepository exerciseUnitRepository; - - @Autowired - protected CompetencyRelationRepository competencyRelationRepository; - - @Autowired - protected PrerequisiteRepository prerequisiteRepository; - - @Autowired - protected LectureUnitRepository lectureUnitRepository; - - @Autowired - protected PrerequisiteUtilService prerequisiteUtilService; - - @Autowired - protected CompetencyProgressUtilService competencyProgressUtilService; - - @Autowired - protected LectureUtilService lectureUtilService; - - @Autowired - protected StandardizedCompetencyUtilService standardizedCompetencyUtilService; - - @Autowired - protected CourseCompetencyRepository courseCompetencyRepository; +abstract class AbstractCompetencyPrerequisiteIntegrationTest extends AbstractAtlasIntegrationTest { protected Course course; diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java index 2df138a71271..214b743f5367 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyJolIntegrationTest.java @@ -9,32 +9,19 @@ import org.junit.jupiter.api.BeforeEach; 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 de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyJolRepository; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class CompetencyJolIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "competencyjolintegrationtest"; - @Autowired - private CompetencyUtilService competencyUtilService; - - @Autowired - private CompetencyProgressUtilService competencyProgressUtilService; - - @Autowired - private CompetencyJolRepository competencyJOLRepository; - private final Competency[] competency = new Competency[3]; private CompetencyProgress competencyProgress; @@ -63,7 +50,7 @@ void setup() { @AfterEach void tearDown() { - competencyJOLRepository.deleteAll(); + competencyJolRepository.deleteAll(); } @Nested @@ -100,7 +87,7 @@ void shouldReturnForbiddenForStudentNotInCourse() throws Exception { void shouldCreateJOL() throws Exception { short jolValue = 3; sendRequest(competency[0].getId(), jolValue, HttpStatus.OK); - final var jol = competencyJOLRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); + final var jol = competencyJolRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); assertThat(jol).isPresent(); assertThat(jol.get().getValue()).isEqualTo(jolValue); assertThat(jol.get().getCompetencyConfidence()).isEqualTo(competencyProgress.getConfidence()); @@ -113,7 +100,7 @@ void shouldUpdateJOL() throws Exception { competencyUtilService.createJol(competency[0], student, (short) 123, ZonedDateTime.now().minusDays(1), 0.0, 0.0); short jolValue = 3; sendRequest(competency[0].getId(), jolValue, HttpStatus.OK); - final var jol = competencyJOLRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); + final var jol = competencyJolRepository.findLatestByCompetencyIdAndUserId(competency[0].getId(), student.getId()); assertThat(jol).isPresent(); assertThat(jol.get().getValue()).isEqualTo(jolValue); assertThat(jol.get().getCompetencyConfidence()).isEqualTo(competencyProgress.getConfidence()); diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java index 36c66c335239..d914ad61bf8e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java @@ -15,15 +15,11 @@ import org.junit.jupiter.api.BeforeEach; 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 de.tum.cit.aet.artemis.assessment.domain.Result; -import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.PrerequisiteUtilService; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; @@ -33,17 +29,10 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.user.util.UserUtilService; -import de.tum.cit.aet.artemis.core.util.CourseUtilService; -import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; @@ -52,100 +41,22 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; -import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.exercise.service.ParticipationService; -import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; -import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; -import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseFactory; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; -class CourseCompetencyIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { +class CourseCompetencyIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "coursecompetencyintegrationtest"; - @Autowired - private LectureRepository lectureRepository; - - @Autowired - private ExerciseRepository exerciseRepository; - - @Autowired - private TextUnitRepository textUnitRepository; - - @Autowired - private AttachmentUnitRepository attachmentUnitRepository; - - @Autowired - private ExerciseUnitRepository exerciseUnitRepository; - - @Autowired - private CompetencyRepository competencyRepository; - - @Autowired - private UserUtilService userUtilService; - - @Autowired - private CourseUtilService courseUtilService; - - @Autowired - private PrerequisiteRepository prerequisiteRepository; - - @Autowired - private CompetencyRelationRepository competencyRelationRepository; - - @Autowired - private CompetencyUtilService competencyUtilService; - - @Autowired - private PageableSearchUtilService pageableSearchUtilService; - - @Autowired - private SubmissionTestRepository submissionRepository; - - @Autowired - private ParticipationService participationService; - - @Autowired - private TeamUtilService teamUtilService; - - @Autowired - private ParticipationUtilService participationUtilService; - - @Autowired - private LectureUnitService lectureUnitService; - - @Autowired - private StudentScoreUtilService studentScoreUtilService; - - @Autowired - private CourseCompetencyRepository courseCompetencyRepository; - - @Autowired - private PrerequisiteUtilService prerequisiteUtilService; - - @Autowired - protected CompetencyProgressUtilService competencyProgressUtilService; - - @Autowired - protected LectureUtilService lectureUtilService; - private Course course; private Competency competency; diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java index 09c050bce269..48ba9e4a1d31 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/StandardizedCompetencyIntegrationTest.java @@ -12,11 +12,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.competency.util.StandardizedCompetencyUtilService; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; @@ -29,13 +29,8 @@ import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyResultDTO; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; -import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class StandardizedCompetencyIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class StandardizedCompetencyIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "stdcompetencyintegrationtest"; @@ -47,21 +42,6 @@ class StandardizedCompetencyIntegrationTest extends AbstractSpringIntegrationInd private Source source; - @Autowired - private KnowledgeAreaRepository knowledgeAreaRepository; - - @Autowired - private StandardizedCompetencyRepository standardizedCompetencyRepository; - - @Autowired - private SourceRepository sourceRepository; - - @Autowired - private StandardizedCompetencyUtilService standardizedCompetencyUtilService; - - @Autowired - private CompetencyRepository competencyRepository; - @BeforeEach void setupTestScenario() { userUtilService.addUsers(TEST_PREFIX, 1, 1, 1, 1); diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java index fb0bf6dcb286..033e3544778c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/LearningPathIntegrationTest.java @@ -19,14 +19,11 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; -import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; @@ -42,73 +39,20 @@ import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; -import de.tum.cit.aet.artemis.atlas.learningpath.util.LearningPathUtilService; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.atlas.test_repository.CompetencyProgressTestRepository; -import de.tum.cit.aet.artemis.atlas.test_repository.LearningPathTestRepository; import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; -import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; -class LearningPathIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class LearningPathIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "learningpathintegration"; - @Autowired - private CompetencyUtilService competencyUtilService; - - @Autowired - private PageableSearchUtilService pageableSearchUtilService; - - @Autowired - private LearningPathTestRepository learningPathRepository; - - @Autowired - private TextExerciseUtilService textExerciseUtilService; - - @Autowired - private LectureRepository lectureRepository; - - @Autowired - private LectureUtilService lectureUtilService; - - @Autowired - private GradingCriterionRepository gradingCriterionRepository; - - @Autowired - private LectureUnitService lectureUnitService; - - @Autowired - private CompetencyProgressService competencyProgressService; - - @Autowired - private LearningPathUtilService learningPathUtilService; - - @Autowired - private CompetencyProgressTestRepository competencyProgressRepository; - - @Autowired - private CompetencyRelationRepository competencyRelationRepository; - - @Autowired - private StudentScoreUtilService studentScoreUtilService; - - @Autowired - private LectureUnitRepository lectureUnitRepository; - private Course course; private Competency[] competencies; diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java index a4ac82d52470..2ab78b575e78 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceIntegrationTest.java @@ -6,25 +6,16 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.atlas.dto.ScienceEventDTO; -import de.tum.cit.aet.artemis.atlas.test_repository.ScienceEventTestRepository; import de.tum.cit.aet.artemis.core.service.feature.Feature; -import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class ScienceIntegrationTest extends AbstractSpringIntegrationIndependentTest { - - @Autowired - private ScienceEventTestRepository scienceEventRepository; - - @Autowired - private FeatureToggleService featureToggleService; +class ScienceIntegrationTest extends AbstractAtlasIntegrationTest { @BeforeEach void enableFeatureToggle() { diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java index c1657bd2a391..bf186724f0f3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/science/ScienceSettingsIntegrationTest.java @@ -7,22 +7,17 @@ import org.junit.jupiter.api.AfterEach; 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.WithMockUser; +import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; -import de.tum.cit.aet.artemis.atlas.repository.ScienceSettingRepository; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; -class ScienceSettingsIntegrationTest extends AbstractSpringIntegrationIndependentTest { +class ScienceSettingsIntegrationTest extends AbstractAtlasIntegrationTest { private static final String TEST_PREFIX = "sciencesettingsintegration"; - @Autowired - private ScienceSettingRepository scienceSettingRepository; - private ScienceSetting settingA; private ScienceSetting settingB;