Merge pull request #3035 from jamezp/tck-fixes

Fix TCk setup and removed unnecessary Arquillian extension.
resteasy · Feb 28, 2022 · e1ee552 · e1ee552
2 parents bc29a3f + 7908db9
commit e1ee552
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 122 deletions.
diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml
@@ -561,22 +561,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <repositories>
-        <!-- Required for PicketBox, once this is removed from WildFly this can be removed -->
-        <repository>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </snapshots>
-            <id>jboss-enterprise-maven-repository</id>
-            <name>JBoss Enterprise Maven Repository</name>
-            <url>https://maven.repository.redhat.com/ga/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
 </project>
diff --git a/testsuite/jakarta-rest-tck/pom.xml b/testsuite/jakarta-rest-tck/pom.xml
@@ -49,15 +49,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.jboss.arquillian.core</groupId>
-            <artifactId>arquillian-core-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-test-spi</artifactId>
-        </dependency>
-
         <!-- Test Dependencies -->
         <dependency>
             <groupId>jakarta.ws.rs</groupId>

diff --git a/.../jakarta-rest-tck/src/main/java/dev/resteasy/tck/ResteasyApplicationArchiveProcessor.java b/.../jakarta-rest-tck/src/main/java/dev/resteasy/tck/ResteasyApplicationArchiveProcessor.java
diff --git a/testsuite/jakarta-rest-tck/src/main/java/dev/resteasy/tck/ResteasyLoadableExtension.java b/testsuite/jakarta-rest-tck/src/main/java/dev/resteasy/tck/ResteasyLoadableExtension.java
diff --git a/...-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/...-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/testsuite/jakarta-rest-tck/src/main/resources/configure-wildfly.cli b/testsuite/jakarta-rest-tck/src/main/resources/configure-wildfly.cli
@@ -4,17 +4,20 @@ embed-server --admin-only=true
 /subsystem=logging/console-handler=CONSOLE:undefine-attribute(name=level)
 /subsystem=logging/logger=org.jboss.resteasy:add(level=TRACE)
 
+# Allow TRACE methods in Undertow
+/subsystem=undertow/server=default-server/http-listener=default:list-clear(name=disallowed-methods)
+
 # Permission mapper
 /subsystem=elytron/constant-permission-mapper=tck-permission-mapper:add(permissions=[{class-name=org.wildfly.security.auth.permission.LoginPermission}, {class-name=org.wildfly.security.auth.permission.RunAsPrincipalPermission, target-name="*"}])
 
 # Configure a user realm
 /subsystem=elytron/filesystem-realm=tck-realm:add(path=tck-users, relative-to=jboss.server.config.dir)
 /subsystem=elytron/filesystem-realm=tck-realm:add-identity(identity=resteasy-staff)
 /subsystem=elytron/filesystem-realm=tck-realm:set-password(identity=resteasy-staff, clear={password="resteasy-staff.12345"})
-/subsystem=elytron/filesystem-realm=tck-realm:add-identity-attribute(identity=resteasy-staff, name=groups, value=["staff", "mgr"])
+/subsystem=elytron/filesystem-realm=tck-realm:add-identity-attribute(identity=resteasy-staff, name=groups, value=["staff", "mgr", "DIRECTOR"])
 /subsystem=elytron/filesystem-realm=tck-realm:add-identity(identity=resteasy-user)
 /subsystem=elytron/filesystem-realm=tck-realm:set-password(identity=resteasy-user, clear={password="resteasy-user.12345"})
-/subsystem=elytron/filesystem-realm=tck-realm:add-identity-attribute(identity=resteasy-user, name=groups, value=["guest"])
+/subsystem=elytron/filesystem-realm=tck-realm:add-identity-attribute(identity=resteasy-user, name=groups, value=["guest", "OTHERROLE"])
 
 # Configure a security domain
 /subsystem=elytron/security-domain=tck-security-domain:add(realms=[{realm=tck-realm,role-decoder=groups-to-roles}], default-realm=tck-realm, permission-mapper=tck-permission-mapper)

diff --git a/testsuite/jakarta-rest-tck/src/main/resources/jboss-web.xml b/testsuite/jakarta-rest-tck/src/main/resources/jboss-web.xml
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -530,5 +530,23 @@
         </profile>
     </profiles>
 
+    <repositories>
+        <!-- Required for PicketBox, once this is removed from WildFly this can be removed -->
+        <repository>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+            <id>jboss-enterprise-maven-repository</id>
+            <name>JBoss Enterprise Maven Repository</name>
+            <url>https://maven.repository.redhat.com/ga/</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
+
 </project>