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

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

Revision: 15029
          http://sourceforge.net/p/htmlunit/code/15029
Author:   rbri
Date:     2017-12-21 07:59:03 +0000 (Thu, 21 Dec 2017)
Log Message:
-----------
make our test suite working again and som cleanup (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java	2017-12-20 20:23:05 UTC (rev 15028)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/MockWebConnection.java	2017-12-21 07:59:03 UTC (rev 15029)
@@ -178,12 +178,17 @@
         requestCount_++;
         requestedUrls_.add(url);
 
-        RawResponseData rawResponse = responseMap_.get(url.toExternalForm());
+        String urlString = url.toExternalForm();
+        final int queryStart = urlString.lastIndexOf('?');
+        if (queryStart > -1) {
+            urlString = urlString.substring(0, queryStart);
+        }
+        RawResponseData rawResponse = responseMap_.get(urlString);
         if (rawResponse == null) {
             rawResponse = defaultResponse_;
             if (rawResponse == null) {
                 throw new IllegalStateException("No response specified that can handle URL ["
-                    + url.toExternalForm()
+                    + urlString
                     + "]");
             }
         }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java	2017-12-20 20:23:05 UTC (rev 15028)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java	2017-12-21 07:59:03 UTC (rev 15029)
@@ -693,14 +693,6 @@
     }
 
     /**
-     * Sets the mock WebConnection instance for the current test.
-     * @param connection the connection to use
-     */
-    protected void setMockWebConnection(final MockWebConnection connection) {
-        mockWebConnection_ = connection;
-    }
-
-    /**
      * Cleanup after a test.
      */
     @After

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java	2017-12-20 20:23:05 UTC (rev 15028)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java	2017-12-21 07:59:03 UTC (rev 15029)
@@ -872,7 +872,7 @@
         assertEquals(2, getMockWebConnection().getRequestCount());
 
         assertEquals(HttpMethod.GET, getMockWebConnection().getLastWebRequest().getHttpMethod());
-        assertEquals(URL_FIRST + "a.html", getMockWebConnection().getLastWebRequest().getUrl());
+        assertEquals(URL_FIRST + "a.html?p1=sieben&p2", getMockWebConnection().getLastWebRequest().getUrl());
 
         final List<NameValuePair> params = getMockWebConnection().getLastWebRequest().getRequestParameters();
         assertEquals(2, params.size());
@@ -920,7 +920,7 @@
         assertEquals(3, getMockWebConnection().getRequestCount());
 
         assertEquals(HttpMethod.POST, getMockWebConnection().getLastWebRequest().getHttpMethod());
-        assertEquals(URL_SECOND + "a.html", getMockWebConnection().getLastWebRequest().getUrl());
+        assertEquals(URL_SECOND + "a.html?urlParam=urlVal", getMockWebConnection().getLastWebRequest().getUrl());
 
         final List<NameValuePair> params = getMockWebConnection().getLastWebRequest().getRequestParameters();
         assertEquals(4, params.size());

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java	2017-12-20 20:23:05 UTC (rev 15028)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java	2017-12-21 07:59:03 UTC (rev 15029)
@@ -166,7 +166,7 @@
     @Test
     @Alerts("")
     public void submitClick() throws Exception {
-        final String firstSnippet = "       <input type='submit' name='clickMe' id='clickMe' size='2'\n";
+        final String firstSnippet = "       <input type='submit' name='clickMe' id='clickMe'\n";
         final String secondSnippet = ">\n";
 
         testClickEvents(firstSnippet, secondSnippet);
@@ -180,7 +180,7 @@
     @Alerts(DEFAULT = "[object MouseEvent] click b:true c:true [clickMe] [1]",
             IE = "[object PointerEvent] click b:true c:true [clickMe] [1]")
     public void resetClick() throws Exception {
-        final String firstSnippet = "       <input type='reset' name='clickMe' id='clickMe' size='2'\n";
+        final String firstSnippet = "       <input type='reset' name='clickMe' id='clickMe'\n";
         final String secondSnippet = ">\n";
 
         testClickEvents(firstSnippet, secondSnippet);
@@ -194,7 +194,7 @@
     @Alerts(DEFAULT = "[object MouseEvent] click b:true c:true [clickMe] [1]",
             IE = "[object PointerEvent] click b:true c:true [clickMe] [1]")
     public void buttonClick() throws Exception {
-        final String firstSnippet = "       <input type='button' name='clickMe' id='clickMe' size='2'\n";
+        final String firstSnippet = "       <input type='button' name='clickMe' id='clickMe'\n";
         final String secondSnippet = ">\n";
 
         testClickEvents(firstSnippet, secondSnippet);
@@ -208,7 +208,7 @@
     @Alerts(DEFAULT = "[object MouseEvent] click b:true c:true [clickMe] [1]",
             IE = "[object PointerEvent] click b:true c:true [clickMe] [1]")
     public void anchorClick() throws Exception {
-        final String firstSnippet = "       <a href='#' name='clickMe' id='clickMe' size='2'\n";
+        final String firstSnippet = "       <a href='#' name='clickMe' id='clickMe'\n";
         final String secondSnippet = ">anchor</a>\n";
 
         testClickEvents(firstSnippet, secondSnippet);