Restructure service tests into modules

ls1intum · Sep 13, 2024 · 51a468f · 51a468f
1 parent adfb778
commit 51a468f
Show file tree

Hide file tree

Showing 73 changed files with 73 additions and 73 deletions.
diff --git a/...service/ComplaintResponseServiceTest.java → ...service/ComplaintResponseServiceTest.java b/...service/ComplaintResponseServiceTest.java → ...service/ComplaintResponseServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.assessment.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

diff --git a/...ce/CourseScoreCalculationServiceTest.java → ...ce/CourseScoreCalculationServiceTest.java b/...ce/CourseScoreCalculationServiceTest.java → ...ce/CourseScoreCalculationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.assessment.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/.../artemis/service/FeedbackServiceTest.java → ...sessment/service/FeedbackServiceTest.java b/.../artemis/service/FeedbackServiceTest.java → ...sessment/service/FeedbackServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.assessment.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...emis/service/GradingScaleServiceTest.java → ...ment/service/GradingScaleServiceTest.java b/...emis/service/GradingScaleServiceTest.java → ...ment/service/GradingScaleServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.assessment.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...et/artemis/service/ResultServiceTest.java → ...assessment/service/ResultServiceTest.java b/...et/artemis/service/ResultServiceTest.java → ...assessment/service/ResultServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.assessment.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...ena/AthenaFeedbackSendingServiceTest.java → ...ors/AthenaFeedbackSendingServiceTest.java b/...ena/AthenaFeedbackSendingServiceTest.java → ...ors/AthenaFeedbackSendingServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.athena;
+package de.tum.cit.aet.artemis.athena.service.connectors;
 
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST;
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;

diff --git a/...AthenaFeedbackSuggestionsServiceTest.java → ...AthenaFeedbackSuggestionsServiceTest.java b/...AthenaFeedbackSuggestionsServiceTest.java → ...AthenaFeedbackSuggestionsServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.athena;
+package de.tum.cit.aet.artemis.athena.service.connectors;
 
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST;
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;

diff --git a/...ors/athena/AthenaHealthIndicatorTest.java → ...connectors/AthenaHealthIndicatorTest.java b/...ors/athena/AthenaHealthIndicatorTest.java → ...connectors/AthenaHealthIndicatorTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.athena;
+package de.tum.cit.aet.artemis.athena.service.connectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...na/AthenaRepositoryExportServiceTest.java → ...rs/AthenaRepositoryExportServiceTest.java b/...na/AthenaRepositoryExportServiceTest.java → ...rs/AthenaRepositoryExportServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.athena;
+package de.tum.cit.aet.artemis.athena.service.connectors;
 
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...AthenaSubmissionSelectionServiceTest.java → ...AthenaSubmissionSelectionServiceTest.java b/...AthenaSubmissionSelectionServiceTest.java → ...AthenaSubmissionSelectionServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.athena;
+package de.tum.cit.aet.artemis.athena.service.connectors;
 
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST;
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;

diff --git a/...a/AthenaSubmissionSendingServiceTest.java → ...s/AthenaSubmissionSendingServiceTest.java b/...a/AthenaSubmissionSendingServiceTest.java → ...s/AthenaSubmissionSendingServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.athena;
+package de.tum.cit.aet.artemis.athena.service.connectors;
 
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST;
 import static de.tum.cit.aet.artemis.core.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST;

diff --git a/...is/service/LearningObjectServiceTest.java → ...as/service/LearningObjectServiceTest.java b/...is/service/LearningObjectServiceTest.java → ...as/service/LearningObjectServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.atlas.service;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;

diff --git a/...emis/service/LearningPathServiceTest.java → ...tlas/service/LearningPathServiceTest.java b/...emis/service/LearningPathServiceTest.java → ...tlas/service/LearningPathServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.atlas.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...OnlineCourseConfigurationServiceTest.java → ...OnlineCourseConfigurationServiceTest.java b/...OnlineCourseConfigurationServiceTest.java → ...OnlineCourseConfigurationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.atlas.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/...ectors/lti/LtiDeepLinkingServiceTest.java → ...connectors/LtiDeepLinkingServiceTest.java b/...ectors/lti/LtiDeepLinkingServiceTest.java → ...connectors/LtiDeepLinkingServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.lti;
+package de.tum.cit.aet.artemis.atlas.service.connectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...i/buildagent/TestResultXmlParserTest.java → ...tors/localci/TestResultXmlParserTest.java b/...i/buildagent/TestResultXmlParserTest.java → ...tors/localci/TestResultXmlParserTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.connectors.localci.buildagent;
+package de.tum.cit.aet.artemis.buildagent.service.connectors.localci;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/.../ConversationNotificationServiceTest.java → .../ConversationNotificationServiceTest.java b/.../ConversationNotificationServiceTest.java → .../ConversationNotificationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.notifications;
+package de.tum.cit.aet.artemis.communication.notifications.service;
 
 import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...eneralInstantNotificationServiceTest.java → ...eneralInstantNotificationServiceTest.java b/...eneralInstantNotificationServiceTest.java → ...eneralInstantNotificationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.notifications;
+package de.tum.cit.aet.artemis.communication.notifications.service;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.never;

diff --git a/...ervice/notifications/MailServiceTest.java → ...otifications/service/MailServiceTest.java b/...ervice/notifications/MailServiceTest.java → ...otifications/service/MailServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.notifications;
+package de.tum.cit.aet.artemis.communication.notifications.service;
 
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.mockito.Mockito.any;

diff --git a/...TutorialGroupNotificationServiceTest.java → ...TutorialGroupNotificationServiceTest.java b/...TutorialGroupNotificationServiceTest.java → ...TutorialGroupNotificationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.notifications;
+package de.tum.cit.aet.artemis.communication.notifications.service;
 
 import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE;
 import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE;

diff --git a/...eFirebasePushNotificationServiceTest.java → ...eFirebasePushNotificationServiceTest.java b/...eFirebasePushNotificationServiceTest.java → ...eFirebasePushNotificationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.notifications.push_notifications;
+package de.tum.cit.aet.artemis.communication.notifications.service.push_notifications;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;

diff --git a/...emis/service/EmailSummaryServiceTest.java → ...tion/service/EmailSummaryServiceTest.java b/...emis/service/EmailSummaryServiceTest.java → ...tion/service/EmailSummaryServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.communication.service;
 
 import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...eviceConfigurationCleanupServiceTest.java → ...eviceConfigurationCleanupServiceTest.java b/...eviceConfigurationCleanupServiceTest.java → ...eviceConfigurationCleanupServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.scheduled;
+package de.tum.cit.aet.artemis.communication.service;
 
 import static org.springframework.test.util.AssertionErrors.assertEquals;
 

diff --git a/...eeklyEmailSummaryScheduleServiceTest.java → ...eeklyEmailSummaryScheduleServiceTest.java b/...eeklyEmailSummaryScheduleServiceTest.java → ...eeklyEmailSummaryScheduleServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.communication.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.any;

diff --git a/...rtemis/service/AssessmentServiceTest.java → ...s/core/service/AssessmentServiceTest.java b/...rtemis/service/AssessmentServiceTest.java → ...s/core/service/AssessmentServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...ervice/AuthorizationCheckServiceTest.java → ...ervice/AuthorizationCheckServiceTest.java b/...ervice/AuthorizationCheckServiceTest.java → ...ervice/AuthorizationCheckServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;

diff --git a/.../service/ConductAgreementServiceTest.java → .../service/ConductAgreementServiceTest.java b/.../service/ConductAgreementServiceTest.java → .../service/ConductAgreementServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...e/export/CourseExamExportServiceTest.java → .../service/CourseExamExportServiceTest.java b/...e/export/CourseExamExportServiceTest.java → .../service/CourseExamExportServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.export;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;

diff --git a/...et/artemis/service/CourseServiceTest.java → ...temis/core/service/CourseServiceTest.java b/...et/artemis/service/CourseServiceTest.java → ...temis/core/service/CourseServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;

diff --git a/...ervice/DataExportCreationServiceTest.java → ...ervice/DataExportCreationServiceTest.java b/...ervice/DataExportCreationServiceTest.java → ...ervice/DataExportCreationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

diff --git a/...eduled/DataExportScheduleServiceTest.java → ...ervice/DataExportScheduleServiceTest.java b/...eduled/DataExportScheduleServiceTest.java → ...ervice/DataExportScheduleServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.scheduled;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.any;

diff --git a/...mis/service/FeatureToggleServiceTest.java → ...ore/service/FeatureToggleServiceTest.java b/...mis/service/FeatureToggleServiceTest.java → ...ore/service/FeatureToggleServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/.../artemis/service/FilePathServiceTest.java → ...mis/core/service/FilePathServiceTest.java b/.../artemis/service/FilePathServiceTest.java → ...mis/core/service/FilePathServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/.../aet/artemis/service/FileServiceTest.java → ...artemis/core/service/FileServiceTest.java b/.../aet/artemis/service/FileServiceTest.java → ...artemis/core/service/FileServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...is/service/ResourceLoaderServiceTest.java → ...re/service/ResourceLoaderServiceTest.java b/...is/service/ResourceLoaderServiceTest.java → ...re/service/ResourceLoaderServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

diff --git a/...artemis/service/TelemetryServiceTest.java → ...is/core/service/TelemetryServiceTest.java b/...artemis/service/TelemetryServiceTest.java → ...is/core/service/TelemetryServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.mockito.Mockito.spy;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;

diff --git a/...ervice/TitleCacheEvictionServiceTest.java → ...ervice/TitleCacheEvictionServiceTest.java b/...ervice/TitleCacheEvictionServiceTest.java → ...ervice/TitleCacheEvictionServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...t/aet/artemis/service/UriServiceTest.java → .../artemis/core/service/UriServiceTest.java b/...t/aet/artemis/service/UriServiceTest.java → .../artemis/core/service/UriServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...t/artemis/service/ZipFileServiceTest.java → ...emis/core/service/ZipFileServiceTest.java b/...t/artemis/service/ZipFileServiceTest.java → ...emis/core/service/ZipFileServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.core.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;

diff --git a/...is/service/util/HttpRequestUtilsTest.java → ...re/service/util/HttpRequestUtilsTest.java b/...is/service/util/HttpRequestUtilsTest.java → ...re/service/util/HttpRequestUtilsTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.util;
+package de.tum.cit.aet.artemis.core.service.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.anyString;

diff --git a/...et/artemis/service/util/TimeUtilTest.java → ...temis/core/service/util/TimeUtilTest.java b/...et/artemis/service/util/TimeUtilTest.java → ...temis/core/service/util/TimeUtilTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.util;
+package de.tum.cit.aet.artemis.core.service.util;
 
 import static de.tum.cit.aet.artemis.core.util.TimeUtil.toRelativeTime;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...s/service/exam/ExamAccessServiceTest.java → ...s/exam/service/ExamAccessServiceTest.java b/...s/service/exam/ExamAccessServiceTest.java → ...s/exam/service/ExamAccessServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.exam;
+package de.tum.cit.aet.artemis.exam.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/...mis/service/exam/ExamQuizServiceTest.java → ...mis/exam/service/ExamQuizServiceTest.java b/...mis/service/exam/ExamQuizServiceTest.java → ...mis/exam/service/ExamQuizServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.exam;
+package de.tum.cit.aet.artemis.exam.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;

diff --git a/...artemis/service/exam/ExamServiceTest.java → ...artemis/exam/service/ExamServiceTest.java b/...artemis/service/exam/ExamServiceTest.java → ...artemis/exam/service/ExamServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.exam;
+package de.tum.cit.aet.artemis.exam.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...rvice/exam/ExamSubmissionServiceTest.java → ...am/service/ExamSubmissionServiceTest.java b/...rvice/exam/ExamSubmissionServiceTest.java → ...am/service/ExamSubmissionServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.exam;
+package de.tum.cit.aet.artemis.exam.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...ce/exam/StudentExamAccessServiceTest.java → ...service/StudentExamAccessServiceTest.java b/...ce/exam/StudentExamAccessServiceTest.java → ...service/StudentExamAccessServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service.exam;
+package de.tum.cit.aet.artemis.exam.service;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatNoException;

diff --git a/...emis/service/ExerciseDateServiceTest.java → ...cise/service/ExerciseDateServiceTest.java b/...emis/service/ExerciseDateServiceTest.java → ...cise/service/ExerciseDateServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static de.tum.cit.aet.artemis.core.util.TestResourceUtils.HalfSecond;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...service/ExerciseLifecycleServiceTest.java → ...service/ExerciseLifecycleServiceTest.java b/...service/ExerciseLifecycleServiceTest.java → ...service/ExerciseLifecycleServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;

diff --git a/...ipationAuthorizationCheckServiceTest.java → ...ipationAuthorizationCheckServiceTest.java b/...ipationAuthorizationCheckServiceTest.java → ...ipationAuthorizationCheckServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;

diff --git a/...ce/ParticipationLifecycleServiceTest.java → ...ce/ParticipationLifecycleServiceTest.java b/...ce/ParticipationLifecycleServiceTest.java → ...ce/ParticipationLifecycleServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...mis/service/ParticipationServiceTest.java → ...ise/service/ParticipationServiceTest.java b/...mis/service/ParticipationServiceTest.java → ...ise/service/ParticipationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...articipationTeamWebsocketServiceTest.java → ...articipationTeamWebsocketServiceTest.java b/...articipationTeamWebsocketServiceTest.java → ...articipationTeamWebsocketServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.RETURNS_MOCKS;

diff --git a/...entationPointsCalculationServiceTest.java → ...entationPointsCalculationServiceTest.java b/...entationPointsCalculationServiceTest.java → ...entationPointsCalculationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...rtemis/service/SubmissionServiceTest.java → ...ercise/service/SubmissionServiceTest.java b/...rtemis/service/SubmissionServiceTest.java → ...ercise/service/SubmissionServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...mis/service/TeamWebsocketServiceTest.java → ...ise/service/TeamWebsocketServiceTest.java b/...mis/service/TeamWebsocketServiceTest.java → ...ise/service/TeamWebsocketServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.exercise.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.timeout;

diff --git a/...mis/service/LectureImportServiceTest.java → ...ure/service/LectureImportServiceTest.java b/...mis/service/LectureImportServiceTest.java → ...ure/service/LectureImportServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.lecture.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...t/artemis/service/LectureServiceTest.java → ...s/lecture/service/LectureServiceTest.java b/...t/artemis/service/LectureServiceTest.java → ...s/lecture/service/LectureServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.lecture.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...java/de/tum/cit/aet/artemis/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java b/...java/de/tum/cit/aet/artemis/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java
@@ -6,7 +6,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.test.context.support.WithMockUser;
 
-import de.tum.cit.aet.artemis.service.ConsistencyCheckTestService;
+import de.tum.cit.aet.artemis.programming.service.ConsistencyCheckTestService;
 import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationJenkinsGitlabTest;
 
 class ConsistencyCheckGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest {

diff --git a/...mis/service/BuildLogEntryServiceTest.java → ...ing/service/BuildLogEntryServiceTest.java b/...mis/service/BuildLogEntryServiceTest.java → ...ing/service/BuildLogEntryServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/.../service/ConsistencyCheckTestService.java → .../service/ConsistencyCheckTestService.java b/.../service/ConsistencyCheckTestService.java → .../service/ConsistencyCheckTestService.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/.../artemis/service/GitlabCIServiceTest.java → ...gramming/service/GitlabCIServiceTest.java b/.../artemis/service/GitlabCIServiceTest.java → ...gramming/service/GitlabCIServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/.../JenkinsAuthorizationInterceptorTest.java → .../JenkinsAuthorizationInterceptorTest.java b/.../JenkinsAuthorizationInterceptorTest.java → .../JenkinsAuthorizationInterceptorTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;

diff --git a/...ervice/JenkinsInternalUriServiceTest.java → ...ervice/JenkinsInternalUriServiceTest.java b/...ervice/JenkinsInternalUriServiceTest.java → ...ervice/JenkinsInternalUriServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.any;

diff --git a/...vice/JenkinsJobPermissionServiceTest.java → ...vice/JenkinsJobPermissionServiceTest.java b/...vice/JenkinsJobPermissionServiceTest.java → ...vice/JenkinsJobPermissionServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static org.assertj.core.api.Assertions.assertThatIOException;
 import static org.mockito.ArgumentMatchers.any;

diff --git a/...rtemis/service/JenkinsJobServiceTest.java → ...amming/service/JenkinsJobServiceTest.java b/...rtemis/service/JenkinsJobServiceTest.java → ...amming/service/JenkinsJobServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...t/artemis/service/JenkinsServiceTest.java → ...ogramming/service/JenkinsServiceTest.java b/...t/artemis/service/JenkinsServiceTest.java → ...ogramming/service/JenkinsServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.service;
+package de.tum.cit.aet.artemis.programming.service;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME;
 import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION;