Move architecture tests and object method tests into shared test package

ls1intum · Sep 13, 2024 · 8b43b93 · 8b43b93
1 parent 83ecf2d
commit 8b43b93
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
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.open.PublicPyrisStatusUpdateResource;
+import de.tum.cit.aet.artemis.iris.web.PublicPyrisStatusUpdateResource;
 
 /**
  * This service connects to the Python implementation of Iris (called Pyris).

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

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
@@ -10,14 +10,14 @@
 
 import com.tngtech.archunit.lang.ArchRule;
 
-import de.tum.cit.aet.artemis.architecture.AbstractArchitectureTest;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing;
 import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig;
+import de.tum.cit.aet.artemis.shared.architecture.AbstractArchitectureTest;
 
 class AuthorizationArchitectureTest extends AbstractArchitectureTest {
 

diff --git a/...a/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java b/...a/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java
@@ -18,8 +18,8 @@
 import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ConditionEvents;
 
-import de.tum.cit.aet.artemis.architecture.AbstractArchitectureTest;
 import de.tum.cit.aet.artemis.communication.domain.notification.NotificationPlaceholderCreator;
+import de.tum.cit.aet.artemis.shared.architecture.AbstractArchitectureTest;
 
 class NotificationPlaceholderArchitectureTest extends AbstractArchitectureTest {
 

diff --git a/.../aet/artemis/domain/ObjectMethodTest.java → .../aet/artemis/shared/ObjectMethodTest.java b/.../aet/artemis/domain/ObjectMethodTest.java → .../aet/artemis/shared/ObjectMethodTest.java
@@ -1,14 +1,14 @@
-package de.tum.cit.aet.artemis.domain;
-
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ALL_TESTS;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ENUM_TOSTRING_NAME_EQUALITY;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_EQUALS;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_GET_AND_SET;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_HASHCODE;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_RELATED_TESTS;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.INSTANCE_TESTS;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.isClassExcludedFrom;
-import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.isClassNotExcludedFrom;
+package de.tum.cit.aet.artemis.shared;
+
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.ALL_TESTS;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.ENUM_TOSTRING_NAME_EQUALITY;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.ID_EQUALS;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.ID_GET_AND_SET;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.ID_HASHCODE;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.ID_RELATED_TESTS;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.INSTANCE_TESTS;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.isClassExcludedFrom;
+import static de.tum.cit.aet.artemis.shared.ObjectMethodTestExclusions.isClassNotExcludedFrom;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.AssertionsForClassTypes.fail;

diff --git a/...is/domain/ObjectMethodTestExclusions.java → ...is/shared/ObjectMethodTestExclusions.java b/...is/domain/ObjectMethodTestExclusions.java → ...is/shared/ObjectMethodTestExclusions.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.domain;
+package de.tum.cit.aet.artemis.shared;
 
 import java.util.EnumSet;
 import java.util.List;

diff --git a/...rchitecture/AbstractArchitectureTest.java → ...rchitecture/AbstractArchitectureTest.java b/...rchitecture/AbstractArchitectureTest.java → ...rchitecture/AbstractArchitectureTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.architecture;
+package de.tum.cit.aet.artemis.shared.architecture;
 
 import static com.tngtech.archunit.base.DescribedPredicate.equalTo;
 import static com.tngtech.archunit.base.DescribedPredicate.not;

diff --git a/...rtemis/architecture/ArchitectureTest.java → ...shared/architecture/ArchitectureTest.java b/...rtemis/architecture/ArchitectureTest.java → ...shared/architecture/ArchitectureTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.architecture;
+package de.tum.cit.aet.artemis.shared.architecture;
 
 import static com.tngtech.archunit.base.DescribedPredicate.and;
 import static com.tngtech.archunit.base.DescribedPredicate.not;

diff --git a/...nforceRoleInResourceArchitectureTest.java → ...nforceRoleInResourceArchitectureTest.java b/...nforceRoleInResourceArchitectureTest.java → ...nforceRoleInResourceArchitectureTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.architecture;
+package de.tum.cit.aet.artemis.shared.architecture;
 
 import static com.tngtech.archunit.lang.SimpleConditionEvent.violated;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods;

diff --git a/...rchitecture/FeedbackArchitectureTest.java → ...rchitecture/FeedbackArchitectureTest.java b/...rchitecture/FeedbackArchitectureTest.java → ...rchitecture/FeedbackArchitectureTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.architecture;
+package de.tum.cit.aet.artemis.shared.architecture;
 
 import static com.tngtech.archunit.base.DescribedPredicate.not;
 import static com.tngtech.archunit.core.domain.JavaClass.Predicates.assignableFrom;

diff --git a/...hitecture/RepositoryArchitectureTest.java → ...hitecture/RepositoryArchitectureTest.java b/...hitecture/RepositoryArchitectureTest.java → ...hitecture/RepositoryArchitectureTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.architecture;
+package de.tum.cit.aet.artemis.shared.architecture;
 
 import static com.tngtech.archunit.base.DescribedPredicate.and;
 import static com.tngtech.archunit.core.domain.JavaClass.Predicates.INTERFACES;

diff --git a/...rchitecture/ResourceArchitectureTest.java → ...rchitecture/ResourceArchitectureTest.java b/...rchitecture/ResourceArchitectureTest.java → ...rchitecture/ResourceArchitectureTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.architecture;
+package de.tum.cit.aet.artemis.shared.architecture;
 
 import static com.tngtech.archunit.lang.ConditionEvent.createMessage;
 import static com.tngtech.archunit.lang.SimpleConditionEvent.violated;

diff --git a/...architecture/ServiceArchitectureTest.java → ...architecture/ServiceArchitectureTest.java b/...architecture/ServiceArchitectureTest.java → ...architecture/ServiceArchitectureTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.architecture;
+package de.tum.cit.aet.artemis.shared.architecture;
 
 import static com.tngtech.archunit.core.domain.JavaModifier.ABSTRACT;
 import static com.tngtech.archunit.core.domain.JavaModifier.FINAL;