KEYCLOAK-9748 Refactoring of springBoot tests including addition of h…

…ow to run docs
ChrisBrandhorst · Apr 23, 2019 · 4272495 · 4272495
1 parent 3f08238
commit 4272495
Show file tree

Hide file tree

Showing 37 changed files with 630 additions and 2,007 deletions.
diff --git a/pom.xml b/pom.xml
@@ -156,6 +156,11 @@
         <tomcat7.version>7.0.92</tomcat7.version>
         <tomcat8.version>8.5.38</tomcat8.version>
         <tomcat9.version>9.0.16</tomcat9.version>
+
+        <!-- Spring Boot versions, used for tests -->
+        <spring-boot15.version>1.5.20.RELEASE</spring-boot15.version>
+        <spring-boot21.version>2.1.3.RELEASE</spring-boot21.version>
+
     </properties>
 
     <url>http://keycloak.org</url>

diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md
@@ -359,6 +359,24 @@ The tests also use some constants placed in [test-constants.properties](tests/ba
 
 In case a custom `settings.xml` is used for Maven, you need to specify it also in `-Dkie.maven.settings.custom=path/to/settings.xml`.
 
+
+## Spring Boot adapter tests
+
+Currently we are testing Spring Boot with three different containers `Tomcat 8`, `Undertow` and `Jetty [9.2, 9.3, 9.4]`. We are testing two versions of Spring Boot 1.5.x and 2.1.x. All versions are specified in [root pom.xml](../../pom.xml) (see properties `spring-boot15.version` and `spring-boot21.version`).
+
+To run tests execute following command. Default version of Spring Boot is 1.5.x, to run tests with version 2.1.x add profile `-Pspringboot21`
+
+```
+mvn -f testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml \
+    clean test \
+    -Ptest-springboot \
+    -Dauth.server.ssl.required=false \
+    -Dadapter.container=[tomcat|undertow|jetty92|jetty93|jetty94]
+    [-Pspringboot21]
+```
+
+Note: Spring Boot 21 doesn't work with jetty92 and jetty93, only jetty94 is tested.
+
 #### Execution example
 ```
 mvn -f testsuite/integration-arquillian/tests/other/console/pom.xml \

diff --git a/testsuite/integration-arquillian/test-apps/pom.xml b/testsuite/integration-arquillian/test-apps/pom.xml
@@ -24,9 +24,7 @@
         <module>app-profile-jee</module>
         <module>cors</module>
         <module>fuse</module>
-        <module>spring-boot-adapter</module>
-        <module>spring-boot-2-adapter</module>
-        <module>spring-boot-21-adapter</module>
+        <module>spring-boot-adapter-app</module>
     </modules>
 
     <properties>

diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/mvnw b/testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/mvnw