* 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 @@
- * 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 @@