Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
JohannesStoehr committed Oct 3, 2024
1 parent eeb9063 commit a29c52c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ void shouldImportAllExerciseAndLectureWithCompetency() throws Exception {
importAllCall(course2.getId(), importOptions, HttpStatus.CREATED);

course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId());
assertThat(course2.getExercises()).hasSize(3);
assertThat(course2.getExercises()).hasSize(2);
assertThat(course2.getLectures()).hasSize(1);
assertThat(course2.getLectures().stream().findFirst().get().getLectureUnits()).hasSize(2);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
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.CompetencyUtilService;
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;
Expand All @@ -32,19 +30,13 @@
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.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.Submission;
import de.tum.cit.aet.artemis.exercise.domain.SubmissionType;
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.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.service.LectureUnitService;
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;
Expand All @@ -55,30 +47,6 @@ class CourseCompetencyIntegrationTest extends AbstractCompetencyPrerequisiteInte

private static final String TEST_PREFIX = "coursecompetencyintegrationtest";

@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;

@BeforeEach
void setupTestScenario() {
super.setupTestScenario(TEST_PREFIX, course -> competencyUtilService.createCompetency(course, "penguin"));
Expand Down

0 comments on commit a29c52c

Please sign in to comment.