[java-idp-integration-tests] branch master updated: Update Selenium to 3.x

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch master
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=83385bc7a7da11a20392a01d8387ef54d7c491ac

The following commit(s) were added to refs/heads/master by this push:
       new  83385bc   Update Selenium to 3.x
83385bc is described below

commit 83385bc7a7da11a20392a01d8387ef54d7c491ac
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 21 16:43:44 2019 -0500

    Update Selenium to 3.x
    
    Will need to replace HtmlUnitDriver with headless Firefox or Chrome
    drivers to remove Xalan and Xerces dependencies.
---
 pom.xml                                            | 61 +++-------------------
 .../idp/test/clientstorage/ClientStorageTest.java  |  2 +-
 2 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5bd50db..650ae9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,13 +40,8 @@
         <java-support.version>8.0.0-SNAPSHOT</java-support.version>
         <opensaml.version>4.0.0-SNAPSHOT</opensaml.version>
 
-        <xalan.groupId>xalan</xalan.groupId>
-        <xalan.version>2.7.1</xalan.version>
-        <xerces.groupId>org.apache.xerces</xerces.groupId>
-        <xerces.version>2.11.0</xerces.version>
-        <xmlresolver.groupId>xml-resolver</xmlresolver.groupId>
-        <xmlresolver.version>1.2</xmlresolver.version>
-        <selenium.version>2.53.1</selenium.version>
+        <selenium.version>3.141.59</selenium.version>
+        <selenium.htmlunit-driver.version>2.35.1</selenium.htmlunit-driver.version>
         <sauce.version>2.1.20</sauce.version>
 
         <test-distributions.directory>${project.basedir}/test-distributions</test-distributions.directory>
@@ -115,32 +110,11 @@
         </dependency>
 
         <!-- Runtime Dependencies -->
-        <!-- Override httpclient version for HtmlUnit. -->
-        <dependency>
-            <groupId>${httpclient.groupId}</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.4</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${httpclient.groupId}</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <!-- Required if you're using anything in the httpclient package -->
-            <groupId>${httpclient.groupId}</groupId>
-            <artifactId>httpclient-cache</artifactId>
-            <version>4.5.2</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.ldaptive</groupId>
             <artifactId>ldaptive</artifactId>
         </dependency>
 
-
         <!-- Test Dependencies -->
         <dependency>
             <groupId>net.shibboleth.utilities</groupId>
@@ -212,35 +186,12 @@
             <artifactId>selenium-java</artifactId>
             <version>${selenium.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xalan</groupId>
-                    <artifactId>xalan</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <!-- AFAICT, Selenium requires the Xerces/Xalan dependencies. -->
         <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xerces.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${xalan.groupId}</groupId>
-            <artifactId>xalan</artifactId>
-            <version>${xalan.version}</version>
-            <scope>test</scope>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>htmlunit-driver</artifactId>
+            <version>${selenium.htmlunit-driver.version}</version>
+            <!-- Note : xalan and xerces are transitive dependencies -->
         </dependency>
         <dependency>
             <groupId>com.saucelabs</groupId>
diff --git a/src/test/java/net/shibboleth/idp/test/clientstorage/ClientStorageTest.java b/src/test/java/net/shibboleth/idp/test/clientstorage/ClientStorageTest.java
index ed9180e..7bcf077 100644
--- a/src/test/java/net/shibboleth/idp/test/clientstorage/ClientStorageTest.java
+++ b/src/test/java/net/shibboleth/idp/test/clientstorage/ClientStorageTest.java
@@ -160,7 +160,7 @@ public class ClientStorageTest extends BaseIntegrationTest {
 
         submitCreateForm(DEFAULT_STORAGE_SERIVCE_ID, "context", "key", "value");
 
-        Assert.assertEquals(getPageSource(), HttpStatus.CREATED.getReasonPhrase());
+        Assert.assertTrue(getPageSource().contains(HttpStatus.CREATED.getReasonPhrase()));
 
         Assert.assertNull(driver.manage().getCookieNamed(DEFAULT_STORAGE_NAME));
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.