htmlunit-develop Mailing List for HtmlUnit (Page 14)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 15495
          http://sourceforge.net/p/htmlunit/code/15495
Author:   rbri
Date:     2018-07-25 17:38:50 +0000 (Wed, 25 Jul 2018)
Log Message:
-----------
event listeners had to be functions, other types are ignored
Issue 1976

Modified Paths:
--------------
    trunk/htmlunit/src/changes/changes.xml
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainerTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java

Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================

--- trunk/htmlunit/src/changes/changes.xml	2018-07-22 17:37:11 UTC (rev 15494)
+++ trunk/htmlunit/src/changes/changes.xml	2018-07-25 17:38:50 UTC (rev 15495)
@@ -8,6 +8,9 @@
 
     <body>
         <release version="2.32" date="xx 2018" description="Bugfixes, FIREFOX_45 removed, FIREFOX_60 added">
+            <action type="fix" dev="rbri" issue="1976">
+                Event listeners had to be functions, other types are ignored.
+            </action>
             <action type="fix" dev="rbri">
                 Setting window.clientInformation is ignored in IE.
             </action>

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java	2018-07-22 17:37:11 UTC (rev 15494)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/ApplicationCache.java	2018-07-25 17:38:50 UTC (rev 15495)
@@ -29,8 +29,6 @@
 import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
 import com.gargoylesoftware.htmlunit.javascript.host.event.EventTarget;
 
-import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
-
 /**
  * <p>A collection of offline resources as defined in the HTML5 spec.
  * Intended to support offline web applications.</p>
@@ -224,10 +222,7 @@
     }
 
     private void setHandlerForJavaScript(final String eventName, final Object handler) {
-        if (handler == null || handler instanceof Scriptable) {
-            getEventListenersContainer().setEventHandler(eventName, handler);
-        }
-        // Otherwise, fail silently.
+        getEventListenersContainer().setEventHandler(eventName, handler);
     }
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java	2018-07-22 17:37:11 UTC (rev 15494)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java	2018-07-25 17:38:50 UTC (rev 15495)
@@ -32,7 +32,6 @@
 import com.gargoylesoftware.htmlunit.javascript.host.event.MessageEvent;
 
 import net.sourceforge.htmlunit.corejs.javascript.ContextFactory;
-import net.sourceforge.htmlunit.corejs.javascript.Function;
 
 /**
  * A JavaScript object for {@code MessagePort}.
@@ -82,10 +81,7 @@
     }
 
     private void setHandlerForJavaScript(final String eventName, final Object handler) {
-        if (handler == null || handler instanceof Function) {
-            getEventListenersContainer().setEventHandler(eventName, handler);
-        }
-        // Otherwise, fail silently.
+        getEventListenersContainer().setEventHandler(eventName, handler);
     }
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-07-22 17:37:11 UTC (rev 15494)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-07-25 17:38:50 UTC (rev 15495)
@@ -1194,7 +1194,7 @@
      */
     @JsxSetter
     public void setOnload(final Object onload) {
-        getEventListenersContainer().setEventHandler(Event.TYPE_LOAD, onload);
+        setHandlerForJavaScript(Event.TYPE_LOAD, onload);
     }
 
     /**
@@ -1203,7 +1203,7 @@
      */
     @JsxSetter
     public void setOnblur(final Object onblur) {
-        getEventListenersContainer().setEventHandler(Event.TYPE_BLUR, onblur);
+        setHandlerForJavaScript(Event.TYPE_BLUR, onblur);
     }
 
     /**
@@ -1377,10 +1377,7 @@
     }
 
     private void setHandlerForJavaScript(final String eventName, final Object handler) {
-        if (handler == null || handler instanceof Function) {
-            getEventListenersContainer().setEventHandler(eventName, handler);
-        }
-        // Otherwise, fail silently.
+        getEventListenersContainer().setEventHandler(eventName, handler);
     }
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java	2018-07-22 17:37:11 UTC (rev 15494)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainer.java	2018-07-25 17:38:50 UTC (rev 15495)
@@ -57,7 +57,7 @@
     static class TypeContainer implements Serializable {
         private List<Scriptable> capturingListeners_;
         private List<Scriptable> bubblingListeners_;
-        private Object handler_;
+        private Function handler_;
 
         TypeContainer() {
             capturingListeners_ = Collections.unmodifiableList(new ArrayList<Scriptable>());
@@ -65,7 +65,7 @@
         }
 
         private TypeContainer(final List<Scriptable> capturingListeners,
-                    final List<Scriptable> bubblingListeners, final Object handler) {
+                    final List<Scriptable> bubblingListeners, final Function handler) {
             capturingListeners_ = Collections.unmodifiableList(new ArrayList<>(capturingListeners));
             bubblingListeners_ = Collections.unmodifiableList(new ArrayList<>(bubblingListeners));
             handler_ = handler;
@@ -206,10 +206,15 @@
      * @param value the new property
      */
     public void setEventHandler(final String eventType, final Object value) {
-        Object handler = value;
-        if (handler == Undefined.instance) {
+        final Function handler;
+
+        // Otherwise, ignore silently.
+        if (value == Undefined.instance || !(value instanceof Function)) {
             handler = null;
         }
+        else {
+            handler = (Function) value;
+        }
 
         final TypeContainer container = getTypeContainer(eventType);
         container.handler_ = handler;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainerTest.java	2018-07-22 17:37:11 UTC (rev 15494)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventListenersContainerTest.java	2018-07-25 17:38:50 UTC (rev 15495)
@@ -25,6 +25,7 @@
  * Tests for {@link EventListenersContainer}.
  *
  * @author Ahmed Ashour
+ * @author Ronald Brill
  */
 @RunWith(BrowserRunner.class)
 public class EventListenersContainerTest extends WebDriverTestCase {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java	2018-07-22 17:37:11 UTC (rev 15494)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java	2018-07-25 17:38:50 UTC (rev 15495)
@@ -14,6 +14,8 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.worker;
 
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
+
 import java.net.URL;
 
 import org.junit.After;
@@ -23,6 +25,7 @@
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
+import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 
 /**
@@ -29,6 +32,7 @@
  * Unit tests for {@code Worker}.
  *
  * @author Marc Guillemot
+ * @author Ronald Brill
  */
 @RunWith(BrowserRunner.class)
 public class WorkerTest extends WebDriverTestCase {
@@ -164,4 +168,57 @@
 
         loadPageWithAlerts2(html);
     }
+
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts("function")
+    public void onmessageFunction() throws Exception {
+        final String html = "<html><body><script>\n"
+                + "  var myWorker = new Worker('worker.js');\n"
+                + "  myWorker.onmessage = function(e) {};\n"
+                + "  alert(typeof myWorker.onmessage);\n"
+                + "</script></body></html>\n";
+
+        loadPageWithAlerts2(html);
+    }
+
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts(DEFAULT = "null",
+            IE = "exception Error")
+    @NotYetImplemented(IE)
+    public void onmessageNumber() throws Exception {
+        final String html = "<html><body><script>\n"
+                + "  var myWorker = new Worker('worker.js');\n"
+                + "  try {\n"
+                + "    myWorker.onmessage = 17;\n"
+                + "    alert(myWorker.onmessage);\n"
+                + "  } catch(e) { alert('exception ' + e.name); }\n"
+                + "</script></body></html>\n";
+
+        loadPageWithAlerts2(html);
+    }
+
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts(DEFAULT = "null",
+            IE = "HtmlUnit")
+    @NotYetImplemented(IE)
+    public void onmessageString() throws Exception {
+        final String html = "<html><body><script>\n"
+                + "  var myWorker = new Worker('worker.js');\n"
+                + "  try {\n"
+                + "    myWorker.onmessage = 'HtmlUnit';\n"
+                + "    alert(myWorker.onmessage);\n"
+                + "  } catch(e) { alert('exception ' + e.name); }\n"
+                + "</script></body></html>\n";
+
+        loadPageWithAlerts2(html);
+    }
 }





2002	Jan	Feb	Mar	Apr	May	Jun	Jul (10)	Aug (30)	Sep (15)	Oct (26)	Nov (12)	Dec (17)
2003	Jan (7)	Feb (27)	Mar (73)	Apr (17)	May (17)	Jun (78)	Jul (67)	Aug (60)	Sep (89)	Oct (140)	Nov (173)	Dec (46)
2004	Jan (39)	Feb (7)	Mar (21)	Apr (31)	May (13)	Jun (86)	Jul (14)	Aug (14)	Sep (53)	Oct (184)	Nov (186)	Dec (319)
2005	Jan (336)	Feb (274)	Mar (226)	Apr (102)	May (196)	Jun (130)	Jul (119)	Aug (143)	Sep (76)	Oct (85)	Nov (70)	Dec (159)
2006	Jan (125)	Feb (100)	Mar (80)	Apr (39)	May (55)	Jun (58)	Jul (50)	Aug (76)	Sep (55)	Oct (101)	Nov (163)	Dec (85)
2007	Jan (56)	Feb (53)	Mar (180)	Apr (221)	May (290)	Jun (199)	Jul (322)	Aug (515)	Sep (121)	Oct (297)	Nov (177)	Dec (103)
2008	Jan (516)	Feb (315)	Mar (586)	Apr (615)	May (197)	Jun (381)	Jul (390)	Aug (195)	Sep (603)	Oct (499)	Nov (622)	Dec (350)
2009	Jan (313)	Feb (338)	Mar (507)	Apr (317)	May (197)	Jun (375)	Jul (235)	Aug (424)	Sep (410)	Oct (338)	Nov (286)	Dec (306)
2010	Jan (367)	Feb (339)	Mar (371)	Apr (172)	May (233)	Jun (264)	Jul (421)	Aug (110)	Sep (218)	Oct (189)	Nov (185)	Dec (168)
2011	Jan (145)	Feb (213)	Mar (205)	Apr (64)	May (159)	Jun (67)	Jul (104)	Aug (126)	Sep (144)	Oct (106)	Nov (154)	Dec (225)
2012	Jan (111)	Feb (87)	Mar (131)	Apr (102)	May (180)	Jun (160)	Jul (412)	Aug (315)	Sep (311)	Oct (369)	Nov (464)	Dec (284)
2013	Jan (343)	Feb (165)	Mar (174)	Apr (120)	May (153)	Jun (134)	Jul (202)	Aug (105)	Sep (228)	Oct (332)	Nov (192)	Dec (219)
2014	Jan (348)	Feb (194)	Mar (189)	Apr (188)	May (297)	Jun (206)	Jul (79)	Aug (279)	Sep (111)	Oct (159)	Nov (61)	Dec (78)
2015	Jan (152)	Feb (145)	Mar (239)	Apr (223)	May (248)	Jun (296)	Jul (172)	Aug (189)	Sep (338)	Oct (217)	Nov (131)	Dec (184)
2016	Jan (118)	Feb (221)	Mar (414)	Apr (412)	May (303)	Jun (133)	Jul (129)	Aug (121)	Sep (136)	Oct (67)	Nov (89)	Dec (245)
2017	Jan (349)	Feb (90)	Mar (328)	Apr (430)	May (284)	Jun (199)	Jul (164)	Aug (120)	Sep (57)	Oct (105)	Nov (108)	Dec (146)
2018	Jan (85)	Feb (48)	Mar (97)	Apr (62)	May (64)	Jun (136)	Jul (123)	Aug (87)	Sep (17)	Oct (27)	Nov (9)	Dec (16)
2019	Jan (9)	Feb (17)	Mar (18)	Apr (14)	May (8)	Jun	Jul (6)	Aug (12)	Sep (5)	Oct	Nov (2)	Dec
2020	Jan (8)	Feb	Mar (6)	Apr	May	Jun	Jul (2)	Aug	Sep (4)	Oct (1)	Nov	Dec
2021	Jan	Feb	Mar	Apr (2)	May (4)	Jun	Jul	Aug	Sep	Oct (1)	Nov (4)	Dec
2022	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2023	Jan	Feb (6)	Mar (9)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2024	Jan	Feb	Mar	Apr	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

htmlunit-develop Mailing List for HtmlUnit (Page 14)

Java GUI-Less browser, supporting JavaScript, to run against web pages

htmlunit-develop — General discussion of the development of HtmlUnit