From 35657dca1b9d7a86b039df94258c1f67339ddacf Mon Sep 17 00:00:00 2001
From: Martin Simka <msimka@redhat.com>
Date: Wed, 28 Jun 2023 11:26:48 +0200
Subject: [PATCH] skip legacy security domain configuration in versions that
 support only Elytron in ChangeOrbOnlineTest

---
 .../creaper/commands/orb/ChangeOrbOnlineTest.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/orb/ChangeOrbOnlineTest.java b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/orb/ChangeOrbOnlineTest.java
index 59c04eb7..6173a52b 100644
--- a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/orb/ChangeOrbOnlineTest.java
+++ b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/orb/ChangeOrbOnlineTest.java
@@ -75,12 +75,17 @@ public void changeAll() throws Exception {
                 .transactions(TransactionValues.ON)
                 .rootContext("supported")
                 .exportCorbaloc(false)
-                .securityDomain("other")
                 .addComponentViaInterceptor(false)
                 .clientSupports(AuthValues.NONE)
                 .clientRequires(AuthValues.CLIENT_AUTH)
                 .serverSupports(AuthValues.NONE)
                 .serverRequires(AuthValues.CLIENT_AUTH);
+
+        if (onlineClient.version().lessThanOrEqualTo(ServerVersion.VERSION_18_0_0)) {
+            // legacy security was removed in WF25
+            cmdBuilder.securityDomain("other");
+        }
+
         if (isIiop) {
             cmdBuilder
                 .integrity(SupportedValues.SUPPORTED)
@@ -107,7 +112,9 @@ public void changeAll() throws Exception {
         assertEquals("supported", attributes.get("root-context"));
         assertEquals("jacorb", attributes.get("socket-binding"));
         assertEquals("jacorb-ssl", attributes.get("ssl-socket-binding"));
-        assertEquals("other", attributes.get("security-domain"));
+        if (onlineClient.version().lessThanOrEqualTo(ServerVersion.VERSION_18_0_0)) {
+            assertEquals("other", attributes.get("security-domain"));
+        }
         assertEquals("ClientAuth", attributes.get("client-requires"));
         assertEquals("None", attributes.get("server-supports"));
         assertEquals("ClientAuth", attributes.get("server-requires"));