[java-idp-integration-tests COMMIT] /trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jun 23 18:29:48 2015
New Revision: 70

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=70&view=rev
Log:
IDP-738 Revert back to HtmlUnit as the driver.

https://issues.shibboleth.net/jira/browse/IDP-738

Modified:
    trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java

Modified: trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java?rev=70&r1=69&r2=70&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java	(original)
+++ trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java	Tue Jun 23 18:29:48 2015
@@ -445,7 +445,7 @@
     /**
      * Set up HtmlUnitDriver web driver.
      */
-    @BeforeMethod(enabled = false) public void setUpHtmlUnitDriver() throws IOException {
+    @BeforeMethod(enabled = true) public void setUpHtmlUnitDriver() throws IOException {
         driver = new HtmlUnitDriver();
         ((HtmlUnitDriver) driver).setJavascriptEnabled(true);
     }
@@ -470,14 +470,12 @@
      * 
      * @throws IOException
      */
-    @BeforeMethod(enabled = true, dependsOnMethods = {"setUpTestName"}) public void setUpSauceDriver() throws IOException {
+    @BeforeMethod(enabled = false, dependsOnMethods = {"setUpTestName"}) public void setUpSauceDriver() throws IOException {
         final SauceOnDemandAuthentication authentication = new SauceOnDemandAuthentication();
         final String username = authentication.getUsername();
         final String accesskey = authentication.getAccessKey();
         final URL url = new URL("http://" + username + ":" + accesskey + "@ondemand.saucelabs.com:80/wd/hub");
-        if (desiredCapabilities == null) {
-            setUpDesiredCapabilities();
-        }
+        setUpDesiredCapabilities();
         driver = new RemoteWebDriver(url, desiredCapabilities);
     }