Merge pull request #203 from OndrejKotek/HAL-1926

HAL-1926 Fix/migrate domain mode in the testsuite.next
hal · Dec 6, 2023 · 9e7f330 · 9e7f330
2 parents 1089cf3 + 4738327
commit 9e7f330
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/...io/src/test/java/org/jboss/hal/testsuite/test/configuration/io/UrlConnectionTestCase.java b/...io/src/test/java/org/jboss/hal/testsuite/test/configuration/io/UrlConnectionTestCase.java
@@ -28,7 +28,6 @@
 import org.wildfly.extras.creaper.core.online.operations.Address;
 import org.wildfly.extras.creaper.core.online.operations.Batch;
 import org.wildfly.extras.creaper.core.online.operations.Operations;
-import org.wildfly.extras.creaper.core.online.operations.Values;
 import org.wildfly.extras.creaper.core.online.operations.admin.Administration;
 
 
@@ -44,10 +43,10 @@ public class UrlConnectionTestCase {
     private static final ServerEnvironmentUtils serverEnvironmentUtils = new ServerEnvironmentUtils(client);
     private static final Operations operations = new Operations(client);
 
-    private static final Address hostMaster = Address.of("host","primary");
+    private static final Address hostPrimary = Address.of("host","primary");
     private static final Address serverGroupMain = Address.of(SERVER_GROUP,"main-server-group");
 
-    private static final BackupAndRestoreAttributes backupHost = new BackupAndRestoreAttributes.Builder(hostMaster).build();
+    private static final BackupAndRestoreAttributes backupHost = new BackupAndRestoreAttributes.Builder(hostPrimary).build();
     private static final BackupAndRestoreAttributes backupOtherServerGroup = new BackupAndRestoreAttributes.Builder(Address.of(SERVER_GROUP,"other-server-group")).build();
     private static final BackupAndRestoreAttributes backupMainServerGroup = new BackupAndRestoreAttributes.Builder(Address.of(SERVER_GROUP,"main-server-group")).build();
     private static final BackupAndRestoreAttributes backupProfile = new BackupAndRestoreAttributes.Builder(Address.of(PROFILE, DEFAULT)).build();
@@ -60,18 +59,13 @@ public static void setUp() throws IOException, TimeoutException, InterruptedExce
         backupMainServerGroup.backup();
         backupProfile.backup();
 
-        operations.batch(new Batch().remove(hostMaster.and("server-config","server-three"))); // /host=master/server-config=server-three:remove()
-        operations.batch(new Batch().remove(Address.of(SERVER_GROUP,"other-server-group")));                  // /server-group=other-server-group:remove()
-
-        operations.batch(new Batch().add(serverGroupMain, Values.of(PROFILE, DEFAULT)));
-        operations.batch(new Batch().writeAttribute(serverGroupMain,PROFILE, DEFAULT));
-
-        operations.batch(new Batch().writeAttribute(serverGroupMain,"socket-binding-group","standard-sockets"));
-
-        operations.batch(new Batch().remove(Address.of(PROFILE,DEFAULT).and("subsystem","undertow").and("server","default-server").and("http-listener","default")));
-        operations.batch(new Batch().writeAttribute(serverGroupMain.and("jvm",DEFAULT),"heap-size", "256m"));
-        operations.batch(new Batch().writeAttribute(serverGroupMain.and("jvm",DEFAULT),"max-heap-size", "256m"));
+        operations.batch(new Batch().writeAttribute(serverGroupMain,PROFILE, DEFAULT)).assertSuccess();
+        operations.batch(new Batch().writeAttribute(serverGroupMain,"socket-binding-group","standard-sockets")).assertSuccess();
+        administration.reloadIfRequired();
 
+        operations.batch(new Batch().remove(Address.of(PROFILE,DEFAULT).and("subsystem","undertow").and("server","default-server").and("http-listener","default"))).assertSuccess();
+        operations.batch(new Batch().writeAttribute(serverGroupMain.and("jvm",DEFAULT),"heap-size", "256m")).assertSuccess();
+        operations.batch(new Batch().writeAttribute(serverGroupMain.and("jvm",DEFAULT),"max-heap-size", "256m")).assertSuccess();
         administration.reloadIfRequired();
 
     }

diff --git a/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/TakeTourTest.java b/tests-hal-basic/src/test/java/org/jboss/hal/testsuite/test/TakeTourTest.java
@@ -84,9 +84,9 @@ public void standaloneWizardNavigation() throws Exception {
             .verifyNext(ACCESS_CONTROL_TITLE, "By default, EAP uses simple access controls",
                     finderPlace(NameTokens.ACCESS_CONTROL, null))
             .verifyNext(ACCESS_CONTROL_TITLE, "Add and assign roles to users and groups.",
-                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-" + "users")))
+                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-users")))
             .verifyNext(ACCESS_CONTROL_TITLE, "Manage the list of roles",
-                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-" + "roles")))
+                    finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-roles")))
             .verifyFinish();
         }
     }
@@ -128,9 +128,9 @@ public void domainWizardNavigation() throws Exception {
         .verifyNext(ACCESS_CONTROL_TITLE, "By default, EAP uses simple access controls",
                 finderPlace(NameTokens.ACCESS_CONTROL, null))
         .verifyNext(ACCESS_CONTROL_TITLE, "Add and assign roles to users and groups.",
-                finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, "users")))
+                finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-users")))
         .verifyNext(ACCESS_CONTROL_TITLE, "Manage the list of roles",
-                finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, "roles")))
+                finderPlace(NameTokens.ACCESS_CONTROL, new FinderPath().append(Ids.ACCESS_CONTROL_BROWSE_BY, Ids.ACCESS_CONTROL_BROWSE_BY + "-roles")))
         .verifyFinish();
     }
 

diff --git a/...runtime/src/test/java/org/jboss/hal/testsuite/test/runtime/MissingOperationsTestCase.java b/...runtime/src/test/java/org/jboss/hal/testsuite/test/runtime/MissingOperationsTestCase.java
@@ -39,7 +39,7 @@ public class MissingOperationsTestCase {
 
     private static final OnlineManagementClient client = ManagementClientProvider.createOnlineManagementClient();
     private static final Operations operations = new Operations(client);
-    private static final String[] baseItems = {"View", "Destroy", "Kill", "Copy"};
+    private static final String[] baseItems = {"Destroy", "Kill", "Copy"};
     private static final String[] startedItems = {"Reload", "Restart", "Suspend", "Stop"};
     private static final String[] suspendedItems = {"Resume"};
     private static final String[] stoppedItems = {"Start", "Remove"};