Enable all architecture tests

ls1intum · Sep 13, 2024 · 83ecf2d · 83ecf2d
1 parent 98f5e92
commit 83ecf2d
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 15 deletions.
diff --git a/.../AdminStandardizedCompetencyResource.java → .../AdminStandardizedCompetencyResource.java b/.../AdminStandardizedCompetencyResource.java → .../AdminStandardizedCompetencyResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.atlas.web;
+package de.tum.cit.aet.artemis.atlas.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/.../web/AdminSystemNotificationResource.java → ...dmin/AdminSystemNotificationResource.java b/.../web/AdminSystemNotificationResource.java → ...dmin/AdminSystemNotificationResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.communication.web;
+package de.tum.cit.aet.artemis.communication.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/...t/aet/artemis/core/web/AuditResource.java → ...artemis/core/web/admin/AuditResource.java b/...t/aet/artemis/core/web/AuditResource.java → ...artemis/core/web/admin/AuditResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.core.web;
+package de.tum.cit.aet.artemis.core.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 import static tech.jhipster.web.util.PaginationUtil.generatePaginationHttpHeaders;

diff --git a/...temis/core/web/FeatureToggleResource.java → ...core/web/admin/FeatureToggleResource.java b/...temis/core/web/FeatureToggleResource.java → ...core/web/admin/FeatureToggleResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.core.web;
+package de.tum.cit.aet.artemis.core.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/...cit/aet/artemis/core/web/LogResource.java → ...t/artemis/core/web/admin/LogResource.java b/...cit/aet/artemis/core/web/LogResource.java → ...t/artemis/core/web/admin/LogResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.core.web;
+package de.tum.cit.aet.artemis.core.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/...s/exercise/web/AdminExerciseResource.java → ...cise/web/admin/AdminExerciseResource.java b/...s/exercise/web/AdminExerciseResource.java → ...cise/web/admin/AdminExerciseResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.exercise.web;
+package de.tum.cit.aet.artemis.exercise.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java
@@ -24,7 +24,7 @@
 import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException;
 import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO;
 import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO;
-import de.tum.cit.aet.artemis.iris.web.PublicPyrisStatusUpdateResource;
+import de.tum.cit.aet.artemis.iris.web.open.PublicPyrisStatusUpdateResource;
 
 /**
  * This service connects to the Python implementation of Iris (called Pyris).

diff --git a/...s/iris/web/AdminIrisSettingsResource.java → .../web/admin/AdminIrisSettingsResource.java b/...s/iris/web/AdminIrisSettingsResource.java → .../web/admin/AdminIrisSettingsResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.iris.web;
+package de.tum.cit.aet.artemis.iris.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS;
 

diff --git a/.../web/PublicPyrisStatusUpdateResource.java → ...open/PublicPyrisStatusUpdateResource.java b/.../web/PublicPyrisStatusUpdateResource.java → ...open/PublicPyrisStatusUpdateResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.iris.web;
+package de.tum.cit.aet.artemis.iris.web.open;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS;
 

diff --git a/...ti/web/AdminLtiConfigurationResource.java → .../admin/AdminLtiConfigurationResource.java b/...ti/web/AdminLtiConfigurationResource.java → .../admin/AdminLtiConfigurationResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.lti.web;
+package de.tum.cit.aet.artemis.lti.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI;
 

diff --git a/...ng/web/AdminModelingExerciseResource.java → .../admin/AdminModelingExerciseResource.java b/...ng/web/AdminModelingExerciseResource.java → .../admin/AdminModelingExerciseResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.modeling.web;
+package de.tum.cit.aet.artemis.modeling.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/...web/AdminTextAssessmentEventResource.java → ...min/AdminTextAssessmentEventResource.java b/...web/AdminTextAssessmentEventResource.java → ...min/AdminTextAssessmentEventResource.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.text.web;
+package de.tum.cit.aet.artemis.text.web.admin;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 

diff --git a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java
@@ -4,7 +4,6 @@
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMethods;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RestController;
@@ -44,7 +43,6 @@ void testNoPreAuthorizeOnRestEndpoints() {
         rule.check(productionClasses);
     }
 
-    @Disabled // TODO: Enable this test once the restructuring is done
     @Test
     void testEnforceAdminAnnotations() {
         ArchRule rule = methods().that().areAnnotatedWith(EnforceAdmin.class).and().areNotAnnotatedWith(ManualConfig.class).should().beDeclaredInClassesThat()
@@ -80,7 +78,6 @@ void testEnforceAtLeastStudentAnnotations() {
         rule.check(productionClasses);
     }
 
-    @Disabled // TODO: Enable this test once the restructuring is done
     @Test
     void testEnforceNothingAnnotations() {
         ArchRule rule = methods().that().areAnnotatedWith(EnforceNothing.class).and().areNotAnnotatedWith(ManualConfig.class).should().beDeclaredInClassesThat()