[HtmlUnit] SVN: [8803] trunk/htmlunit/src

[<rb...@us...>]

Revision: 8803
          http://sourceforge.net/p/htmlunit/code/8803
Author:   rbri
Date:     2013-11-24 10:04:22 +0000 (Sun, 24 Nov 2013)
Log Message:
-----------
next fix for only-hash-jump determination all FF test are green now, some IE test are still NYI

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Event2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2013-11-24 07:41:53 UTC (rev 8802)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2013-11-24 10:04:22 UTC (rev 8803)
@@ -1933,6 +1933,7 @@
                 return;
             }
             final URL current = page.getUrl();
+            justHashJump = isHashJump && (url.getQuery() == null || url.getQuery().equals(current.getQuery()));
             if (!justHashJump && url.sameFile(current) && StringUtils.isNotEmpty(url.getRef())) {
                 justHashJump = true;
             }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java	2013-11-24 07:41:53 UTC (rev 8802)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java	2013-11-24 10:04:22 UTC (rev 8803)
@@ -348,7 +348,6 @@
      * @exception Exception If the test fails
      */
     @Test
-    @NotYetImplemented
     public void submitGetV_url_emptyHash() throws Exception {
         openUrlAndClickById(RELOAD_URL, "submitGetEmptyHashV", 1, PATHNAME, "");
     }
@@ -941,7 +940,6 @@
      * @exception Exception If the test fails
      */
     @Test
-    @NotYetImplemented
     public void jsSubmitGetV_url_emptyHash() throws Exception {
         openUrlAndClickById(RELOAD_URL, "jsSubmitGetEmptyHashV", 1, PATHNAME, "");
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Event2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Event2Test.java	2013-11-24 07:41:53 UTC (rev 8802)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Event2Test.java	2013-11-24 10:04:22 UTC (rev 8803)
@@ -137,7 +137,6 @@
      */
     @Test
     @Alerts()
-    @NotYetImplemented
     public void submitClick() throws Exception {
         final String firstSnippet = "       <input type='submit' name='clickMe' id='clickMe' size='2'\n";
         final String secondSnippet = ">\n";