From 8b43b93c7bb003fb6daf572cd19ee0415ecc9eb8 Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Fri, 13 Sep 2024 13:31:43 +0200 Subject: [PATCH] Move architecture tests and object method tests into shared test package --- .../service/pyris/PyrisConnectorService.java | 2 +- .../PublicPyrisStatusUpdateResource.java | 2 +- .../AuthorizationArchitectureTest.java | 2 +- ...tificationPlaceholderArchitectureTest.java | 2 +- .../{domain => shared}/ObjectMethodTest.java | 22 +++++++++---------- .../ObjectMethodTestExclusions.java | 2 +- .../AbstractArchitectureTest.java | 2 +- .../architecture/ArchitectureTest.java | 2 +- ...EnforceRoleInResourceArchitectureTest.java | 2 +- .../FeedbackArchitectureTest.java | 2 +- .../RepositoryArchitectureTest.java | 2 +- .../ResourceArchitectureTest.java | 2 +- .../architecture/ServiceArchitectureTest.java | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/iris/web/{open => }/PublicPyrisStatusUpdateResource.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{domain => shared}/ObjectMethodTest.java (94%) rename src/test/java/de/tum/cit/aet/artemis/{domain => shared}/ObjectMethodTestExclusions.java (98%) rename src/test/java/de/tum/cit/aet/artemis/{ => shared}/architecture/AbstractArchitectureTest.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{ => shared}/architecture/ArchitectureTest.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{ => shared}/architecture/EnforceRoleInResourceArchitectureTest.java (98%) rename src/test/java/de/tum/cit/aet/artemis/{ => shared}/architecture/FeedbackArchitectureTest.java (96%) rename src/test/java/de/tum/cit/aet/artemis/{ => shared}/architecture/RepositoryArchitectureTest.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{ => shared}/architecture/ResourceArchitectureTest.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{ => shared}/architecture/ServiceArchitectureTest.java (99%) 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 index 785fc59b9ed7..6d54a5592771 100644 --- 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/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java index 05fecc5a287e..117aa63c1202 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/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 index 56f00bf87486..655ecda79e5a 100644 --- 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,7 +10,6 @@ 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; @@ -18,6 +17,7 @@ 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/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java index 8454190ed5af..a947ea48abd9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java +++ b/src/test/java/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/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/ObjectMethodTest.java similarity index 94% rename from src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/ObjectMethodTest.java index e6077c2d3a5e..76fd85f6b79d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java +++ b/src/test/java/de/tum/cit/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/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java b/src/test/java/de/tum/cit/aet/artemis/shared/ObjectMethodTestExclusions.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java rename to src/test/java/de/tum/cit/aet/artemis/shared/ObjectMethodTestExclusions.java index 8a6db18d47f6..e504e068f0d6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java +++ b/src/test/java/de/tum/cit/aet/artemis/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/src/test/java/de/tum/cit/aet/artemis/architecture/AbstractArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractArchitectureTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/architecture/AbstractArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractArchitectureTest.java index 206384351d9c..17b0e435b831 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/AbstractArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/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/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ArchitectureTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/ArchitectureTest.java index 302e18788eec..f27d731a7a39 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/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/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/EnforceRoleInResourceArchitectureTest.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/EnforceRoleInResourceArchitectureTest.java index b2bee939a393..2a7424108144 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/EnforceRoleInResourceArchitectureTest.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/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/FeedbackArchitectureTest.java similarity index 96% rename from src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/FeedbackArchitectureTest.java index 9bd71d8ca7e8..7125cf2a2b5d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/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/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/RepositoryArchitectureTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/RepositoryArchitectureTest.java index 4da6ae949585..de9d446dac28 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/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/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ResourceArchitectureTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/ResourceArchitectureTest.java index 44d348678d91..a098dbde4535 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/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/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/ServiceArchitectureTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/shared/architecture/ServiceArchitectureTest.java index 80ebc5e038f3..6e4e23251625 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/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;