cleanup

rbri · rbri · commit b9da659860e9 · 2025-06-18T17:47:22.000+02:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,9 @@
 
     <body>
         <release version="4.14.0" date="July xx, 2025" description="Chrome/Edge 137, Firefox 139, Bugfixes">
+            <action type="update" dev="rbri">
+                Test suite updated to junit 5 and cleaned up.
+            </action>
             <action type="add" dev="rbri">
                 The hidden attribute now supports the 'until-found' value.
             </action>
diff --git a/src/test/java/org/htmlunit/junit/SetExpectedAlertsBeforeTestExecutionCallback.java b/src/test/java/org/htmlunit/junit/SetExpectedAlertsBeforeTestExecutionCallback.java
@@ -66,10 +66,6 @@ public void beforeTestExecution(final ExtensionContext context) throws Exception
     private static void setAlerts(final WebTestCase webTestCase, final Method method) {
         final Alerts alerts = method.getAnnotation(Alerts.class);
         final BrowserVersion browserVersion = webTestCase.getBrowserVersion();
-        boolean realBrowser = false;
-        if (webTestCase instanceof WebDriverTestCase) {
-            realBrowser = ((WebDriverTestCase) webTestCase).useRealBrowser();
-        }
 
         String[] expectedAlerts = {};
         if (alerts != null) {
@@ -93,6 +89,10 @@ else if (browserVersion == BrowserVersion.CHROME) {
             }
         }
 
+        boolean realBrowser = false;
+        if (webTestCase instanceof WebDriverTestCase) {
+            realBrowser = ((WebDriverTestCase) webTestCase).useRealBrowser();
+        }
         if (realBrowser) {
             final BuggyWebDriver buggyWebDriver = method.getAnnotation(BuggyWebDriver.class);
             if (buggyWebDriver != null) {
diff --git a/src/test/java/org/htmlunit/junit/annotation/TestedBrowser.java b/src/test/java/org/htmlunit/junit/annotation/TestedBrowser.java
@@ -26,12 +26,12 @@ public enum TestedBrowser {
     /** Latest version of Chrome. */
     CHROME,
 
-    /** Edge. */
+    /** Latest version of Edge. */
     EDGE,
 
-    /** Firefox. */
+    /** Latest version of Firefox. */
     FF,
 
-    /** Firefox ESR. */
+    /** Latest version of Firefox ESR. */
     FF_ESR
 }
