diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml b/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml index db450aa6db..1a3af106fb 100644 --- a/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml @@ -209,6 +209,51 @@ ${project.build.directory}/master-standalone-ha.txt + + read-master-domain-core-service + process-classes + + exec + + + ./jboss-cli.sh + ${jbossHome}/bin + + --file=${project.build.directory}/classes/cli/read-domain-core-service.cli + + ${project.build.directory}/master-domain-core-service.txt + + + + read-master-domain-extension + process-classes + + exec + + + ./jboss-cli.sh + ${jbossHome}/bin + + --file=${project.build.directory}/classes/cli/read-domain-extension.cli + + ${project.build.directory}/master-domain-extension.txt + + + + read-master-domain-interface + process-classes + + exec + + + ./jboss-cli.sh + ${jbossHome}/bin + + --file=${project.build.directory}/classes/cli/read-domain-interface.cli + + ${project.build.directory}/master-domain-interface.txt + + read-master-domain-standalone process-classes @@ -363,6 +408,51 @@ ${project.build.directory}/migrated-standalone-ha.txt + + read-migrated-domain-core-service + process-test-resources + + exec + + + ./jboss-cli.sh + ${jbossHome}/bin + + --file=${project.build.directory}/classes/cli/read-domain-core-service.cli + + ${project.build.directory}/migrated-domain-core-service.txt + + + + read-migrated-domain-extension + process-test-resources + + exec + + + ./jboss-cli.sh + ${jbossHome}/bin + + --file=${project.build.directory}/classes/cli/read-domain-extension.cli + + ${project.build.directory}/migrated-domain-extension.txt + + + + read-migrated-domain-interface + process-test-resources + + exec + + + ./jboss-cli.sh + ${jbossHome}/bin + + --file=${project.build.directory}/classes/cli/read-domain-interface.cli + + ${project.build.directory}/migrated-domain-interface.txt + + read-migrated-domain-standalone process-test-resources diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-core-service.cli b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-core-service.cli new file mode 100644 index 0000000000..f729c0efaf --- /dev/null +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-core-service.cli @@ -0,0 +1,3 @@ +embed-host-controller --domain-config=domain.xml + +/core-service=management/:read-resource(recursive=true) diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-extension.cli b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-extension.cli new file mode 100644 index 0000000000..18c0522b4a --- /dev/null +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-extension.cli @@ -0,0 +1,3 @@ +embed-host-controller --domain-config=domain.xml + +/extension=*/:read-resource(recursive=true) diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-interface.cli b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-interface.cli new file mode 100644 index 0000000000..3a778658d3 --- /dev/null +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-domain-interface.cli @@ -0,0 +1,3 @@ +embed-host-controller --domain-config=domain.xml + +/interface=*/:read-resource(recursive=true) diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone-ha.cli b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone-ha.cli index a32fb9cf0a..bd312d979d 100644 --- a/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone-ha.cli +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone-ha.cli @@ -1,3 +1,4 @@ embed-server --server-config=standalone-ha.xml -/subsystem=*/:read-resource(recursive=true) +#/subsystem=*/:read-resource(recursive=true) +:read-resource(recursive=true) \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone.cli b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone.cli index 400d7c8240..0f52d3bb39 100644 --- a/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone.cli +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone.cli @@ -1,3 +1,4 @@ embed-server --server-config=standalone.xml -/subsystem=*/:read-resource(recursive=true) +#/subsystem=*/:read-resource(recursive=true) +:read-resource(recursive=true) \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/java/org/keycloak/test/config/migration/ConfigMigrationTest.java b/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/java/org/keycloak/test/config/migration/ConfigMigrationTest.java index 08f2caa278..59295217fe 100644 --- a/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/java/org/keycloak/test/config/migration/ConfigMigrationTest.java +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/java/org/keycloak/test/config/migration/ConfigMigrationTest.java @@ -64,6 +64,10 @@ public class ConfigMigrationTest { public void testDomain() throws IOException { compareConfigs("master-domain-standalone.txt", "migrated-domain-standalone.txt"); compareConfigs("master-domain-clustered.txt", "migrated-domain-clustered.txt"); + + compareConfigs("master-domain-core-service.txt", "migrated-domain-core-service.txt"); + compareConfigs("master-domain-extension.txt", "migrated-domain-extension.txt"); + compareConfigs("master-domain-interface.txt", "migrated-domain-interface.txt"); } private void compareConfigs(String masterConfig, String migratedConfig) throws IOException {