[prev in list] [next in list] [prev in thread] [next in thread] 

List:       htmlunit-develop
Subject:    [HtmlUnit] SVN: [13931] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit
From:       asashour () users ! sourceforge ! net
Date:       2017-03-27 11:47:43
Message-ID: 1490615263.493667.1261 () sfp-scm-8 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 13931
          http://sourceforge.net/p/htmlunit/code/13931
Author:   asashour
Date:     2017-03-27 11:47:43 +0000 (Mon, 27 Mar 2017)
Log Message:
-----------
Fixing build

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java
  trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/libraries/Sarissa0993Test.java


Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java
 ===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java	2017-03-27 \
                10:38:49 UTC (rev 13930)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequestTest.java	2017-03-27 \
11:47:43 UTC (rev 13931) @@ -1280,13 +1280,14 @@
             + "xhr.send();\n";
 
         tester(test, "");
+        Thread.sleep(100);
 
         final WebRequest lastRequest = getMockWebConnection().getLastWebRequest();
         final Map<String, String> headers = lastRequest.getAdditionalHeaders();
-        assertEquals(expectedHeaders[0], "" + headers.get("foo"));
-        assertEquals(expectedHeaders[1], "" + headers.get("Accept"));
-        assertEquals(expectedHeaders[2], "" + headers.get("ValueEmpty"));
-        assertEquals(expectedHeaders[3], "" + headers.get("ValueBlank"));
+        assertEquals(expectedHeaders[0], String.valueOf(headers.get("foo")));
+        assertEquals(expectedHeaders[1], String.valueOf(headers.get("Accept")));
+        assertEquals(expectedHeaders[2], String.valueOf(headers.get("ValueEmpty")));
+        assertEquals(expectedHeaders[3], String.valueOf(headers.get("ValueBlank")));
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/libraries/Sarissa0993Test.java
 ===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/libraries/Sarissa0993Test.java	2017-03-27 \
                10:38:49 UTC (rev 13930)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/libraries/Sarissa0993Test.java	2017-03-27 \
11:47:43 UTC (rev 13931) @@ -19,7 +19,6 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
@@ -52,10 +51,7 @@
 
         driver.findElement(By.xpath("//button")).click();
 
-        // the HtmlUnitDriver doesn't yet support alert()
-        if (!(driver instanceof HtmlUnitDriver)) {
-            driver.switchTo().alert().dismiss();
-        }
+        driver.switchTo().alert().dismiss();
 
         verify(driver, "SarissaTestCase", getExpectedAlerts()[0]);
         verify(driver, "XmlHttpRequestTestCase", getExpectedAlerts()[1]);


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
HtmlUnit-develop mailing list
HtmlUnit-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop


[prev in list] [next in list] [prev in thread] [next in thread]