build.gradle

@@ -69,13 +69,13 @@ dependencies {
     implementation 'org.modelmapper:modelmapper:3.2.0'
     implementation 'org.iban4j:iban4j:3.2.7-RELEASE'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0'
-    implementation 'org.reflections:reflections:0.9.12'
 
     compileOnly 'org.projectlombok:lombok'
     testCompileOnly 'org.projectlombok:lombok'
 
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
 
+
     annotationProcessor 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
 

src/main/java/net/hostsharing/hsadminng/errors/ReferenceNotFoundException.java

@@ -1,12 +1,14 @@
 package net.hostsharing.hsadminng.errors;
 
+import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
+
 import java.util.UUID;
 
 public class ReferenceNotFoundException extends RuntimeException {
 
     private final Class<?> entityClass;
     private final UUID uuid;
-    public <E> ReferenceNotFoundException(final Class<E> entityClass, final UUID uuid, final Throwable exc) {
+    public <E extends RbacObject> ReferenceNotFoundException(final Class<E> entityClass, final UUID uuid, final Throwable exc) {
         super(exc);
         this.entityClass = entityClass;
         this.uuid = uuid;

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacView.java

@@ -2,11 +2,22 @@ package net.hostsharing.hsadminng.rbac.rbacdef;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
+import net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionEntity;
+import net.hostsharing.hsadminng.hs.office.coopshares.HsOfficeCoopSharesTransactionEntity;
+import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
+import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
+import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerDetailsEntity;
+import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
+import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
+import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
+import net.hostsharing.hsadminng.hs.office.sepamandate.HsOfficeSepaMandateEntity;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
-import org.reflections.Reflections;
+import net.hostsharing.hsadminng.test.cust.TestCustomerEntity;
-import org.reflections.scanners.TypeAnnotationsScanner;
+import net.hostsharing.hsadminng.test.dom.TestDomainEntity;
+import net.hostsharing.hsadminng.test.pac.TestPackageEntity;
 
-import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import jakarta.persistence.Version;
 import jakarta.validation.constraints.NotNull;
@@ -16,6 +27,7 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static java.lang.reflect.Modifier.isStatic;
 import static java.util.Arrays.stream;
@@ -1175,24 +1187,25 @@ public class RbacView {
         }
     }
 
-    public static Set<Class<? extends RbacObject>> findRbacEntityClasses(String packageName) {
-        final var reflections = new Reflections(packageName, TypeAnnotationsScanner.class);
-        return reflections.getTypesAnnotatedWith(Entity.class).stream()
-                .filter(c -> stream(c.getInterfaces()).anyMatch(i -> i==RbacObject.class))
-                .map(RbacView::castToSubclassOfRbacObject)
-                .collect(Collectors.toSet());
-    }
-
-    @SuppressWarnings("unchecked")
-    private static Class<? extends RbacObject> castToSubclassOfRbacObject(final Class<?> clazz) {
-        return (Class<? extends RbacObject>) clazz;
-    }
-
     /**
      * This main method generates the RbacViews (PostgreSQL+diagram) for all given entity classes.
      */
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
-        findRbacEntityClasses("net.hostsharing.hsadminng")
+        Stream.of(
-                .forEach(RbacView::generateRbacView);
+                TestCustomerEntity.class,
+                TestPackageEntity.class,
+                TestDomainEntity.class,
+                HsOfficePersonEntity.class,
+                HsOfficePartnerEntity.class,
+                HsOfficePartnerDetailsEntity.class,
+                HsOfficeBankAccountEntity.class,
+                HsOfficeDebitorEntity.class,
+                HsOfficeRelationEntity.class,
+                HsOfficeCoopAssetsTransactionEntity.class,
+                HsOfficeContactEntity.class,
+                HsOfficeSepaMandateEntity.class,
+                HsOfficeCoopSharesTransactionEntity.class,
+                HsOfficeMembershipEntity.class
+        ).forEach(RbacView::generateRbacView);
     }
 }

src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerController.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.cust;
+package net.hostsharing.hsadminng.test.cust;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.mapper.Mapper;

src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntity.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.cust;
+package net.hostsharing.hsadminng.test.cust;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerRepository.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.cust;
+package net.hostsharing.hsadminng.test.cust;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

src/main/java/net/hostsharing/hsadminng/test/dom/TestDomainEntity.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.dom;
+package net.hostsharing.hsadminng.test.dom;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -7,7 +7,7 @@ import lombok.Setter;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
-import net.hostsharing.hsadminng.rbac.test.pac.TestPackageEntity;
+import net.hostsharing.hsadminng.test.pac.TestPackageEntity;
 
 import jakarta.persistence.*;
 import java.io.IOException;

src/main/java/net/hostsharing/hsadminng/test/pac/TestPackageController.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.pac;
+package net.hostsharing.hsadminng.test.pac;
 
 import net.hostsharing.hsadminng.mapper.Mapper;
 import net.hostsharing.hsadminng.mapper.OptionalFromJson;

src/main/java/net/hostsharing/hsadminng/test/pac/TestPackageEntity.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.pac;
+package net.hostsharing.hsadminng.test.pac;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -7,7 +7,7 @@ import lombok.Setter;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
-import net.hostsharing.hsadminng.rbac.test.cust.TestCustomerEntity;
+import net.hostsharing.hsadminng.test.cust.TestCustomerEntity;
 
 import jakarta.persistence.*;
 import java.io.IOException;

src/main/java/net/hostsharing/hsadminng/test/pac/TestPackageRepository.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.pac;
+package net.hostsharing.hsadminng.test.pac;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java

@@ -1,24 +1,17 @@
 package net.hostsharing.hsadminng.arch;
 
-import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
-import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
-import com.tngtech.archunit.lang.ConditionEvents;
-import com.tngtech.archunit.lang.SimpleConditionEvent;
 import net.hostsharing.hsadminng.HsadminNgApplication;
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.test.Accepts;
-import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
+import org.junit.jupiter.api.Test;
-import org.springframework.data.repository.Repository;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.web.bind.annotation.RestController;
 
-import jakarta.persistence.Table;
-
 import static com.tngtech.archunit.core.domain.JavaModifier.ABSTRACT;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*;
 import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices;
-import static java.lang.String.format;
 
 @AnalyzeClasses(packages = ArchitectureTest.NET_HOSTSHARING_HSADMINNG)
 public class ArchitectureTest {
@@ -239,6 +232,20 @@ public class ArchitectureTest {
             .should().onlyBeAccessed().byClassesThat()
             .resideInAnyPackage("..hs.office.migration..");
 
+    @ArchTest
+    @SuppressWarnings("unused")
+    public static final ArchRule acceptsAnnotationOnMethodsRule = methods()
+            .that().areAnnotatedWith(Accepts.class)
+            .should().beDeclaredInClassesThat().haveSimpleNameEndingWith("AcceptanceTest")
+            .orShould().beDeclaredInClassesThat().haveSimpleNameNotContaining("AcceptanceTest$");
+
+    @ArchTest
+    @SuppressWarnings("unused")
+    public static final ArchRule acceptsAnnotationOnClasesRule = classes()
+            .that().areAnnotatedWith(Accepts.class)
+            .should().haveSimpleNameEndingWith("AcceptanceTest")
+            .orShould().haveSimpleNameNotContaining("AcceptanceTest$");
+
     @ArchTest
     @SuppressWarnings("unused")
     public static final ArchRule doNotUseJakartaTransactionAnnotationAtClassLevel = noClasses()
@@ -263,51 +270,18 @@ public class ArchitectureTest {
                     org.junit.jupiter.api.Test.class.getName(),
                     org.junit.Test.class.getName()));
 
-    @ArchTest
+    @Test
-    @SuppressWarnings("unused")
+    public void everythingShouldBeFreeOfCycles() {
-    static final ArchRule everythingShouldBeFreeOfCycles =
+        slices().matching("net.hostsharing.hsadminng.(*)..").should().beFreeOfCycles();
-        slices().matching("net.hostsharing.hsadminng.(*)..")
+    }
-                .should().beFreeOfCycles()
-                .ignoreDependency(
-                        ContextBasedTest.class,
-                        net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantsDiagramService.class);
 
-
+    @Test
-    @ArchTest
+    public void restControllerNaming() {
-    @SuppressWarnings("unused")
-    static final ArchRule restControllerNaming =
         classes().that().areAnnotatedWith(RestController.class).should().haveSimpleNameEndingWith("Controller");
+    }
 
-    @ArchTest
+    @Test
-    @SuppressWarnings("unused")
+    public void repositoryNaming() {
-    static final ArchRule repositoryNaming =
+        classes().that().implement(JpaRepository.class).should().haveSimpleNameEndingWith("Repository");
-        classes().that().areAssignableTo(Repository.class).should().haveSimpleNameEndingWith("Repository");
-
-    @ArchTest
-    @SuppressWarnings("unused")
-    static final ArchRule tableNamesOfRbacEntitiesShouldEndWith_rv =
-        classes()
-                .that().areAnnotatedWith(Table.class)
-                .and().areAssignableTo(RbacObject.class)
-                .should(haveTableNameEndingWith_rv())
-                .because("it's required that the table names of RBAC entities end with '_rv'");
-
-    static ArchCondition<JavaClass> haveTableNameEndingWith_rv() {
-        return new ArchCondition<>("RBAC table name end with _rv") {
-
-            @Override
-            public void check(JavaClass javaClass, ConditionEvents events) {
-                final var table = javaClass.getAnnotationOfType(Table.class);
-                if (table == null) {
-                    events.add(SimpleConditionEvent.violated(javaClass,
-                            format("@Table annotation missing for RBAC entity %s",
-                                javaClass.getName(), table.name())));
-                } else if (!table.name().endsWith("_rv")) {
-                    events.add(SimpleConditionEvent.violated(javaClass,
-                            format("Table name of %s does not end with '_rv' for RBAC entity %s",
-                                javaClass.getName(), table.name())));
-                }
-            }
-        };
     }
 }

src/test/java/net/hostsharing/hsadminng/context/ContextBasedTest.java

@@ -1,6 +1,5 @@
-package net.hostsharing.hsadminng.rbac.context;
+package net.hostsharing.hsadminng.context;
 
-import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantsDiagramService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;

src/test/java/net/hostsharing/hsadminng/context/ContextIntegrationTests.java

@@ -1,9 +1,7 @@
-package net.hostsharing.hsadminng.rbac.context;
+package net.hostsharing.hsadminng.context;
 
-import net.hostsharing.hsadminng.context.Context;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.mapper.Mapper;
+import net.hostsharing.test.JpaAttempt;
-import net.hostsharing.hsadminng.rbac.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
@@ -17,7 +15,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest
-@ComponentScan(basePackageClasses = { Context.class, JpaAttempt.class, Mapper.class })
+@ComponentScan(basePackageClasses = { Context.class, JpaAttempt.class })
 @DirtiesContext
 class ContextIntegrationTests {
 
@@ -25,7 +23,6 @@ class ContextIntegrationTests {
     private Context context;
 
     @MockBean
-    @SuppressWarnings("unused") // the bean must be present, even though it's not used directly
     private HttpServletRequest request;
 
     @Autowired

src/test/java/net/hostsharing/hsadminng/context/ContextUnitTest.java

@@ -1,6 +1,5 @@
-package net.hostsharing.hsadminng.rbac.context;
+package net.hostsharing.hsadminng.context;
 
-import net.hostsharing.hsadminng.context.Context;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;

src/test/java/net/hostsharing/hsadminng/context/HttpServletRequestBodyCacheUnitTest.java

@@ -1,6 +1,5 @@
-package net.hostsharing.hsadminng.rbac.context;
+package net.hostsharing.hsadminng.context;
 
-import net.hostsharing.hsadminng.context.HttpServletRequestBodyCache;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountControllerAcceptanceTest.java

@@ -4,8 +4,9 @@ import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.json.JSONException;
 import org.junit.jupiter.api.*;
@@ -18,8 +19,8 @@ import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
@@ -47,6 +48,7 @@ class HsOfficeBankAccountControllerAcceptanceTest extends ContextBasedTestWithCl
     EntityManager em;
 
     @Nested
+    @Accepts({ "bankaccount:F(Find)" })
     class ListBankAccounts {
 
         @Test
@@ -111,6 +113,7 @@ class HsOfficeBankAccountControllerAcceptanceTest extends ContextBasedTestWithCl
     }
 
     @Nested
+    @Accepts({ "bankaccount:C(Create)" })
     class CreateBankAccount {
 
         @Test
@@ -150,6 +153,7 @@ class HsOfficeBankAccountControllerAcceptanceTest extends ContextBasedTestWithCl
     }
 
     @Nested
+    @Accepts({ "bankaccount:R(Read)" })
     class GetBankAccount {
 
         @Test
@@ -174,6 +178,7 @@ class HsOfficeBankAccountControllerAcceptanceTest extends ContextBasedTestWithCl
         }
 
         @Test
+        @Accepts({ "bankaccount:X(Access Control)" })
         void normalUser_canNotGetUnrelatedBankAccount() {
             context.define("superuser-alex@hostsharing.net");
             final var givenBankAccountUuid = bankAccountRepo.findByOptionalHolderLike("first").get(0).getUuid();
@@ -253,6 +258,7 @@ class HsOfficeBankAccountControllerAcceptanceTest extends ContextBasedTestWithCl
     }
 
     @Nested
+    @Accepts({ "bankaccount:D(Delete)" })
     class DeleteBankAccount {
 
         @Test
@@ -274,6 +280,7 @@ class HsOfficeBankAccountControllerAcceptanceTest extends ContextBasedTestWithCl
         }
 
         @Test
+        @Accepts({ "bankaccount:X(Access Control)" })
         void bankaccountOwner_canDeleteRelatedBankAaccount() {
             final var givenBankAccount = givenSomeTemporaryBankAccountCreatedBy("selfregistered-test-user@hostsharing.org");
 
@@ -291,6 +298,7 @@ class HsOfficeBankAccountControllerAcceptanceTest extends ContextBasedTestWithCl
         }
 
         @Test
+        @Accepts({ "bankaccount:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedBankAccount() {
             context.define("superuser-alex@hostsharing.net");
             final var givenBankAccount = givenSomeTemporaryBankAccountCreatedBy("selfregistered-test-user@hostsharing.org");

src/test/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepositoryIntegrationTest.java

@@ -1,11 +1,11 @@
 package net.hostsharing.hsadminng.hs.office.bankaccount;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
 import static net.hostsharing.hsadminng.hs.office.bankaccount.TestHsOfficeBankAccount.hsOfficeBankAccount;
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactControllerAcceptanceTest.java

@@ -4,8 +4,9 @@ import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.json.JSONException;
 import org.junit.jupiter.api.AfterEach;
@@ -21,8 +22,8 @@ import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
@@ -53,6 +54,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
     EntityManager em;
 
     @Nested
+    @Accepts({ "Contact:F(Find)" })
     class ListContacts {
 
         @Test
@@ -89,6 +91,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Contact:C(Create)" })
     class AddContact {
 
         @Test
@@ -126,6 +129,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Contact:R(Read)" })
     class GetContact {
 
         @Test
@@ -150,6 +154,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Contact:X(Access Control)" })
         void normalUser_canNotGetUnrelatedContact() {
             context.define("superuser-alex@hostsharing.net");
             final var givenContactUuid = contactRepo.findContactByOptionalLabelLike("first").get(0).getUuid();
@@ -165,6 +170,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Contact:X(Access Control)" })
         void contactAdminUser_canGetRelatedContact() {
             context.define("superuser-alex@hostsharing.net");
             final var givenContactUuid = contactRepo.findContactByOptionalLabelLike("first").get(0).getUuid();
@@ -189,6 +195,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Contact:U(Update)" })
     class PatchContact {
 
         @Test
@@ -277,6 +284,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Contact:D(Delete)" })
     class DeleteContact {
 
         @Test
@@ -298,6 +306,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Contact:X(Access Control)" })
         void contactOwner_canDeleteRelatedContact() {
             final var givenContact = givenSomeTemporaryContactCreatedBy("selfregistered-test-user@hostsharing.org");
 
@@ -315,6 +324,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Contact:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedContact() {
             context.define("superuser-alex@hostsharing.net");
             final var givenContact = givenSomeTemporaryContactCreatedBy("selfregistered-test-user@hostsharing.org");

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntityPatcherUnitTest.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.contact;
 
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeContactPatchResource;
 import org.junit.jupiter.api.TestInstance;
 

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRepositoryIntegrationTest.java

@@ -1,11 +1,11 @@
 package net.hostsharing.hsadminng.hs.office.contact;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
 import static net.hostsharing.hsadminng.hs.office.contact.TestHsOfficeContact.hsOfficeContact;
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java

@@ -5,8 +5,9 @@ import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -23,8 +24,8 @@ import java.time.LocalDate;
 import java.util.UUID;
 
 import static net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionType.DEPOSIT;
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.startsWith;
@@ -55,6 +56,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
     EntityManager em;
 
     @Nested
+    @Accepts({ "CoopAssetsTransaction:F(Find)" })
     class ListCoopAssetsTransactions {
 
         @Test
@@ -152,6 +154,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
     }
 
     @Nested
+    @Accepts({ "CoopAssetsTransaction:C(Create)" })
     class AddCoopAssetsTransaction {
 
         @Test
@@ -215,7 +218,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                                 .reference("test ref")
                         .build());
                     }).assertSuccessful().assertNotNull().returnedValue();
-            toCleanup(HsOfficeCoopAssetsTransactionEntity.class, givenTransaction.getUuid());
+            toCleanup(HsOfficeCoopAssetsTransactionRawEntity.class, givenTransaction.getUuid());
 
             final var location = RestAssured // @formatter:off
                     .given()
@@ -264,7 +267,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
             final var newAssetTxUuid = UUID.fromString(
                     location.substring(location.lastIndexOf('/') + 1));
             assertThat(newAssetTxUuid).isNotNull();
-            toCleanup(HsOfficeCoopAssetsTransactionEntity.class, newAssetTxUuid);
+            toCleanup(HsOfficeCoopAssetsTransactionRawEntity.class, newAssetTxUuid);
         }
 
         @Test
@@ -304,6 +307,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
     }
 
     @Nested
+    @Accepts({ "CoopAssetTransaction:R(Read)" })
     class GetCoopAssetTransaction {
 
         @Test
@@ -330,6 +334,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
         }
 
         @Test
+        @Accepts({ "CoopAssetTransaction:X(Access Control)" })
         void normalUser_canNotGetUnrelatedCoopAssetTransaction() {
             context.define("superuser-alex@hostsharing.net");
             final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(
@@ -347,6 +352,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
         }
 
         @Test
+        @Accepts({ "CoopAssetTransaction:X(Access Control)" })
         void partnerPersonUser_canGetRelatedCoopAssetTransaction() {
             context.define("superuser-alex@hostsharing.net");
             final var givenCoopAssetTransactionUuid = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerRestTest.java

@@ -2,7 +2,7 @@ package net.hostsharing.hsadminng.hs.office.coopassets;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.mapper.Mapper;
-import net.hostsharing.hsadminng.rbac.test.JsonBuilder;
+import net.hostsharing.test.JsonBuilder;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import java.util.UUID;
 import java.util.function.Function;
 
-import static net.hostsharing.hsadminng.rbac.test.JsonBuilder.jsonObject;
+import static net.hostsharing.test.JsonBuilder.jsonObject;
 import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRawEntity.java

@@ -0,0 +1,18 @@
+
+package net.hostsharing.hsadminng.hs.office.coopassets;
+
+import lombok.NoArgsConstructor;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.util.UUID;
+
+@Entity
+@Table(name = "hs_office_coopassetstransaction")
+@NoArgsConstructor
+public class HsOfficeCoopAssetsTransactionRawEntity {
+
+    @Id
+    private UUID uuid;
+}

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java

@@ -2,11 +2,11 @@ package net.hostsharing.hsadminng.hs.office.coopassets;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -26,7 +26,7 @@ import java.util.List;
 
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java

@@ -5,8 +5,9 @@ import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -21,8 +22,8 @@ import jakarta.persistence.PersistenceContext;
 import java.time.LocalDate;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.startsWith;
@@ -61,6 +62,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
     }
 
     @Nested
+    @Accepts({"CoopSharesTransaction:F(Find)"})
     class ListCoopSharesTransactions {
 
         @Test
@@ -127,6 +129,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
     }
 
     @Nested
+    @Accepts({"CoopSharesTransaction:C(Create)"})
     class AddCoopSharesTransaction {
 
         @Test
@@ -187,6 +190,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
     }
 
     @Nested
+    @Accepts({"CoopShareTransaction:R(Read)"})
     class GetCoopShareTransaction {
 
         @Test
@@ -203,6 +207,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
         }
 
         @Test
+        @Accepts({"CoopShareTransaction:X(Access Control)"})
         void normalUser_canNotGetUnrelatedCoopShareTransaction() {
             context.define("superuser-alex@hostsharing.net");
             final var givenCoopShareTransactionUuid = coopSharesTransactionRepo.findCoopSharesTransactionByOptionalMembershipUuidAndDateRange(null, LocalDate.of(2010, 3, 15), LocalDate.of(2010, 3, 15)).get(0).getUuid();
@@ -212,6 +217,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
         }
 
         @Test
+        @Accepts({"CoopShareTransaction:X(Access Control)"})
         void partnerPersonUser_canGetRelatedCoopShareTransaction() {
             context.define("superuser-alex@hostsharing.net");
             final var givenCoopShareTransactionUuid = coopSharesTransactionRepo.findCoopSharesTransactionByOptionalMembershipUuidAndDateRange(null, LocalDate.of(2010, 3, 15), LocalDate.of(2010, 3, 15)).get(0).getUuid();

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerRestTest.java

@@ -2,7 +2,7 @@ package net.hostsharing.hsadminng.hs.office.coopshares;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.mapper.Mapper;
-import net.hostsharing.hsadminng.rbac.test.JsonBuilder;
+import net.hostsharing.test.JsonBuilder;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import java.util.UUID;
 import java.util.function.Function;
 
-import static net.hostsharing.hsadminng.rbac.test.JsonBuilder.jsonObject;
+import static net.hostsharing.test.JsonBuilder.jsonObject;
 import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepositoryIntegrationTest.java

@@ -2,11 +2,11 @@ package net.hostsharing.hsadminng.hs.office.coopshares;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -25,7 +25,7 @@ import java.util.List;
 
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java

@@ -10,8 +10,9 @@ import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.json.JSONException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -27,8 +28,8 @@ import jakarta.persistence.PersistenceContext;
 import java.util.UUID;
 
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.*;
 
@@ -73,6 +74,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
     EntityManager em;
 
     @Nested
+    @Accepts({ "Debitor:F(Find)" })
     class ListDebitors {
 
         @Test
@@ -432,6 +434,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Debitor:R(Read)" })
     class GetDebitor {
 
         @Test
@@ -496,6 +499,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Debitor:X(Access Control)" })
         void normalUser_canNotGetUnrelatedDebitor() {
             context.define("superuser-alex@hostsharing.net");
             final var givenDebitorUuid = debitorRepo.findDebitorByOptionalNameLike("First").get(0).getUuid();
@@ -511,6 +515,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Debitor:X(Access Control)" })
         void contactAdminUser_canGetRelatedDebitorExceptRefundBankAccount() {
             context.define("superuser-alex@hostsharing.net");
             final var givenDebitorUuid = debitorRepo.findDebitorByOptionalNameLike("first contact").get(0).getUuid();
@@ -536,6 +541,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Debitor:U(Update)" })
     class PatchDebitor {
 
         @Test
@@ -648,6 +654,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Debitor:D(Delete)" })
     class DeleteDebitor {
 
         @Test
@@ -669,6 +676,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Debitor:X(Access Control)" })
         void contactAdminUser_canNotDeleteRelatedDebitor() {
             context.define("superuser-alex@hostsharing.net");
             final var givenDebitor = givenSomeTemporaryDebitor();
@@ -688,6 +696,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Debitor:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedDebitor() {
             context.define("superuser-alex@hostsharing.net");
             final var givenDebitor = givenSomeTemporaryDebitor();

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityPatcherUnitTest.java

@@ -3,7 +3,7 @@ package net.hostsharing.hsadminng.hs.office.debitor;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebitorPatchResource;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java

@@ -7,12 +7,12 @@ import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantsDiagramService;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.hibernate.Hibernate;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
@@ -33,10 +33,10 @@ import jakarta.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
 
-import static net.hostsharing.hsadminng.rbac.test.EntityList.one;
+import static net.hostsharing.hsadminng.hs.office.test.EntityList.one;
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java

@@ -6,8 +6,9 @@ import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.json.JSONException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Nested;
@@ -24,8 +25,8 @@ import java.util.UUID;
 
 import static net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipStatus.ACTIVE;
 import static net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipStatus.CANCELLED;
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.*;
 
@@ -60,6 +61,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
     EntityManager em;
 
     @Nested
+    @Accepts({ "Membership:F(Find)" })
     class ListMemberships {
 
         @Test
@@ -166,6 +168,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
     }
 
     @Nested
+    @Accepts({ "Membership:C(Create)" })
     class AddMembership {
 
         @Test
@@ -212,6 +215,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
     }
 
     @Nested
+    @Accepts({ "Membership:R(Read)" })
     class GetMembership {
 
         @Test
@@ -241,6 +245,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
         }
 
         @Test
+        @Accepts({ "Membership:X(Access Control)" })
         void normalUser_canNotGetUnrelatedMembership() {
             context.define("superuser-alex@hostsharing.net");
             final var givenMembershipUuid = membershipRepo.findMembershipByMemberNumber(1000101).getUuid();
@@ -256,6 +261,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
         }
 
         @Test
+        @Accepts({ "Membership:X(Access Control)" })
         void parnerRelAgent_canGetRelatedMembership() {
             context.define("superuser-alex@hostsharing.net");
             final var givenMembershipUuid = membershipRepo.findMembershipByMemberNumber(1000303).getUuid();
@@ -284,6 +290,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
     }
 
     @Nested
+    @Accepts({ "Membership:U(Update)" })
     class PatchMembership {
 
         @Test
@@ -364,6 +371,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
     }
 
     @Nested
+    @Accepts({ "Membership:D(Delete)" })
     class DeleteMembership {
 
         @Test
@@ -385,6 +393,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
         }
 
         @Test
+        @Accepts({ "Membership:X(Access Control)" })
         void partnerAgentUser_canNotDeleteRelatedMembership() {
             context.define("superuser-alex@hostsharing.net");
             final var givenMembership = givenSomeTemporaryMembershipBessler("First");
@@ -404,6 +413,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
         }
 
         @Test
+        @Accepts({ "Membership:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedMembership() {
             context.define("superuser-alex@hostsharing.net");
             final var givenMembership = givenSomeTemporaryMembershipBessler("First");

src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcherUnitTest.java

@@ -5,7 +5,7 @@ import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeMembershipPatchResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeMembershipStatusResource;
 import net.hostsharing.hsadminng.mapper.Mapper;
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java

@@ -4,11 +4,11 @@ import io.hypersistence.utils.hibernate.type.range.Range;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ import java.util.List;
 
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java

@@ -4,7 +4,7 @@ import com.opencsv.CSVParserBuilder;
 import com.opencsv.CSVReader;
 import com.opencsv.CSVReaderBuilder;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.hsadminng.context.ContextBasedTest;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
 import net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionEntity;
@@ -22,7 +22,7 @@ import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType;
 import net.hostsharing.hsadminng.hs.office.sepamandate.HsOfficeSepaMandateEntity;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.*;
@@ -433,6 +433,7 @@ public class ImportOfficeData extends ContextBasedTest {
     @Test
     @Order(3001)
     void removeSelfRepresentativeRelations() {
+        assumeThatWeAreImportingControlledTestData();
 
         // this happens if a natural person is marked as 'contractual' for itself
         final var idsToRemove = new HashSet<Integer>();
@@ -452,6 +453,7 @@ public class ImportOfficeData extends ContextBasedTest {
     @Test
     @Order(3002)
     void removeEmptyRelations() {
+        assumeThatWeAreImportingControlledTestData();
 
         // avoid a error when persisting the deliberately invalid partner entry #99
         final var idsToRemove = new HashSet<Integer>();
@@ -472,6 +474,7 @@ public class ImportOfficeData extends ContextBasedTest {
     @Test
     @Order(3003)
     void removeEmptyPartners() {
+        assumeThatWeAreImportingControlledTestData();
 
         // avoid a error when persisting the deliberately invalid partner entry #99
         final var idsToRemove = new HashSet<Integer>();
@@ -495,6 +498,7 @@ public class ImportOfficeData extends ContextBasedTest {
     @Test
     @Order(3004)
     void removeEmptyDebitors() {
+        assumeThatWeAreImportingControlledTestData();
 
         // avoid a error when persisting the deliberately invalid partner entry #99
         final var idsToRemove = new HashSet<Integer>();
@@ -506,10 +510,8 @@ public class ImportOfficeData extends ContextBasedTest {
                 idsToRemove.add(id);
             }
         });
-        idsToRemove.forEach(id -> debitors.remove(id));
-
-        assumeThatWeAreImportingControlledTestData();
         assertThat(idsToRemove.size()).isEqualTo(1); // only from partner #99
+        idsToRemove.forEach(id -> debitors.remove(id));
     }
 
     @Test

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java

@@ -10,8 +10,9 @@ import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -21,8 +22,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.UUID;
 
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.EX_PARTNER;
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.*;
 
@@ -53,6 +54,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
     JpaAttempt jpaAttempt;
 
     @Nested
+    @Accepts({ "Partner:F(Find)" })
     @Transactional
     class ListPartners {
 
@@ -82,6 +84,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Partner:C(Create)" })
     @Transactional
     class AddPartner {
 
@@ -223,6 +226,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Partner:R(Read)" })
     @Transactional
     class GetPartner {
 
@@ -260,6 +264,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Partner:X(Access Control)" })
         void normalUser_canNotGetUnrelatedPartner() {
             context.define("superuser-alex@hostsharing.net");
             final var givenPartnerUuid = partnerRepo.findPartnerByOptionalNameLike("First").get(0).getUuid();
@@ -275,6 +280,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Partner:X(Access Control)" })
         void contactAdminUser_canGetRelatedPartner() {
             context.define("superuser-alex@hostsharing.net");
             final var givenPartnerUuid = partnerRepo.findPartnerByOptionalNameLike("first contact").get(0).getUuid();
@@ -300,6 +306,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Partner:U(Update)" })
     @Transactional
     class PatchPartner {
 
@@ -455,6 +462,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
     }
 
     @Nested
+    @Accepts({ "Partner:D(Delete)" })
     @Transactional
     class DeletePartner {
 
@@ -478,6 +486,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Partner:X(Access Control)" })
         void contactAdminUser_canNotDeleteRelatedPartner() {
             context.define("superuser-alex@hostsharing.net");
             final var givenPartner = givenSomeTemporaryPartnerBessler(20014);
@@ -497,6 +506,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
         }
 
         @Test
+        @Accepts({ "Partner:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedPartner() {
             context.define("superuser-alex@hostsharing.net");
             final var givenPartner = givenSomeTemporaryPartnerBessler(20015);

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntityPatcherUnitTest.java

@@ -3,7 +3,7 @@ package net.hostsharing.hsadminng.hs.office.partner;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerDetailsPatchResource;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcherUnitTest.java

@@ -4,7 +4,7 @@ import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerPatchResource;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java

@@ -6,11 +6,11 @@ import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacObjectRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -30,8 +30,8 @@ import java.util.Objects;
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacObjectEntity.objectDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.Array.from;
+import static net.hostsharing.test.Array.from;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonControllerAcceptanceTest.java

@@ -4,8 +4,9 @@ import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Nested;
@@ -19,8 +20,8 @@ import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.*;
 
@@ -49,6 +50,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
     EntityManager em;
 
     @Nested
+    @Accepts({ "Person:F(Find)" })
     class ListPersons {
 
         @Test
@@ -69,6 +71,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
     }
 
     @Nested
+    @Accepts({ "Person:C(Create)" })
     class AddPerson {
 
         @Test
@@ -106,6 +109,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
     }
 
     @Nested
+    @Accepts({ "Person:R(Read)" })
     @Transactional
     class GetPerson {
 
@@ -131,6 +135,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
         }
 
         @Test
+        @Accepts({ "Person:X(Access Control)" })
         void normalUser_canNotGetUnrelatedPerson() {
             final var givenPersonUuid = jpaAttempt.transacted(() -> {
                 context.define("superuser-alex@hostsharing.net");
@@ -148,6 +153,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
         }
 
         @Test
+        @Accepts({ "Person:X(Access Control)" })
         void personOwnerUser_canGetRelatedPerson() {
             final var givenPersonUuid = jpaAttempt.transacted(() -> {
                 context.define("superuser-alex@hostsharing.net");
@@ -175,6 +181,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
     }
 
     @Nested
+    @Accepts({ "Person:U(Update)" })
     @Transactional
     class PatchPerson {
 
@@ -262,6 +269,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
     }
 
     @Nested
+    @Accepts({ "Person:D(Delete)" })
     @Transactional
     class DeletePerson {
 
@@ -285,6 +293,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
         }
 
         @Test
+        @Accepts({ "Person:X(Access Control)" })
         void personOwner_canDeleteRelatedPerson() {
             final var givenPerson = givenSomeTemporaryPersonCreatedBy("selfregistered-test-user@hostsharing.org");
 
@@ -302,6 +311,7 @@ class HsOfficePersonControllerAcceptanceTest extends ContextBasedTestWithCleanup
         }
 
         @Test
+        @Accepts({ "Person:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedPerson() {
             final var givenPerson = givenSomeTemporaryPersonCreatedBy("selfregistered-test-user@hostsharing.org");
 

src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntityPatcherUnitTest.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.person;
 
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePersonPatchResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePersonTypeResource;
 import org.junit.jupiter.api.TestInstance;

src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepositoryIntegrationTest.java

@@ -1,11 +1,11 @@
 package net.hostsharing.hsadminng.hs.office.person;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
 import static net.hostsharing.hsadminng.hs.office.person.TestHsOfficePerson.hsOfficePerson;
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationControllerAcceptanceTest.java

@@ -2,13 +2,14 @@ package net.hostsharing.hsadminng.hs.office.relation;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
+import net.hostsharing.test.Accepts;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeRelationTypeResource;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.json.JSONException;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -19,8 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
@@ -55,6 +56,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
     JpaAttempt jpaAttempt;
 
     @Nested
+    @Accepts({ "Relation:F(Find)" })
     class ListRelations {
 
         @Test
@@ -117,6 +119,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
     }
 
     @Nested
+    @Accepts({ "Relation:C(Create)" })
     class AddRelation {
 
         @Test
@@ -266,6 +269,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
     }
 
     @Nested
+    @Accepts({ "Relation:R(Read)" })
     class GetRelation {
 
         @Test
@@ -292,6 +296,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
         }
 
         @Test
+        @Accepts({ "Relation:X(Access Control)" })
         void normalUser_canNotGetUnrelatedRelation() {
             context.define("superuser-alex@hostsharing.net");
             final UUID givenRelationUuid = findRelation("First", "Firby").getUuid();
@@ -307,6 +312,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
         }
 
         @Test
+        @Accepts({ "Relation:X(Access Control)" })
         void contactAdminUser_canGetRelatedRelation() {
             context.define("superuser-alex@hostsharing.net");
             final var givenRelation = findRelation("First", "Firby");
@@ -345,6 +351,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
     }
 
     @Nested
+    @Accepts({ "Relation:U(Update)" })
     class PatchRelation {
 
         @Test
@@ -391,6 +398,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
     }
 
     @Nested
+    @Accepts({ "Relation:D(Delete)" })
     class DeleteRelation {
 
         @Test
@@ -412,6 +420,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
         }
 
         @Test
+        @Accepts({ "Relation:X(Access Control)" })
         void contactAdminUser_canNotDeleteRelatedRelation() {
             context.define("superuser-alex@hostsharing.net");
             final var givenRelation = givenSomeTemporaryRelationBessler();
@@ -431,6 +440,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
         }
 
         @Test
+        @Accepts({ "Relation:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedRelation() {
             context.define("superuser-alex@hostsharing.net");
             final var givenRelation = givenSomeTemporaryRelationBessler();

src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcherUnitTest.java

@@ -3,7 +3,7 @@ package net.hostsharing.hsadminng.hs.office.relation;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeRelationPatchResource;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRepositoryIntegrationTest.java

@@ -3,11 +3,11 @@ package net.hostsharing.hsadminng.hs.office.relation;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ import static net.hostsharing.hsadminng.hs.office.person.HsOfficePersonType.NATU
 import static net.hostsharing.hsadminng.hs.office.person.HsOfficePersonType.UNINCORPORATED_FIRM;
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateControllerAcceptanceTest.java

@@ -6,8 +6,9 @@ import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountRepository;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.json.JSONException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -24,8 +25,8 @@ import java.time.LocalDate;
 import java.util.UUID;
 
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
-import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
+import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.*;
 
@@ -55,6 +56,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
     EntityManager em;
 
     @Nested
+    @Accepts({ "SepaMandate:F(Find)" })
     class ListSepaMandates {
 
         @Test
@@ -100,6 +102,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
     }
 
     @Nested
+    @Accepts({ "SepaMandate:C(Create)" })
     class AddSepaMandate {
 
         @Test
@@ -231,6 +234,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
     }
 
     @Nested
+    @Accepts({ "SepaMandate:R(Read)" })
     class GetSepaMandate {
 
         @Test
@@ -264,6 +268,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
         }
 
         @Test
+        @Accepts({ "SepaMandate:X(Access Control)" })
         void normalUser_canNotGetUnrelatedSepaMandate() {
             context.define("superuser-alex@hostsharing.net");
             final var givenSepaMandateUuid = sepaMandateRepo.findSepaMandateByOptionalIban("DE02120300000000202051")
@@ -281,6 +286,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
         }
 
         @Test
+        @Accepts({ "SepaMandate:X(Access Control)" })
         void bankAccountAdminUser_canGetRelatedSepaMandate() {
             context.define("superuser-alex@hostsharing.net");
             final var givenSepaMandateUuid = sepaMandateRepo.findSepaMandateByOptionalIban("DE02120300000000202051")
@@ -312,6 +318,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
     }
 
     @Nested
+    @Accepts({ "SepaMandate:U(Update)" })
     class PatchSepaMandate {
 
         @Test
@@ -432,6 +439,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
     }
 
     @Nested
+    @Accepts({ "SepaMandate:D(Delete)" })
     class DeleteSepaMandate {
 
         @Test
@@ -453,6 +461,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
         }
 
         @Test
+        @Accepts({ "SepaMandate:X(Access Control)" })
         void bankAccountAdminUser_canNotDeleteRelatedSepaMandate() {
             context.define("superuser-alex@hostsharing.net");
             final var givenSepaMandate = givenSomeTemporarySepaMandateForDebitorNumber(1000111);
@@ -471,6 +480,7 @@ class HsOfficeSepaMandateControllerAcceptanceTest extends ContextBasedTestWithCl
         }
 
         @Test
+        @Accepts({ "SepaMandate:X(Access Control)" })
         void normalUser_canNotDeleteUnrelatedSepaMandate() {
             context.define("superuser-alex@hostsharing.net");
             final var givenSepaMandate = givenSomeTemporarySepaMandateForDebitorNumber(1000111);

src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntityPatcherUnitTest.java

@@ -3,7 +3,7 @@ package net.hostsharing.hsadminng.hs.office.sepamandate;
 import io.hypersistence.utils.hibernate.type.range.Range;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeSepaMandatePatchResource;
-import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
+import net.hostsharing.test.PatchUnitTestBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepositoryIntegrationTest.java

@@ -4,11 +4,11 @@ import io.hypersistence.utils.hibernate.type.range.Range;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountRepository;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +26,8 @@ import java.util.List;
 
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
-import static net.hostsharing.hsadminng.rbac.test.Array.fromFormatted;
+import static net.hostsharing.test.Array.fromFormatted;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/hs/office/test/ContextBasedTestWithCleanup.java

@@ -1,12 +1,13 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.hsadminng.hs.office.test;
 
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.hsadminng.context.ContextBasedTest;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantEntity;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantsDiagramService;
 import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleEntity;
 import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleRepository;
+import net.hostsharing.test.JpaAttempt;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -24,7 +25,7 @@ import static java.util.stream.Collectors.toSet;
 import static org.apache.commons.collections4.SetUtils.difference;
 import static org.assertj.core.api.Assertions.assertThat;
 
-// TODO.impl: cleanup the whole class
+// TODO: cleanup the whole class
 public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
 
     private static final boolean DETAILED_BUT_SLOW_CHECK = true;
@@ -63,8 +64,9 @@ public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
         return merged;
     }
 
+    // TODO.test: back to `Class<? extends RbacObject> entityClass` but delete on raw table
     // remove HsOfficeCoopAssetsTransactionRawEntity, which is not needed anymore after this change
-    public UUID toCleanup(final Class<? extends RbacObject> entityClass, final UUID uuidToCleanup) {
+    public UUID toCleanup(final Class entityClass, final UUID uuidToCleanup) {
         out.println("toCleanup(" + entityClass.getSimpleName() + ", " + uuidToCleanup + ")");
         entitiesToCleanup.put(uuidToCleanup, entityClass);
         return uuidToCleanup;
@@ -176,19 +178,16 @@ public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
     }
 
     private void cleanupTemporaryTestData() {
-        jpaAttempt.transacted(() -> {
+        entitiesToCleanup.forEach((uuid, entityClass) -> {
-            context.define("superuser-alex@hostsharing.net", null);
+            final var caughtException = jpaAttempt.transacted(() -> {
-            entitiesToCleanup.reversed().forEach((uuid, entityClass) -> {
+                context.define("superuser-alex@hostsharing.net", null);
-                final var rvTableName = entityClass.getAnnotation(Table.class).name();
+                em.remove(em.getReference(entityClass, uuid));
-                if ( !rvTableName.endsWith("_rv") ) {
+                out.println("DELETING temporary " + entityClass.getSimpleName() + "#" + uuid + " generated");
-                    throw new IllegalStateException();
+            }).caughtException();
-                }
+            if (caughtException != null) {
-                final var rawTableName = rvTableName.substring(0, rvTableName.length() - "_rv".length());
+                out.println("DELETING temporary " + entityClass.getSimpleName() + "#" + uuid + " failed: " + caughtException);
-                final var deletedRows = em.createNativeQuery("DELETE FROM " + rawTableName + " WHERE uuid=:uuid")
+            }
-                        .setParameter("uuid", uuid).executeUpdate();
+        });
-                out.println("DELETING temporary " + entityClass.getSimpleName() + "#" + uuid + " deleted " + deletedRows + " rows");
-            });
-        }).assertSuccessful();
     }
 
     private long assertNoNewRbacObjectsRolesAndGrantsLeaked() {

src/test/java/net/hostsharing/hsadminng/hs/office/test/EntityList.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.hsadminng.hs.office.test;
 
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
 

src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java

@@ -4,12 +4,13 @@ import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.ValidatableResponse;
 import net.hostsharing.hsadminng.HsadminNgApplication;
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.hsadminng.context.ContextBasedTest;
 import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleEntity;
 import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleRepository;
 import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserEntity;
 import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserRepository;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -33,6 +34,7 @@ import static org.hamcrest.Matchers.*;
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
         classes = { HsadminNgApplication.class, JpaAttempt.class }
 )
+@Accepts({ "GRT:S(Schema)" })
 @Transactional(readOnly = true, propagation = Propagation.NEVER)
 class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
 
@@ -58,6 +60,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
     class ListGrants {
 
         @Test
+        @Accepts("GRT:L(List)")
         void globalAdmin_withoutAssumedRole_canViewAllGrants() {
             RestAssured // @formatter:off
                 .given()
@@ -110,6 +113,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:L(List)", "GRT:X(Access Control)" })
         void globalAdmin_withAssumedPackageAdminRole_canViewPacketRelatedGrants() {
             RestAssured // @formatter:off
                 .given()
@@ -133,6 +137,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:L(List)", "GRT:X(Access Control)" })
         void packageAdmin_withoutAssumedRole_canViewPacketRelatedGrants() {
             RestAssured // @formatter:off
                 .given()
@@ -161,6 +166,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
     class GetGrantById {
 
         @Test
+        @Accepts({ "GRT:R(Read)" })
         void customerAdmin_withAssumedPacketAdminRole_canReadPacketAdminsGrantById() {
             // given
             final var givenCurrentUserAsPackageAdmin = new Subject("customer-admin@xxx.example.com");
@@ -180,6 +186,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:R(Read)" })
         void packageAdmin_withoutAssumedRole_canReadItsOwnGrantById() {
             // given
             final var givenCurrentUserAsPackageAdmin = new Subject("pac-admin-xxx00@xxx.example.com");
@@ -199,6 +206,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:R(Read)", "GRT:X(Access Control)" })
         void packageAdmin_withAssumedPackageAdmin_canStillReadItsOwnGrantById() {
             // given
             final var givenCurrentUserAsPackageAdmin = new Subject(
@@ -220,6 +228,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:R(Read)", "GRT:X(Access Control)" })
         void packageAdmin_withAssumedPackageTenantRole_canNotReadItsOwnGrantByIdAnymore() {
 
             // given
@@ -241,6 +250,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
     class GrantRoleToUser {
 
         @Test
+        @Accepts({ "GRT:C(Create)" })
         void packageAdmin_canGrantOwnPackageAdminRole_toArbitraryUser() {
 
             // given
@@ -270,6 +280,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:C(Create)", "GRT:X(Access Control)" })
         void packageAdmin_canNotGrantAlienPackageAdminRole_toArbitraryUser() {
 
             // given
@@ -298,6 +309,7 @@ class RbacGrantControllerAcceptanceTest extends ContextBasedTest {
     class RevokeRoleFromUser {
 
         @Test
+        @Accepts({ "GRT:D(Delete)" })
         @Transactional(propagation = Propagation.NEVER)
         void packageAdmin_canRevokePackageAdminRole_grantedByPackageAdmin_fromArbitraryUser() {
 

src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantRepositoryIntegrationTest.java

@@ -1,11 +1,12 @@
 package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.hsadminng.context.ContextBasedTest;
 import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleRepository;
 import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserEntity;
 import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserRepository;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest
@@ -57,6 +58,7 @@ class RbacGrantRepositoryIntegrationTest extends ContextBasedTest {
     class FindAllGrantsOfUser {
 
         @Test
+        @Accepts({ "GRT:L(List)" })
         public void packageAdmin_canViewItsRbacGrants() {
             // given
             context("pac-admin-xxx00@xxx.example.com", null);
@@ -71,6 +73,7 @@ class RbacGrantRepositoryIntegrationTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:L(List)" })
         public void customerAdmin_canViewItsRbacGrants() {
             // given
             context("customer-admin@xxx.example.com", null);
@@ -88,6 +91,7 @@ class RbacGrantRepositoryIntegrationTest extends ContextBasedTest {
         }
 
         @Test
+        @Accepts({ "GRT:L(List)" })
         public void customerAdmin_withAssumedRole_canOnlyViewRbacGrantsVisibleByAssumedRole() {
             // given:
             context("customer-admin@xxx.example.com", "test_package#xxx00:ADMIN");

src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantsDiagramServiceIntegrationTest.java

@@ -1,9 +1,9 @@
 package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
+import net.hostsharing.hsadminng.hs.office.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantsDiagramService.Include;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java

@@ -4,6 +4,7 @@ import io.restassured.RestAssured;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.rbac.rbacuser.RbacUserRepository;
+import net.hostsharing.test.Accepts;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,6 +16,7 @@ import static org.hamcrest.Matchers.*;
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
         classes = HsadminNgApplication.class
 )
+@Accepts({ "ROL:*:S:Schema" })
 class RbacRoleControllerAcceptanceTest {
 
     @LocalServerPort
@@ -30,6 +32,7 @@ class RbacRoleControllerAcceptanceTest {
     RbacRoleRepository rbacRoleRepository;
 
     @Test
+    @Accepts({ "ROL:L(List)" })
     void globalAdmin_withoutAssumedRole_canViewAllRoles() {
 
         // @formatter:off
@@ -55,6 +58,7 @@ class RbacRoleControllerAcceptanceTest {
     }
 
     @Test
+    @Accepts({ "ROL:L(List)", "ROL:X(Access Control)" })
     void globalAdmin_withAssumedPackageAdminRole_canViewPackageAdminRoles() {
 
         // @formatter:off
@@ -88,6 +92,7 @@ class RbacRoleControllerAcceptanceTest {
     }
 
     @Test
+    @Accepts({ "ROL:L(List)", "ROL:X(Access Control)" })
     void packageAdmin_withoutAssumedRole_canViewPackageAdminRoles() {
 
         // @formatter:off

src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleRepositoryIntegrationTest.java

@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.rbac.rbacrole;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import jakarta.persistence.EntityManager;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerAcceptanceTest.java

@@ -4,7 +4,8 @@ import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.Accepts;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,7 @@ class RbacUserControllerAcceptanceTest {
     class CreateRbacUser {
 
         @Test
+        @Accepts({ "USR:C(Create)", "USR:X(Access Control)" })
         void anybody_canCreateANewUser() {
 
             // @formatter:off
@@ -75,6 +77,7 @@ class RbacUserControllerAcceptanceTest {
     class GetRbacUser {
 
         @Test
+        @Accepts({ "USR:R(Read)" })
         void globalAdmin_withoutAssumedRole_canGetArbitraryUser() {
             final var givenUser = findRbacUserByName("pac-admin-xxx00@xxx.example.com");
 
@@ -93,6 +96,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:R(Read)", "USR:X(Access Control)" })
         void globalAdmin_withAssumedCustomerAdminRole_canGetUserWithinInItsRealm() {
             final var givenUser = findRbacUserByName("pac-admin-yyy00@yyy.example.com");
 
@@ -112,6 +116,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:R(Read)", "USR:X(Access Control)" })
         void customerAdmin_withoutAssumedRole_canGetUserWithinInItsRealm() {
             final var givenUser = findRbacUserByName("pac-admin-yyy00@yyy.example.com");
 
@@ -130,6 +135,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:R(Read)", "USR:X(Access Control)" })
         void customerAdmin_withoutAssumedRole_canNotGetUserOutsideOfItsRealm() {
             final var givenUser = findRbacUserByName("pac-admin-yyy00@yyy.example.com");
 
@@ -150,6 +156,7 @@ class RbacUserControllerAcceptanceTest {
     class ListRbacUsers {
 
         @Test
+        @Accepts({ "USR:L(List)" })
         void globalAdmin_withoutAssumedRole_canViewAllUsers() {
 
             // @formatter:off
@@ -175,6 +182,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:F(Filter)" })
         void globalAdmin_withoutAssumedRole_canViewAllUsersByName() {
 
             // @formatter:off
@@ -195,6 +203,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:L(List)", "USR:X(Access Control)" })
         void globalAdmin_withAssumedCustomerAdminRole_canViewUsersInItsRealm() {
 
             // @formatter:off
@@ -217,6 +226,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:L(List)", "USR:X(Access Control)" })
         void customerAdmin_withoutAssumedRole_canViewUsersInItsRealm() {
 
             // @formatter:off
@@ -238,6 +248,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:L(List)", "USR:X(Access Control)" })
         void packetAdmin_withoutAssumedRole_canViewAllUsersOfItsPackage() {
 
             // @formatter:off
@@ -260,6 +271,7 @@ class RbacUserControllerAcceptanceTest {
     class ListRbacUserPermissions {
 
         @Test
+        @Accepts({ "PRM:L(List)" })
         void globalAdmin_withoutAssumedRole_canViewArbitraryUsersPermissions() {
             final var givenUser = findRbacUserByName("pac-admin-yyy00@yyy.example.com");
 
@@ -289,6 +301,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "PRM:L(List)" })
         void globalAdmin_withAssumedCustomerAdminRole_canViewArbitraryUsersPermissions() {
             final var givenUser = findRbacUserByName("pac-admin-yyy00@yyy.example.com");
 
@@ -319,6 +332,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "PRM:L(List)" })
         void packageAdmin_withoutAssumedRole_canViewPermissionsOfUsersInItsRealm() {
             final var givenUser = findRbacUserByName("pac-admin-yyy00@yyy.example.com");
 
@@ -348,6 +362,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "PRM:L(List)" })
         void packageAdmin_canViewPermissionsOfUsersOutsideOfItsRealm() {
             final var givenUser = findRbacUserByName("pac-admin-xxx00@xxx.example.com");
 
@@ -370,6 +385,7 @@ class RbacUserControllerAcceptanceTest {
     class DeleteRbacUser {
 
         @Test
+        @Accepts({ "USR:D(Create)" })
         void anybody_canDeleteTheirOwnUser() {
 
             // given
@@ -391,6 +407,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:D(Create)", "USR:X(Access Control)" })
         void customerAdmin_canNotDeleteOtherUser() {
 
             // given
@@ -413,6 +430,7 @@ class RbacUserControllerAcceptanceTest {
         }
 
         @Test
+        @Accepts({ "USR:D(Create)", "USR:X(Access Control)" })
         void globalAdmin_canDeleteArbitraryUser() {
 
             // given

src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserControllerRestTest.java

@@ -21,7 +21,7 @@ import jakarta.persistence.SynchronizationType;
 import java.util.Map;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.IsValidUuidMatcher.isUuidValid;
+import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;

src/test/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserRepositoryIntegrationTest.java

@@ -1,9 +1,9 @@
 package net.hostsharing.hsadminng.rbac.rbacuser;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.hsadminng.context.ContextBasedTest;
-import net.hostsharing.hsadminng.rbac.test.Array;
+import net.hostsharing.test.Array;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.UUID;
 
 import static java.util.Comparator.comparing;
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomer.java

@@ -1,4 +1,5 @@
-package net.hostsharing.hsadminng.rbac.test.cust;
+package net.hostsharing.hsadminng.test.cust;
+
 
 public class TestCustomer {
 

src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerControllerAcceptanceTest.java

@@ -1,10 +1,10 @@
-package net.hostsharing.hsadminng.rbac.test.cust;
+package net.hostsharing.hsadminng.test.cust;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;

src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntityUnitTest.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.cust;
+package net.hostsharing.hsadminng.test.cust;
 
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacViewMermaidFlowchartGenerator;
 import org.junit.jupiter.api.Test;

src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerRepositoryIntegrationTest.java

@@ -1,8 +1,8 @@
-package net.hostsharing.hsadminng.rbac.test.cust;
+package net.hostsharing.hsadminng.test.cust;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.hsadminng.context.ContextBasedTest;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
+import static net.hostsharing.test.JpaAttempt.attempt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest

src/test/java/net/hostsharing/hsadminng/test/pac/TestPackage.java

@@ -1,7 +1,7 @@
-package net.hostsharing.hsadminng.rbac.test.pac;
+package net.hostsharing.hsadminng.test.pac;
 
-import net.hostsharing.hsadminng.rbac.test.cust.TestCustomer;
+import net.hostsharing.hsadminng.test.cust.TestCustomer;
-import net.hostsharing.hsadminng.rbac.test.cust.TestCustomerEntity;
+import net.hostsharing.hsadminng.test.cust.TestCustomerEntity;
 
 import static java.util.UUID.randomUUID;
 

src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageControllerAcceptanceTest.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.pac;
+package net.hostsharing.hsadminng.test.pac;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;

src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageEntityUnitTest.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test.pac;
+package net.hostsharing.hsadminng.test.pac;
 
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacViewMermaidFlowchartGenerator;
 import org.junit.jupiter.api.Test;

src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageRepositoryIntegrationTest.java

@@ -1,8 +1,8 @@
-package net.hostsharing.hsadminng.rbac.test.pac;
+package net.hostsharing.hsadminng.test.pac;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
+import net.hostsharing.hsadminng.context.ContextBasedTest;
-import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
+import net.hostsharing.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

src/test/java/net/hostsharing/test/Accepts.java

@@ -0,0 +1,13 @@
+package net.hostsharing.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+public @interface Accepts {
+
+    String[] value();
+}

src/test/java/net/hostsharing/test/Array.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/test/java/net/hostsharing/test/IsValidUuidMatcher.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;

src/test/java/net/hostsharing/test/JpaAttempt.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import org.assertj.core.api.ObjectAssert;
 import org.springframework.beans.factory.annotation.Autowired;

src/test/java/net/hostsharing/test/JsonBuilder.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import org.json.JSONException;
 import org.json.JSONObject;

src/test/java/net/hostsharing/test/JsonMatcher.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/test/java/net/hostsharing/test/LocaleUnitTest.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import org.junit.jupiter.api.Test;
 

src/test/java/net/hostsharing/test/MapperUnitTest.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayName;

src/test/java/net/hostsharing/test/OptionalFromJsonUnitTest.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import net.hostsharing.hsadminng.mapper.OptionalFromJson;
 import org.junit.jupiter.api.Test;

src/test/java/net/hostsharing/test/PatchUnitTestBase.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
 import net.hostsharing.hsadminng.mapper.EntityPatcher;

src/test/java/net/hostsharing/test/StringTemplater.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import lombok.experimental.UtilityClass;
 

src/test/java/net/hostsharing/test/StringifyUnitTest.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.test;
+package net.hostsharing.test;
 
 import lombok.*;
 import lombok.experimental.FieldNameConstants;