fix toString conversion

Author: rbri

src/main/java/org/htmlunit/javascript/host/intl/Locale.java

@@ -100,13 +100,7 @@ public static Scriptable jsConstructor(final Context cx, final Scriptable scope,
             throw JavaScriptEngine.typeError("Invalid element in locales argument");
         }
 
-        final String languageTag;
-        if (args[0] instanceof Locale loc) {
-            languageTag = loc.toString();
-        }
-        else {
-            languageTag = JavaScriptEngine.toString(args[0]);
-        }
+        final String languageTag = JavaScriptEngine.toString(args[0]);
         if (languageTag.isEmpty()) {
             throw JavaScriptEngine.rangeError("Invalid language tag: ");
         }
@@ -123,8 +117,7 @@ public static Scriptable jsConstructor(final Context cx, final Scriptable scope,
 
         // Override by options if present
         if (args.length > 1 && !JavaScriptEngine.isUndefined(args[1])) {
-            locale = overrideExistingWithOptions(locale,
-                    ScriptableObject.ensureScriptableObject(args[1]));
+            locale = overrideExistingWithOptions(locale, ScriptableObject.ensureScriptableObject(args[1]));
         }
 
         final Locale l = new Locale(locale);
@@ -341,10 +334,21 @@ public Locale minimize() {
      * @return the locale's Unicode locale identifier string
      */
     @JsxFunction(functionName = "toString")
-    public String js_toString() {
+    public String jsToString() {
         if (locale_ == null) {
             return super.toString();
         }
         return locale_.toLanguageTag();
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Object getDefaultValue(final Class<?> hint) {
+        if (getPrototype() != null && (String.class.equals(hint) || hint == null)) {
+            return jsToString();
+        }
+        return super.getDefaultValue(hint);
+    }
 }

src/test/java/org/htmlunit/javascript/host/intl/LocaleTest.java

@@ -230,22 +230,28 @@ public void invalidOptions() throws Exception {
      */
     @Test
     @Alerts({"ja-Jpan-JP-u-ca-japanese-hc-h12",
+             "xja-Jpan-JP-u-ca-japanese-hc-h12",
              "ja-u-ca-japanese-hc-h12",
              "ja-Jpan-JP-u-ca-japanese-hc-h12",
              "ja-Jpan-JP"})
-    @HtmlUnitNYI(CHROME = {"ja-Jpan-JP-u-ca-japanese-hc-h12",
-                           "ja-u-ca-japanese-hc-h12",
-                           "ja-JP-u-ca-japanese-hc-h12",
-                           "ja-Jpan-JP"},
+    @HtmlUnitNYI(
+            CHROME = {"ja-Jpan-JP-u-ca-japanese-hc-h12",
+                      "xja-Jpan-JP-u-ca-japanese-hc-h12",
+                      "ja-u-ca-japanese-hc-h12",
+                      "ja-JP-u-ca-japanese-hc-h12",
+                      "ja-Jpan-JP"},
             EDGE = {"ja-Jpan-JP-u-ca-japanese-hc-h12",
+                    "xja-Jpan-JP-u-ca-japanese-hc-h12",
                     "ja-u-ca-japanese-hc-h12",
                     "ja-JP-u-ca-japanese-hc-h12",
                     "ja-Jpan-JP"},
             FF = {"ja-Jpan-JP-u-ca-japanese-hc-h12",
+                  "xja-Jpan-JP-u-ca-japanese-hc-h12",
                   "ja-u-ca-japanese-hc-h12",
                   "ja-JP-u-ca-japanese-hc-h12",
                   "ja-Jpan-JP"},
             FF_ESR = {"ja-Jpan-JP-u-ca-japanese-hc-h12",
+                      "xja-Jpan-JP-u-ca-japanese-hc-h12",
                       "ja-u-ca-japanese-hc-h12",
                       "ja-JP-u-ca-japanese-hc-h12",
                       "ja-Jpan-JP"})
@@ -257,6 +263,7 @@ public void minimizeMaximize() throws Exception {
             + "  function test() {\n"
             + "    var l = new Intl.Locale('ja-Jpan-JP-u-ca-japanese-hc-h12');\n"
             + "    log(l.toString());\n"
+            + "    log('x' + l);\n"
             + "    log(l.minimize().toString());\n"
             + "    log(new Intl.Locale('ja-u-ca-japanese-hc-h12').maximize().toString());\n"
             + "    log(l.baseName);\n"