From cb2a5e7797503c57b33e05bbea3a8aef22f39db9 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Tue, 14 Jun 2022 07:41:05 -0500
Subject: [PATCH] [WFLY-16478] Convert integration test that assumes undefined
 elytron-enabled means 'false' to one that assumes it means 'true'

---
 ...rkManagerElytronUnconfiguredTestCase.java} | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)
 rename testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/security/workmanager/{WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase.java => WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase.java} (88%)

diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/security/workmanager/WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/security/workmanager/WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase.java
similarity index 88%
rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/security/workmanager/WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase.java
rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/security/workmanager/WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase.java
index 035f5cdf9da8..ed909478d42b 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/security/workmanager/WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/security/workmanager/WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase.java
@@ -18,8 +18,6 @@
 
 package org.jboss.as.test.integration.jca.security.workmanager;
 
-import static org.hamcrest.CoreMatchers.containsString;
-
 import java.util.function.Consumer;
 
 import org.jboss.arquillian.container.test.api.Deployer;
@@ -35,9 +33,7 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.wildfly.test.security.common.AbstractElytronSetupTask;
 import org.wildfly.test.security.common.elytron.ConfigurableElement;
@@ -45,16 +41,16 @@
 
 /**
  * Test security inflow with Jakarta Connectors work manager where RA is configured with Elytron security domain
- * and Workmanager is configured with legacy security (it doesn't have elytron-enabled=true),
- * it is not allowed to mix security configuration and it should fail
+ * and Workmanager is configured with Elytron security explicitly configured (it doesn't have elytron-enabled=true).
+ * Default workmanager behavior if unconfigured is elytron is enabled so this should deploy successfully.
  */
 @RunWith(Arquillian.class)
 @ServerSetup({
-        WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase.ElytronSetup.class,
-        WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase.JcaSetup.class,
-        WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase.RaSetup.class})
+        WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase.ElytronSetup.class,
+        WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase.JcaSetup.class,
+        WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase.RaSetup.class})
 @RunAsClient
-public class WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronDisabledTestCase {
+public class WildFlyActivationRaWithWMElytronSecurityDomainWorkManagerElytronUnconfiguredTestCase {
     private static final String ADMIN_OBJ_JNDI_NAME = "java:jboss/admObj";
     private static final String WM_ELYTRON_SECURITY_DOMAIN_NAME = "RaRealmElytron";
     private static final String BOOTSTRAP_CTX_NAME = "wrongContext";
@@ -131,15 +127,11 @@ public static Archive<?> rarDeployment() {
         return rar;
     }
 
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
     @ArquillianResource
     private Deployer deployer;
 
     @Test
-    public void testMixedSecurity() throws Throwable {
-        expectedException.expectMessage(containsString("WFLYJCA0111"));
+    public void testUnconfiguredElytron() throws Throwable {
         deployer.deploy("wf-ra-wm-security-domain-rar");
         try {
             deployer.undeploy("wf-ra-wm-security-domain-rar");