test jsx getter and function return types

HtmlUnit · Oct 16, 2024 · 08de80d · 08de80d
1 parent 759fa09
commit 08de80d
Show file tree

Hide file tree

Showing 8 changed files with 282 additions and 63 deletions.
diff --git a/checkstyle_suppressions.xml b/checkstyle_suppressions.xml
@@ -15,6 +15,7 @@
     <suppress checks="JavadocPackage" files=".*Test.java|StandardsMode.java|StandardsMode.java|ElementTestSource.java|BrowserStatement.java|Patch.java|BrowserVersionClassRunnerWithParameters.java|ToRunWithRealBrowsers.java|PatchedHtmlUnitKeyboard.java|CanvasRenderingContext2D2Test2.java"/>
     <suppress checks="JavadocMethod" files="HtmlDomTreeWalker.java" />
 
+    <suppress checks="LineLength" files="ArchitectureTest.java"/>
     <suppress checks="LineLength" files="BrowserVersion.java"/>
     <suppress checks="LineLength" files="JavaScriptEngine.java"/>
     <suppress checks="LineLength" files="EncodingSniffer.java"/>

diff --git a/src/main/java/org/htmlunit/javascript/host/MessagePort.java b/src/main/java/org/htmlunit/javascript/host/MessagePort.java
@@ -18,6 +18,7 @@
 
 import org.htmlunit.Page;
 import org.htmlunit.WebWindow;
+import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.javascript.AbstractJavaScriptEngine;
 import org.htmlunit.javascript.HtmlUnitContextFactory;
 import org.htmlunit.javascript.PostponedAction;
@@ -71,7 +72,7 @@ public MessagePort(final MessagePort port) {
      * @return the value of the window's {@code onmessage} property
      */
     @JsxGetter
-    public Object getOnmessage() {
+    public Function getOnmessage() {
         return getHandlerForJavaScript(Event.TYPE_MESSAGE);
     }
 
@@ -84,7 +85,7 @@ public void setOnmessage(final Object onmessage) {
         setHandlerForJavaScript(Event.TYPE_MESSAGE, onmessage);
     }
 
-    private Object getHandlerForJavaScript(final String eventName) {
+    private Function getHandlerForJavaScript(final String eventName) {
         return getEventListenersContainer().getEventHandler(eventName);
     }
 

diff --git a/src/main/java/org/htmlunit/javascript/host/Window.java b/src/main/java/org/htmlunit/javascript/host/Window.java
@@ -1233,7 +1233,7 @@ public void scrollTo(final Scriptable x, final Scriptable y) {
      * @return the {@code onload} property
      */
     @JsxGetter
-    public Object getOnload() {
+    public Function getOnload() {
         return getEventHandler(Event.TYPE_LOAD);
     }
 
@@ -1260,7 +1260,7 @@ public void setOnblur(final Object onblur) {
      * @return the {@code onblur} property
      */
     @JsxGetter
-    public Object getOnblur() {
+    public Function getOnblur() {
         return getEventHandler(Event.TYPE_BLUR);
     }
 
@@ -1269,7 +1269,7 @@ public Object getOnblur() {
      * @return the {@code onclick} property
      */
     @JsxGetter
-    public Object getOnclick() {
+    public Function getOnclick() {
         return getEventHandler(MouseEvent.TYPE_CLICK);
     }
 
@@ -1287,7 +1287,7 @@ public void setOnclick(final Object onclick) {
      * @return the {@code ondblclick} property
      */
     @JsxGetter
-    public Object getOndblclick() {
+    public Function getOndblclick() {
         return getEventHandler(MouseEvent.TYPE_DBL_CLICK);
     }
 
@@ -1305,7 +1305,7 @@ public void setOndblclick(final Object ondblclick) {
      * @return the {@code onhashchange} property
      */
     @JsxGetter
-    public Object getOnhashchange() {
+    public Function getOnhashchange() {
         return getEventHandler(Event.TYPE_HASH_CHANGE);
     }
 
@@ -1341,7 +1341,7 @@ public void setName(final String name) {
      * @return the value of the window's {@code onbeforeunload} property
      */
     @JsxGetter
-    public Object getOnbeforeunload() {
+    public Function getOnbeforeunload() {
         return getEventHandler(Event.TYPE_BEFORE_UNLOAD);
     }
 
@@ -1359,7 +1359,7 @@ public void setOnbeforeunload(final Object onbeforeunload) {
      * @return the value of the window's {@code onerror} property
      */
     @JsxGetter
-    public Object getOnerror() {
+    public Function getOnerror() {
         return getEventHandler(Event.TYPE_ERROR);
     }
 
@@ -1377,7 +1377,7 @@ public void setOnerror(final Object onerror) {
      * @return the value of the window's {@code onmessage} property
      */
     @JsxGetter
-    public Object getOnmessage() {
+    public Function getOnmessage() {
         return getEventHandler(Event.TYPE_MESSAGE);
     }
 
@@ -1907,7 +1907,7 @@ public boolean dispatchEvent(final Event event) {
      * @return the handler
      */
     @JsxGetter
-    public Object getOnchange() {
+    public Function getOnchange() {
         return getEventHandler(Event.TYPE_CHANGE);
     }
 
@@ -1925,7 +1925,7 @@ public void setOnchange(final Object onchange) {
      * @return the handler
      */
     @JsxGetter
-    public Object getOnsubmit() {
+    public Function getOnsubmit() {
         return getEventHandler(Event.TYPE_SUBMIT);
     }
 

diff --git a/src/main/java/org/htmlunit/javascript/host/dom/Document.java b/src/main/java/org/htmlunit/javascript/host/dom/Document.java
@@ -1344,7 +1344,7 @@ public void setOnclick(final Object handler) {
      * @return the {@code onclick} event handler for this element
      */
     @JsxGetter
-    public Object getOnclick() {
+    public Function getOnclick() {
         return getEventHandler(MouseEvent.TYPE_CLICK);
     }
 
@@ -1362,7 +1362,7 @@ public void setOndblclick(final Object handler) {
      * @return the {@code ondblclick} event handler for this element
      */
     @JsxGetter
-    public Object getOndblclick() {
+    public Function getOndblclick() {
         return getEventHandler(MouseEvent.TYPE_DBL_CLICK);
     }
 
@@ -1380,7 +1380,7 @@ public void setOnblur(final Object handler) {
      * @return the {@code onblur} event handler for this element
      */
     @JsxGetter
-    public Object getOnblur() {
+    public Function getOnblur() {
         return getEventHandler(Event.TYPE_BLUR);
     }
 
@@ -1398,7 +1398,7 @@ public void setOnfocus(final Object handler) {
      * @return the {@code onfocus} event handler for this element
      */
     @JsxGetter
-    public Object getOnfocus() {
+    public Function getOnfocus() {
         return getEventHandler(Event.TYPE_FOCUS);
     }
 
@@ -1416,7 +1416,7 @@ public void setOnkeydown(final Object handler) {
      * @return the {@code onkeydown} event handler for this element
      */
     @JsxGetter
-    public Object getOnkeydown() {
+    public Function getOnkeydown() {
         return getEventHandler(Event.TYPE_KEY_DOWN);
     }
 
@@ -1434,7 +1434,7 @@ public void setOnkeypress(final Object handler) {
      * @return the {@code onkeypress} event handler for this element
      */
     @JsxGetter
-    public Object getOnkeypress() {
+    public Function getOnkeypress() {
         return getEventHandler(Event.TYPE_KEY_PRESS);
     }
 
@@ -1452,7 +1452,7 @@ public void setOnkeyup(final Object handler) {
      * @return the {@code onkeyup} event handler for this element
      */
     @JsxGetter
-    public Object getOnkeyup() {
+    public Function getOnkeyup() {
         return getEventHandler(Event.TYPE_KEY_UP);
     }
 
@@ -1470,7 +1470,7 @@ public void setOnmousedown(final Object handler) {
      * @return the {@code onmousedown} event handler for this element
      */
     @JsxGetter
-    public Object getOnmousedown() {
+    public Function getOnmousedown() {
         return getEventHandler(MouseEvent.TYPE_MOUSE_DOWN);
     }
 
@@ -1488,7 +1488,7 @@ public void setOnmousemove(final Object handler) {
      * @return the {@code onmousemove} event handler for this element
      */
     @JsxGetter
-    public Object getOnmousemove() {
+    public Function getOnmousemove() {
         return getEventHandler(MouseEvent.TYPE_MOUSE_MOVE);
     }
 
@@ -1506,7 +1506,7 @@ public void setOnmouseout(final Object handler) {
      * @return the {@code onmouseout} event handler for this element
      */
     @JsxGetter
-    public Object getOnmouseout() {
+    public Function getOnmouseout() {
         return getEventHandler(MouseEvent.TYPE_MOUSE_OUT);
     }
 
@@ -1524,7 +1524,7 @@ public void setOnmouseover(final Object handler) {
      * @return the {@code onmouseover} event handler for this element
      */
     @JsxGetter
-    public Object getOnmouseover() {
+    public Function getOnmouseover() {
         return getEventHandler(MouseEvent.TYPE_MOUSE_OVER);
     }
 
@@ -1542,7 +1542,7 @@ public void setOnmouseup(final Object handler) {
      * @return the {@code onmouseup} event handler for this element
      */
     @JsxGetter
-    public Object getOnmouseup() {
+    public Function getOnmouseup() {
         return getEventHandler(MouseEvent.TYPE_MOUSE_UP);
     }
 
@@ -1560,7 +1560,7 @@ public void setOncontextmenu(final Object handler) {
      * @return the {@code oncontextmenu} event handler for this element
      */
     @JsxGetter
-    public Object getOncontextmenu() {
+    public Function getOncontextmenu() {
         return getEventHandler(MouseEvent.TYPE_CONTEXT_MENU);
     }
 
@@ -1578,7 +1578,7 @@ public void setOnresize(final Object handler) {
      * @return the {@code onresize} event handler for this element
      */
     @JsxGetter
-    public Object getOnresize() {
+    public Function getOnresize() {
         return getEventHandler(Event.TYPE_RESIZE);
     }
 
@@ -1596,7 +1596,7 @@ public void setOnerror(final Object handler) {
      * @return the {@code onerror} event handler for this element
      */
     @JsxGetter
-    public Object getOnerror() {
+    public Function getOnerror() {
         return getEventHandler(Event.TYPE_ERROR);
     }
 

diff --git a/src/main/java/org/htmlunit/javascript/host/html/HTMLBodyElement.java b/src/main/java/org/htmlunit/javascript/host/html/HTMLBodyElement.java
@@ -213,7 +213,7 @@ public int getClientWidth() {
      */
     @Override
     @JsxGetter({CHROME, EDGE})
-    public Object getOnload() {
+    public Function getOnload() {
         return super.getOnload();
     }
 
@@ -240,7 +240,7 @@ public void setOnblur(final Object handler) {
      */
     @Override
     @JsxGetter({CHROME, EDGE})
-    public Object getOnblur() {
+    public Function getOnblur() {
         return super.getOnblur();
     }
 
@@ -258,7 +258,7 @@ public void setOnfocus(final Object handler) {
      */
     @Override
     @JsxGetter({CHROME, EDGE})
-    public Object getOnfocus() {
+    public Function getOnfocus() {
         return super.getOnfocus();
     }
 
@@ -276,7 +276,7 @@ public void setOnerror(final Object handler) {
      */
     @Override
     @JsxGetter({CHROME, EDGE})
-    public Object getOnerror() {
+    public Function getOnerror() {
         return super.getOnerror();
     }