keycloak-aplcache

KEYCLOAK-5678 Extend server-config-migration tests to test

11/7/2017 9:46:13 AM

Details

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 ab1be81..34d2d4f 100644
--- a/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml
@@ -210,6 +210,51 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>read-master-domain-core-service</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./jboss-cli.sh</executable>
+                            <workingDirectory>${jbossHome}/bin</workingDirectory>
+                            <arguments>
+                                <argument>--file=${project.build.directory}/classes/cli/read-domain-core-service.cli</argument>
+                            </arguments>
+                            <outputFile>${project.build.directory}/master-domain-core-service.txt</outputFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>read-master-domain-extension</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./jboss-cli.sh</executable>
+                            <workingDirectory>${jbossHome}/bin</workingDirectory>
+                            <arguments>
+                                <argument>--file=${project.build.directory}/classes/cli/read-domain-extension.cli</argument>
+                            </arguments>
+                            <outputFile>${project.build.directory}/master-domain-extension.txt</outputFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>read-master-domain-interface</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./jboss-cli.sh</executable>
+                            <workingDirectory>${jbossHome}/bin</workingDirectory>
+                            <arguments>
+                                <argument>--file=${project.build.directory}/classes/cli/read-domain-interface.cli</argument>
+                            </arguments>
+                            <outputFile>${project.build.directory}/master-domain-interface.txt</outputFile>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>read-master-domain-standalone</id>
                         <phase>process-classes</phase>
                         <goals>
@@ -364,6 +409,51 @@
                         </configuration>
                     </execution>
                     <execution>
+                        <id>read-migrated-domain-core-service</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./jboss-cli.sh</executable>
+                            <workingDirectory>${jbossHome}/bin</workingDirectory>
+                            <arguments>
+                                <argument>--file=${project.build.directory}/classes/cli/read-domain-core-service.cli</argument>
+                            </arguments>
+                            <outputFile>${project.build.directory}/migrated-domain-core-service.txt</outputFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>read-migrated-domain-extension</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./jboss-cli.sh</executable>
+                            <workingDirectory>${jbossHome}/bin</workingDirectory>
+                            <arguments>
+                                <argument>--file=${project.build.directory}/classes/cli/read-domain-extension.cli</argument>
+                            </arguments>
+                            <outputFile>${project.build.directory}/migrated-domain-extension.txt</outputFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>read-migrated-domain-interface</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>./jboss-cli.sh</executable>
+                            <workingDirectory>${jbossHome}/bin</workingDirectory>
+                            <arguments>
+                                <argument>--file=${project.build.directory}/classes/cli/read-domain-interface.cli</argument>
+                            </arguments>
+                            <outputFile>${project.build.directory}/migrated-domain-interface.txt</outputFile>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>read-migrated-domain-standalone</id>
                         <phase>process-test-resources</phase>
                         <goals>
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 0000000..f729c0e
--- /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 0000000..18c0522
--- /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 0000000..3a77865
--- /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.cli b/testsuite/integration-arquillian/tests/other/server-config-migration/src/main/resources/cli/read-standalone.cli
index 400d7c8..0f52d3b 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/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 a32fb9c..bd312d9 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/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 08f2caa..5929521 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 {