From fc62fc3c5074f7df97916e1cbf00b34ba160e138 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Tue, 12 Mar 2024 15:40:47 +0100 Subject: [PATCH] Slightly refactor first two policy tests Improve naming, fix some comments Signed-off-by: Arjan Tijms --- tck/{app-policy => app-custom-policy}/pom.xml | 2 +- .../authorization/test/PolicyRegistrationListener.java | 0 .../jakarta/tck/authorization/test/ProtectedServlet.java | 2 +- .../ee/jakarta/tck/authorization/test/TestPolicy.java | 0 .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../tck/authorization/test/AppCustomPolicyIT.java} | 2 +- tck/{app-policy2 => app-custom-policy2}/pom.xml | 4 ++-- .../authorization/test/PolicyRegistrationListener.java | 0 .../jakarta/tck/authorization/test/ProtectedServlet.java | 4 ++-- .../ee/jakarta/tck/authorization/test/TestPolicy.java | 0 .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../tck/authorization/test/AppCustomPolicy2IT.java} | 9 +++++---- tck/pom.xml | 4 ++-- 15 files changed, 14 insertions(+), 13 deletions(-) rename tck/{app-policy => app-custom-policy}/pom.xml (97%) rename tck/{app-policy => app-custom-policy}/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java (100%) rename tck/{app-policy => app-custom-policy}/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java (96%) rename tck/{app-policy => app-custom-policy}/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java (100%) rename tck/{app-policy => app-custom-policy}/src/main/webapp/WEB-INF/beans.xml (100%) rename tck/{app-policy => app-custom-policy}/src/main/webapp/WEB-INF/web.xml (100%) rename tck/{app-policy/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyIT.java => app-custom-policy/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicyIT.java} (98%) rename tck/{app-policy2 => app-custom-policy2}/pom.xml (92%) rename tck/{app-policy2 => app-custom-policy2}/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java (100%) rename tck/{app-policy2 => app-custom-policy2}/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java (95%) rename tck/{app-policy2 => app-custom-policy2}/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java (100%) rename tck/{app-policy2 => app-custom-policy2}/src/main/webapp/WEB-INF/beans.xml (100%) rename tck/{app-policy2 => app-custom-policy2}/src/main/webapp/WEB-INF/web.xml (100%) rename tck/{app-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy2IT.java => app-custom-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicy2IT.java} (93%) diff --git a/tck/app-policy/pom.xml b/tck/app-custom-policy/pom.xml similarity index 97% rename from tck/app-policy/pom.xml rename to tck/app-custom-policy/pom.xml index e40e1d6..5323a04 100644 --- a/tck/app-policy/pom.xml +++ b/tck/app-custom-policy/pom.xml @@ -27,7 +27,7 @@ 4.0.0-SNAPSHOT - app-mem-policy + app-custom-policy war diff --git a/tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java b/tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java similarity index 100% rename from tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java rename to tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java diff --git a/tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java b/tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java similarity index 96% rename from tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java rename to tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java index 8119646..683c3b6 100644 --- a/tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java +++ b/tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java @@ -33,7 +33,7 @@ * *

* The role "foo" is required to access this Servlet. "bar" is a role assigned by the - * TestIdentityStore, "kaz" doesn't exist (but we should still be able to test for it). + * native identity store, "kaz" doesn't exist (but we should still be able to test for it). * */ @WebServlet("/protectedServlet/*") diff --git a/tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java b/tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java similarity index 100% rename from tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java rename to tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java diff --git a/tck/app-policy/src/main/webapp/WEB-INF/beans.xml b/tck/app-custom-policy/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from tck/app-policy/src/main/webapp/WEB-INF/beans.xml rename to tck/app-custom-policy/src/main/webapp/WEB-INF/beans.xml diff --git a/tck/app-policy/src/main/webapp/WEB-INF/web.xml b/tck/app-custom-policy/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tck/app-policy/src/main/webapp/WEB-INF/web.xml rename to tck/app-custom-policy/src/main/webapp/WEB-INF/web.xml diff --git a/tck/app-policy/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyIT.java b/tck/app-custom-policy/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicyIT.java similarity index 98% rename from tck/app-policy/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyIT.java rename to tck/app-custom-policy/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicyIT.java index fe17631..574750c 100644 --- a/tck/app-policy/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyIT.java +++ b/tck/app-custom-policy/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicyIT.java @@ -33,7 +33,7 @@ @RunWith(Arquillian.class) -public class AppPolicyIT extends ArquillianBase { +public class AppCustomPolicyIT extends ArquillianBase { @Deployment(testable = false) public static Archive createDeployment() { diff --git a/tck/app-policy2/pom.xml b/tck/app-custom-policy2/pom.xml similarity index 92% rename from tck/app-policy2/pom.xml rename to tck/app-custom-policy2/pom.xml index 29dea4d..d211fb1 100644 --- a/tck/app-policy2/pom.xml +++ b/tck/app-custom-policy2/pom.xml @@ -27,11 +27,11 @@ 4.0.0-SNAPSHOT - app-mem-policy2 + app-custom-policy2 war - This tests executing a custom permission check before authentication takes place. + This tests executing a custom permission check afer authentication takes place. diff --git a/tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java b/tck/app-custom-policy2/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java similarity index 100% rename from tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java rename to tck/app-custom-policy2/src/main/java/ee/jakarta/tck/authorization/test/PolicyRegistrationListener.java diff --git a/tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java b/tck/app-custom-policy2/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java similarity index 95% rename from tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java rename to tck/app-custom-policy2/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java index 0e712cf..5458c36 100644 --- a/tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java +++ b/tck/app-custom-policy2/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java @@ -32,8 +32,8 @@ * this caller is in any of the roles {foo, bar, kaz} * *

- * The role "kaz" is required to access this Servlet. "bar" is a role assigned by the - * TestIdentityStore. + * The role "kaz" is required to access this Servlet. "foo" and "bar" are roles assigned + * by the native identity store. * */ @WebServlet("/protectedServlet/*") diff --git a/tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java b/tck/app-custom-policy2/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java similarity index 100% rename from tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java rename to tck/app-custom-policy2/src/main/java/ee/jakarta/tck/authorization/test/TestPolicy.java diff --git a/tck/app-policy2/src/main/webapp/WEB-INF/beans.xml b/tck/app-custom-policy2/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from tck/app-policy2/src/main/webapp/WEB-INF/beans.xml rename to tck/app-custom-policy2/src/main/webapp/WEB-INF/beans.xml diff --git a/tck/app-policy2/src/main/webapp/WEB-INF/web.xml b/tck/app-custom-policy2/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tck/app-policy2/src/main/webapp/WEB-INF/web.xml rename to tck/app-custom-policy2/src/main/webapp/WEB-INF/web.xml diff --git a/tck/app-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy2IT.java b/tck/app-custom-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicy2IT.java similarity index 93% rename from tck/app-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy2IT.java rename to tck/app-custom-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicy2IT.java index b793bb4..fea1887 100644 --- a/tck/app-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy2IT.java +++ b/tck/app-custom-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicy2IT.java @@ -31,7 +31,7 @@ @RunWith(Arquillian.class) -public class AppPolicy2IT extends ArquillianBase { +public class AppCustomPolicy2IT extends ArquillianBase { @Deployment(testable = false) public static Archive createDeployment() { @@ -43,10 +43,10 @@ public static Archive createDeployment() { /** * Normally authenticated for a request to the default path. - * Should not have access, since not in role "kaz" + * But should not have access, since not in role "kaz" */ @Test - public void testAuthenticated() { + public void testAuthenticatedWrongRole() { DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider(); credentialsProvider.addCredentials("reza", "secret1"); @@ -58,7 +58,8 @@ public void testAuthenticated() { /** * Not authenticated on the default path. - * Should not have access, since not in the required role "kaz" + * Should not have access, since unauthenticated caller is of course + * not in the required role "kaz" */ @Test public void testNotAuthenticated() { diff --git a/tck/pom.xml b/tck/pom.xml index 7c36b6e..5b8db8f 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -51,8 +51,8 @@ common - app-policy - app-policy2 + app-custom-policy + app-custom-policy2 app-policy3