keycloak-aplcache

Merge pull request #2806 from vramik/KEYCLOAK-2936-1.9.x KEYCLOAK-2936

5/6/2016 3:06:27 PM

Details

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java
index e5968c1..c1431ed 100755
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java
@@ -682,7 +682,7 @@ public class UserTest extends AbstractAdminTest {
 
         loginPage.login("user1", "password");
 
-        assertEquals("Keycloak Account Management", driver.getTitle());
+        assertTrue(driver.getTitle().contains("Account Management"));
     }
 
     @Test
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/common/xslt/arquillian.xsl b/testsuite/integration-arquillian/tests/other/adapters/karaf/common/xslt/arquillian.xsl
index 4ec665f..9c8f2a6 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/common/xslt/arquillian.xsl
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/common/xslt/arquillian.xsl
@@ -35,6 +35,7 @@
                     <!--<property name="adapterImplClass">org.keycloak.testsuite.arquillian.karaf.CustomKarafContainer</property>-->
                     <property name="autostartBundle">false</property>
                     <property name="karafHome">${app.server.home}</property>
+                    <property name="javaHome">${app.server.java.home}</property>
                     <property name="javaVmArguments">
                         -agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=n 
                         ${adapter.test.props}