Merge pull request #145 from arjantijms/tck_refactor_custom_policy

Slightly refactor first two policy tests

tck/app-policy/pom.xml → tck/app-custom-policy/pom.xml

@@ -27,7 +27,7 @@
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
-	<artifactId>app-mem-policy</artifactId>
+	<artifactId>app-custom-policy</artifactId>
 	<packaging>war</packaging>
 
 	<description>

tck/app-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java → tck/app-custom-policy/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java

@@ -33,7 +33,7 @@
  *
  * <p>
  * 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/*")

tck/app-policy/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyIT.java → 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() {

tck/app-policy2/pom.xml → tck/app-custom-policy2/pom.xml

@@ -27,11 +27,11 @@
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
-	<artifactId>app-mem-policy2</artifactId>
+	<artifactId>app-custom-policy2</artifactId>
 	<packaging>war</packaging>
 
 	<description>
-        This tests executing a custom permission check before authentication takes place.
+        This tests executing a custom permission check afer authentication takes place.
     </description>
 
 	<properties>

tck/app-policy2/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java → 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}
  *
  * <p>
- * 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/*")

tck/app-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy2IT.java → 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() {

tck/pom.xml

@@ -51,8 +51,8 @@
         <module>common</module>
 
         <!-- Setting a Jakarta Authorization policy -->
-        <module>app-policy</module>
-        <module>app-policy2</module>
+        <module>app-custom-policy</module>
+        <module>app-custom-policy2</module>
         <module>app-policy3</module>
     </modules>