more concrete return values

HtmlUnit · Nov 13, 2024 · 3d0d279 · 3d0d279
1 parent 6fd3acf
commit 3d0d279
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/src/main/java/org/htmlunit/css/AbstractCssStyleDeclaration.java b/src/main/java/org/htmlunit/css/AbstractCssStyleDeclaration.java
@@ -969,7 +969,7 @@ public String getWordSpacing() {
      * Gets the {@code zIndex} style attribute.
      * @return the style attribute
      */
-    public Object getZIndex() {
+    public String getZIndex() {
         final String value = getStyleAttribute(Definition.Z_INDEX_, true);
         try {
             Integer.parseInt(value);

diff --git a/src/main/java/org/htmlunit/css/ComputedCssStyleDeclaration.java b/src/main/java/org/htmlunit/css/ComputedCssStyleDeclaration.java
@@ -1155,9 +1155,9 @@ public String getWordSpacing() {
      * {@inheritDoc}
      */
     @Override
-    public Object getZIndex() {
-        final Object response = super.getZIndex();
-        if (response.toString().isEmpty()) {
+    public String getZIndex() {
+        final String response = super.getZIndex();
+        if (response.isEmpty()) {
             return AUTO;
         }
         return response;

diff --git a/src/main/java/org/htmlunit/javascript/host/Window.java b/src/main/java/org/htmlunit/javascript/host/Window.java
@@ -2146,7 +2146,7 @@ public SpeechSynthesis getSpeechSynthesis() {
      * @return the {@code offscreenBuffering} property
      */
     @JsxGetter({CHROME, EDGE})
-    public Object getOffscreenBuffering() {
+    public boolean getOffscreenBuffering() {
         return true;
     }
 
@@ -3807,7 +3807,7 @@ public void put(final String name, final Scriptable start, final Object value) {
      * @return a boolean indicating whether the current context is secure (true) or not (false).
      */
     @JsxGetter
-    public Object getIsSecureContext() {
+    public boolean getIsSecureContext() {
         final Page page = getWebWindow().getEnclosedPage();
         if (page != null) {
             final String protocol = page.getUrl().getProtocol();

diff --git a/src/main/java/org/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java b/src/main/java/org/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java
@@ -113,7 +113,7 @@ public void setGlobalAlpha(final double globalAlpha) {
      * @return the {@code fillStyle} property
      */
     @JsxGetter
-    public Object getFillStyle() {
+    public HtmlUnitScriptable getFillStyle() {
         LOG.info("CanvasRenderingContext2D.getFillStyle() not yet implemented");
         return null;
     }
@@ -132,7 +132,7 @@ public void setFillStyle(final String fillStyle) {
      * @return the {@code strokeStyle} property
      */
     @JsxGetter
-    public Object getStrokeStyle() {
+    public HtmlUnitScriptable getStrokeStyle() {
         LOG.info("CanvasRenderingContext2D.getStrokeStyle() not yet implemented");
         return null;
     }

diff --git a/src/main/java/org/htmlunit/javascript/host/css/CSSStyleDeclaration.java b/src/main/java/org/htmlunit/javascript/host/css/CSSStyleDeclaration.java
@@ -1755,7 +1755,7 @@ public void setWordSpacing(final Object wordSpacing) {
      * @return the style attribute
      */
     @JsxGetter
-    public Object getZIndex() {
+    public String getZIndex() {
         if (styleDeclaration_ == null) {
             return null; // prototype
         }

diff --git a/src/main/java/org/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java b/src/main/java/org/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
@@ -516,7 +516,7 @@ public String getWordSpacing() {
      * {@inheritDoc}
      */
     @Override
-    public Object getZIndex() {
+    public String getZIndex() {
         return getCssStyleDeclaration().getZIndex();
     }
 

diff --git a/src/test/java/org/htmlunit/archunit/ArchitectureTest.java b/src/test/java/org/htmlunit/archunit/ArchitectureTest.java
@@ -195,18 +195,11 @@ public boolean test(final JavaClass javaClass) {
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getControllers()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getEvent()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getFrames_js()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getIsSecureContext()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getLength()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getOffscreenBuffering()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getOpener()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getParent()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getSelf()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.Window.getTop()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.canvas.CanvasRenderingContext2D.getFillStyle()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.canvas.CanvasRenderingContext2D.getGlobalAlpha()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.canvas.CanvasRenderingContext2D.getLineWidth()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.canvas.CanvasRenderingContext2D.getStrokeStyle()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.css.CSSStyleDeclaration.getZIndex()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.dom.AbstractRange.getEndContainer()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.dom.AbstractRange.getStartContainer()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.dom.CharacterData.getData()")