ProgressEvent: properties loaded and total are numeric

rbri · rbri · commit e445c58762ad · 2026-03-13T15:57:00.000+01:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,12 @@
 
     <body>
         <release version="5.0.0" date="April 01, 2026" description="jdk17, Bugfixes">
+            <action type="update" dev="rbri">
+                ProgressEvent: properties loaded and total are numeric.
+            </action>
+            <action type="fix" dev="rbri">
+                Intl: getCanonicalLocales() processes arguments as array-likes in sync with the spec.
+            </action>
             <action type="add" dev="Lai Quang Duong">
                 FileReader: fire ProgressEvent and add missing event handlers
             </action>
diff --git a/src/main/java/org/htmlunit/javascript/host/event/ProgressEvent.java b/src/main/java/org/htmlunit/javascript/host/event/ProgressEvent.java
@@ -32,8 +32,8 @@
 public class ProgressEvent extends Event {
 
     private boolean lengthComputable_;
-    private Object loaded_ = Long.valueOf(0L);
-    private long total_;
+    private double loaded_;
+    private double total_;
 
     /**
      * Default constructor.
@@ -60,36 +60,10 @@ public void jsConstructor(final String type, final ScriptableObject details) {
             }
 
             final Object loaded = details.get("loaded");
-            if (loaded instanceof Long) {
-                loaded_ = loaded;
-            }
-            else if (loaded instanceof Double double1) {
-                loaded_ = double1.longValue();
-            }
-            else {
-                try {
-                    loaded_ = Long.parseLong(loaded.toString());
-                }
-                catch (final NumberFormatException ignored) {
-                    // ignore
-                }
-            }
+            loaded_ = JavaScriptEngine.toNumber(loaded);
 
             final Object total = details.get("total");
-            if (total instanceof Long long1) {
-                total_ = long1;
-            }
-            else if (total instanceof Double double1) {
-                total_ = double1.longValue();
-            }
-            else {
-                try {
-                    total_ = Long.parseLong(details.get("total").toString());
-                }
-                catch (final NumberFormatException ignored) {
-                    // ignore
-                }
-            }
+            total_ = JavaScriptEngine.toNumber(total);
         }
     }
 
@@ -99,7 +73,7 @@ else if (total instanceof Double double1) {
      * @param type the event type
      */
     public ProgressEvent(final EventTarget target, final String type) {
-        super(target, type);
+        this(target, type, false, 0d, 0d);
     }
 
     /**
@@ -111,7 +85,7 @@ public ProgressEvent(final EventTarget target, final String type) {
      * @param total the total number of bytes
      */
     public ProgressEvent(final EventTarget target, final String type,
-            final boolean lengthComputable, final long loaded, final long total) {
+            final boolean lengthComputable, final double loaded, final double total) {
         super(target, type);
         lengthComputable_ = lengthComputable;
         loaded_ = loaded;
@@ -141,7 +115,7 @@ public void setLengthComputable(final boolean lengthComputable) {
      * @return the loaded property from the event.
      */
     @JsxGetter
-    public Object getLoaded() {
+    public double getLoaded() {
         return loaded_;
     }
 
@@ -150,7 +124,7 @@ public Object getLoaded() {
      *
      * @param loaded the loaded information for this event
      */
-    public void setLoaded(final Object loaded) {
+    public void setLoaded(final double loaded) {
         loaded_ = loaded;
     }
 
@@ -159,7 +133,7 @@ public void setLoaded(final Object loaded) {
      * @return the total property from the event.
      */
     @JsxGetter
-    public long getTotal() {
+    public double getTotal() {
         return total_;
     }
 
@@ -168,7 +142,7 @@ public long getTotal() {
      *
      * @param total the total information for this event
      */
-    public void setTotal(final long total) {
+    public void setTotal(final double total) {
         total_ = total;
     }
 }
diff --git a/src/test/java/org/htmlunit/javascript/host/event/ProgressEventTest.java b/src/test/java/org/htmlunit/javascript/host/event/ProgressEventTest.java
@@ -90,6 +90,33 @@ public void create_ctorWithDetails() throws Exception {
         loadPageVerifyTitle2(html);
     }
 
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts({"[object ProgressEvent]", "test", "true", "false", "false", "true", "2.34", "66.6"})
+    public void create_ctorWithDetailsDouble() throws Exception {
+        final String html = DOCTYPE_HTML
+            + "<html><head><script>\n"
+            + LOG_TITLE_FUNCTION
+            + "  function test() {\n"
+            + "    try {\n"
+            + "      var event = new ProgressEvent('test', {\n"
+            + "        'bubbles': true,\n"
+            + "        'lengthComputable': true,\n"
+            + "        'loaded': 2.34,\n"
+            + "        'total': 66.6\n"
+            + "      });\n"
+            + "      dump(event);\n"
+            + "    } catch(e) { logEx(e) }\n"
+            + "  }\n"
+            + DUMP_EVENT_FUNCTION
+            + "</script></head><body onload='test()'>\n"
+            + "</body></html>";
+
+        loadPageVerifyTitle2(html);
+    }
+
     /**
      * @throws Exception if the test fails
      */
