From bc05fb1eeb557e031dda5020884e21430979f530 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Sat, 13 Aug 2022 17:24:56 +0200
Subject: [PATCH] improve + cleanup RbacRoleControllerAcceptanceTests

---
 .../RbacGrantControllerAcceptanceTest.java    | 19 -------
 .../RbacRoleControllerAcceptanceTest.java     | 53 +++++++++++++++++--
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java
index 2d685a88..ed963bf3 100644
--- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java
@@ -51,25 +51,6 @@ class RbacGrantControllerAcceptanceTest {
     @Autowired
     JpaAttempt jpaAttempt;
 
-    @Test
-    @Accepts({ "ROL:L(List)" })
-    void returnsRbacGrantsForPackageAdmin() {
-
-        RestAssured // @formatter:off
-            .given()
-                .header("current-user", "aaa00@aaa.example.com")
-                .port(port)
-            .when()
-                .get("http://localhost/api/rbac-roles")
-            .then().assertThat()
-                .statusCode(200)
-                .contentType("application/json")
-                .body("[0].roleName", is("customer#aaa.tenant"))
-                .body("[1].roleName", is("package#aaa00.admin"))
-                .body("[2].roleName", is("package#aaa00.tenant"));
-            // @formatter:on
-    }
-
     @Test
     @Accepts({ "ROL:C(Create)" })
     void packageAdmin_canGrantOwnPackageAdminRole_toArbitraryUser() {
diff --git a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java
index 257d23bb..1338ac2d 100644
--- a/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleControllerAcceptanceTest.java
@@ -37,8 +37,33 @@ class RbacRoleControllerAcceptanceTest {
     RbacRoleRepository rbacRoleRepository;
 
     @Test
-    @Accepts({ "ROL:*:L:List" })
-    void returnsRbacRolesForAssumedPackageAdmin() {
+    @Accepts({ "ROL:L(List)" })
+    void hostsharingAdmin_withoutAssumedRole_canViewPackageAdminRoles() {
+
+        // @formatter:off
+        RestAssured
+            .given()
+            .header("current-user", "mike@hostsharing.net")
+            .port(port)
+            .when()
+            .get("http://localhost/api/rbac-roles")
+            .then().assertThat()
+            .statusCode(200)
+            .contentType("application/json")
+            .body("[0].roleName", is("customer#aaa.owner"))
+            .body("[1].roleName", is("customer#aaa.admin"))
+            .body("[2].roleName", is("customer#aaa.tenant"))
+            .body("[3].roleName", is("package#aaa00.owner"))
+            .body("[4].roleName", is("package#aaa00.tenant"))
+            // ...
+            .body("[36].roleName", is("global#hostsharing.admin"))
+            .body( "size()", is(37));
+        // @formatter:on
+    }
+
+    @Test
+    @Accepts({ "ROL:L(List)", "ROL:X(Access Control)" })
+    void hostsharingAdmin_withAssumedPackageAdminRole_canViewPackageAdminRoles() {
 
         // @formatter:off
         RestAssured
@@ -53,7 +78,29 @@ class RbacRoleControllerAcceptanceTest {
                 .contentType("application/json")
                 .body("[0].roleName", is("customer#aaa.tenant"))
                 .body("[1].roleName", is("package#aaa00.admin"))
-                .body("[2].roleName", is("package#aaa00.tenant"));
+                .body("[2].roleName", is("package#aaa00.tenant"))
+                .body("size()", is(3));
+        // @formatter:on
+    }
+
+    @Test
+    @Accepts({ "ROL:L(List)", "ROL:X(Access Control)" })
+    void packageAdmin_withoutAssumedRole_canViewPackageAdminRoles() {
+
+        // @formatter:off
+        RestAssured
+            .given()
+            .header("current-user", "aaa00@aaa.example.com")
+            .port(port)
+            .when()
+            .get("http://localhost/api/rbac-roles")
+            .then().assertThat()
+            .statusCode(200)
+            .contentType("application/json")
+            .body("[0].roleName", is("customer#aaa.tenant"))
+            .body("[1].roleName", is("package#aaa00.admin"))
+            .body("[2].roleName", is("package#aaa00.tenant"))
+            .body("size()", is(3));;
         // @formatter:on
     }