Use local date, remove workarounds

zbynek · zbynek · commit 51dc80430d91 · 2025-04-25T00:25:31.000+02:00
diff --git a/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java b/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java
@@ -185,15 +185,6 @@ public boolean connect(String url, String sessionKey, String address,
       return false;
     }
     // TODO: add whitelist and default-port support?
-
-    // We know that legacy dev mode is running, we need to tell HtmlUnit that it is safe
-    // to permit plain Java objects to leak into JS - the JavaObject type will return a
-    // Object[] with a success boolean and a value, and HtmlUnit will guard against this.
-    // The simplest way to do that here is to mark java.lang.Object as the java equivalent
-    // of some JS type - the name of the type doesn't matter.
-    // webClient.setActiveXObjectMap(Collections.singletonMap(
-    //        "GwtLegacyDevModeExceptionOrReturnValue", "java.lang.Object"));
-
     try {
       HtmlUnitSessionHandler htmlUnitSessionHandler = new HtmlUnitSessionHandler(
           window, jsEngine, webClient);
diff --git a/user/src/com/google/gwt/junit/BrowserOption.java b/user/src/com/google/gwt/junit/BrowserOption.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 GWT Project Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.junit;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Browser options that may be set independently for each test.class.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(BrowserOption.BrowserOptionList.class)
+@Target(ElementType.TYPE)
+public @interface BrowserOption {
+  OptionType type();
+  String value();
+
+  /**
+   * Allows setting multiple browser properties for a single class.
+   */
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.TYPE)
+  @interface BrowserOptionList {
+    BrowserOption[] value();
+  }
+
+  enum OptionType {
+    TIMEZONE, LANGUAGE
+  }
+}
diff --git a/user/src/com/google/gwt/junit/JUnitShell.java b/user/src/com/google/gwt/junit/JUnitShell.java
@@ -154,7 +154,7 @@ private static class ArgHandlerRunCompiledJavascript extends ArgHandlerFlag {
 
     private JUnitShell shell;
 
-    public ArgHandlerRunCompiledJavascript(JUnitShell shell) {
+    ArgHandlerRunCompiledJavascript(JUnitShell shell) {
       this.shell = shell;
 
       addTagValue("-web", false);
@@ -187,7 +187,7 @@ private static class ArgHandlerShowWindows extends ArgHandlerFlag {
 
     private JUnitShell shell;
 
-    public ArgHandlerShowWindows(JUnitShell shell) {
+    ArgHandlerShowWindows(JUnitShell shell) {
       this.shell = shell;
 
       addTagValue("-notHeadless", true);
@@ -218,7 +218,7 @@ public boolean getDefaultValue() {
   static class ArgProcessor extends ArgProcessorBase {
 
     @SuppressWarnings("deprecation")
-    public ArgProcessor(final JUnitShell shell) {
+    ArgProcessor(final JUnitShell shell) {
       final HostedModeOptions options = shell.options;
       /*
        * ----- Options from DevModeBase -------
@@ -636,7 +636,7 @@ public static Set<String> getRemoteUserAgents() {
   }
 
   /**
-   * Get the compiler options
+   * Get the compiler options.
    *
    * @return the compiler options that have been set.
    */
@@ -1378,6 +1378,8 @@ private void runTestImpl(GWTTestCase testCase, TestResult testResult,
 
     try {
       if (!runStyleStarted) {
+        runStyle.resetOptions();
+        getOptions(testCase.getClass());
         runStyle.launchModule(currentModule.getName());
       }
     } catch (UnableToCompleteException e) {
@@ -1425,6 +1427,23 @@ private void runTestImpl(GWTTestCase testCase, TestResult testResult,
     processTestResult(testCase, testResult);
   }
 
+  private void getOptions(Class<?> testClass) {
+    if (testClass.getSuperclass() != null) {
+      getOptions(testClass.getSuperclass());
+    }
+    if (testClass.isAnnotationPresent(BrowserOption.class)) {
+      BrowserOption option = testClass.getAnnotation(BrowserOption.class);
+      runStyle.setOption(option.type(), option.value());
+    }
+    if (testClass.isAnnotationPresent(BrowserOption.BrowserOptionList.class)) {
+      BrowserOption.BrowserOptionList optionList = testClass
+          .getAnnotation(BrowserOption.BrowserOptionList.class);
+      for (BrowserOption option: optionList.value()) {
+        runStyle.setOption(option.type(), option.value());
+      }
+    }
+  }
+
   /**
    * Synthesize command line arguments from a system property.
    */
diff --git a/user/src/com/google/gwt/junit/RunStyle.java b/user/src/com/google/gwt/junit/RunStyle.java
@@ -19,6 +19,7 @@
 import com.google.gwt.core.ext.UnableToCompleteException;
 
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Set;
 
 /**
@@ -34,6 +35,8 @@ public abstract class RunStyle {
   private int tries = 1;
 
   private Set<String> userAgents;
+  protected EnumMap<BrowserOption.OptionType, String> options
+      = new EnumMap<>(BrowserOption.OptionType.class);
 
   /**
    * Constructor for RunStyle. Any subclass must provide a constructor with the
@@ -158,4 +161,20 @@ public boolean shouldAutoGenerateResources() {
   protected TreeLogger getLogger() {
     return shell.getTopLogger();
   }
+
+  /**
+   * Set browser option for the next test class.
+   * @param type option type
+   * @param value option value
+   */
+  public void setOption(BrowserOption.OptionType type, String value) {
+    options.put(type, value);
+  }
+
+  /**
+   * Reset all browser options.
+   */
+  public void resetOptions() {
+    options.clear();
+  }
 }
diff --git a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
@@ -20,8 +20,6 @@
 import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
 import com.google.gwt.thirdparty.guava.common.collect.Maps;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.htmlunit.AlertHandler;
 import org.htmlunit.BrowserVersion;
 import org.htmlunit.FailingHttpStatusCodeException;
@@ -31,9 +29,6 @@
 import org.htmlunit.ScriptException;
 import org.htmlunit.WebClient;
 import org.htmlunit.WebWindow;
-import org.htmlunit.corejs.javascript.Context;
-import org.htmlunit.corejs.javascript.Function;
-import org.htmlunit.corejs.javascript.JavaScriptException;
 import org.htmlunit.corejs.javascript.ScriptableObject;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.javascript.JavaScriptEngine;
@@ -67,15 +62,18 @@ protected static class HtmlUnitThread extends Thread implements AlertHandler,
     private final boolean developmentMode;
     private final TreeLogger treeLogger;
     private final String url;
+    private final Map<BrowserOption.OptionType, String> properties;
     private Object waitForUnload = new Object();
 
     public HtmlUnitThread(BrowserVersion browser, String url,
-        TreeLogger treeLogger, boolean developmentMode) {
+                          TreeLogger treeLogger, boolean developmentMode,
+                          Map<BrowserOption.OptionType, String> properties) {
       this.browser = browser;
       this.url = url;
       this.treeLogger = treeLogger;
       this.setName("htmlUnit client thread");
       this.developmentMode = developmentMode;
+      this.properties = properties;
     }
 
     public void handleAlert(Page page, String message) {
@@ -177,7 +175,7 @@ protected void setupWebClient(WebClient webClient) {
             treeLogger);
         webClient.setJavaScriptEngine(hostedEngine);
       } else {
-        JavaScriptEngine webEngine = new WebJavaScriptEngine(webClient);
+        JavaScriptEngine webEngine = new JavaScriptEngine(webClient);
         webClient.setJavaScriptEngine(webEngine);
       }
       if (System.getProperty("gwt.htmlunit.debug") != null) {
@@ -207,85 +205,12 @@ private static class HostedJavaScriptEngine extends JavaScriptEngine {
     public void initialize(WebWindow webWindow, Page page) {
       // Hook in the hosted-mode plugin after initializing the JS engine.
       super.initialize(webWindow, page);
-      Window window = (Window) webWindow.getScriptableObject();
+      Window window = webWindow.getScriptableObject();
       window.defineProperty("__gwt_HostedModePlugin",
           new HostedModePluginObject(this, webClient, logger), ScriptableObject.READONLY);
     }
   }
 
-  /**
-   * JavaScriptEngine subclass that fixes a bug when calling {@code window.onerror}.
-   * Make sure to remove when updating HtmlUnit.
-   *
-   * @see <a href="https://sourceforge.net/p/htmlunit/bugs/1924/">HtmlUnit bug #1924</a>
-   */
-  private static class WebJavaScriptEngine extends JavaScriptEngine {
-    private static final Log LOG = LogFactory.getLog(JavaScriptEngine.class);
-    private final WebClient webClient;
-
-    WebJavaScriptEngine(WebClient webClient) {
-      super(webClient);
-      this.webClient = webClient;
-    }
-
-    @Override
-    protected void handleJavaScriptException(ScriptException scriptException,
-        boolean triggerOnError) {
-      // XXX(tbroyer): copied from JavaScriptEngine to call below triggerOnError
-      // instead of Window's triggerOnError.
-
-      // Trigger window.onerror, if it has been set.
-      final HtmlPage page = scriptException.getPage();
-      if (triggerOnError && page != null) {
-        final WebWindow window = page.getEnclosingWindow();
-        if (window != null) {
-          final Window w = (Window) window.getScriptableObject();
-          if (w != null) {
-            try {
-              triggerOnError(w, scriptException);
-            } catch (final Exception e) {
-              handleJavaScriptException(new ScriptException(page, e, null), false);
-            }
-          }
-        }
-      }
-      final JavaScriptErrorListener javaScriptErrorListener =
-              webClient.getJavaScriptErrorListener();
-      if (javaScriptErrorListener != null) {
-        javaScriptErrorListener.scriptException(page, scriptException);
-      }
-      // Throw a Java exception if the user wants us to.
-      if (webClient.getOptions().isThrowExceptionOnScriptError()) {
-        throw scriptException;
-      }
-      // Log the error; ScriptException instances provide good debug info.
-      LOG.info("Caught script exception", scriptException);
-    }
-
-    private void triggerOnError(Window w, ScriptException e) {
-      // XXX(tbroyer): copied from HtmlUnit's javascript.host.Window
-      // with fix unwrapping the JS exception before passing it back to JS.
-      final Object o = w.getOnerror();
-      if (o instanceof Function) {
-        final Function f = (Function) o;
-        final String msg = e.getMessage();
-        final String url = e.getPage().getUrl().toExternalForm();
-        final int line = e.getFailingLineNumber();
-
-        final int column = e.getFailingColumnNumber();
-
-        Object jsError = null;
-        if (e.getCause() instanceof JavaScriptException) {
-          jsError = ((JavaScriptException) e.getCause()).getValue();
-        }
-
-        Object[] args = new Object[]{msg, url, line, column, jsError};
-
-        f.call(Context.getCurrentContext(), w, w, args);
-      }
-    }
-  }
-
   private static final Map<String, BrowserVersion> BROWSER_MAP = Maps.newHashMap();
   private static final Map<BrowserVersion, String> USER_AGENT_MAP  = Maps.newHashMap();
 
@@ -297,9 +222,7 @@ private void triggerOnError(Window w, ScriptException e) {
     addBrowser(BrowserVersion.CHROME, "safari");
   }
 
-  private static void addBrowser(BrowserVersion baseBrowser, String userAgent) {
-    BrowserVersion browser = new BrowserVersion.BrowserVersionBuilder(baseBrowser)
-        .setSystemTimezone(TimeZone.getDefault()).build();
+  private static void addBrowser(BrowserVersion browser, String userAgent) {
     BROWSER_MAP.put(browser.getNickname(), browser);
     USER_AGENT_MAP.put(browser, userAgent);
   }
@@ -357,7 +280,19 @@ public int initialize(String args) {
 
   @Override
   public void launchModule(String moduleName) {
-    for (BrowserVersion browser : browsers) {
+    for (BrowserVersion baseBrowser : browsers) {
+      BrowserVersion.BrowserVersionBuilder builder
+          = new BrowserVersion.BrowserVersionBuilder(baseBrowser);
+      if (options.containsKey(BrowserOption.OptionType.TIMEZONE)) {
+        builder.setSystemTimezone(TimeZone.getTimeZone(
+            options.get(BrowserOption.OptionType.TIMEZONE)));
+      } else {
+        builder.setSystemTimezone(TimeZone.getDefault());
+      }
+      if (options.containsKey(BrowserOption.OptionType.LANGUAGE)) {
+        builder.setBrowserLanguage(options.get(BrowserOption.OptionType.LANGUAGE));
+      }
+      BrowserVersion browser = builder.build();
       String url = shell.getModuleUrl(moduleName);
       HtmlUnitThread hut = createHtmlUnitThread(browser, url);
       TreeLogger logger = shell.getTopLogger();
@@ -387,6 +322,6 @@ public boolean setupMode(TreeLogger logger, boolean developmentMode) {
   protected HtmlUnitThread createHtmlUnitThread(BrowserVersion browser,
       String url) {
     return new HtmlUnitThread(browser, url, shell.getTopLogger().branch(
-        TreeLogger.SPAM, "logging for HtmlUnit thread"), developmentMode);
+        TreeLogger.SPAM, "logging for HtmlUnit thread"), developmentMode, options);
   }
 }
diff --git a/user/test/com/google/gwt/emultest/java/util/DateTest.java b/user/test/com/google/gwt/emultest/java/util/DateTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.gwt.emultest.java.util;
 
+import com.google.gwt.junit.BrowserOption;
 import com.google.gwt.junit.client.GWTTestCase;
 import com.google.gwt.testing.TestUtils;
 
@@ -25,6 +26,8 @@
  * Tests for GWT's emulation of the JRE Date class.
  */
 @SuppressWarnings("deprecation")
+@BrowserOption(type = BrowserOption.OptionType.TIMEZONE,
+ value = "GMT")
 public class DateTest extends GWTTestCase {
   public static final String CURRENT = "CURRENT";
   public static final String TO_STRING_PATTERN =
@@ -581,7 +584,7 @@ public void testToLocaleString() {
       Date accum2 = create(FUTURE);
       String a2 = accum2.toLocaleString();
       assertTrue(a2 + " should describe 12/30/2030",
-          a2.contains("2030") || a2.contains("12/30/2030"));
+          a2.contains("2030") || a2.contains("12/30/30"));
     }
   }
 
