organize imports

rbri · rbri · commit 4795cc40558d · 2023-04-07T17:13:16.000+02:00
diff --git a/src/main/java/org/openqa/selenium/htmlunit/AsyncScriptExecutor.java b/src/main/java/org/openqa/selenium/htmlunit/AsyncScriptExecutor.java
@@ -20,16 +20,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.openqa.selenium.ScriptTimeoutException;
-import org.openqa.selenium.UnhandledAlertException;
-import org.openqa.selenium.WebDriverException;
-
 import org.htmlunit.ScriptException;
 import org.htmlunit.ScriptResult;
-import org.htmlunit.html.HtmlPage;
-
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.NativeJavaObject;
+import org.htmlunit.html.HtmlPage;
+import org.openqa.selenium.ScriptTimeoutException;
+import org.openqa.selenium.UnhandledAlertException;
+import org.openqa.selenium.WebDriverException;
 
 /**
  * Injects an asynchronous script into the current page for execution. The
diff --git a/src/main/java/org/openqa/selenium/htmlunit/BrowserVersionDeterminer.java b/src/main/java/org/openqa/selenium/htmlunit/BrowserVersionDeterminer.java
@@ -17,11 +17,10 @@
 
 package org.openqa.selenium.htmlunit;
 
+import org.htmlunit.BrowserVersion;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.remote.Browser;
 
-import org.htmlunit.BrowserVersion;
-
 /**
  * Determine browser and its version.
  *
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitAlert.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitAlert.java
@@ -24,17 +24,16 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebWindow;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ElementNotInteractableException;
 import org.openqa.selenium.NoAlertPresentException;
 import org.openqa.selenium.UnexpectedAlertBehaviour;
 import org.openqa.selenium.UnhandledAlertException;
 
-import org.htmlunit.Page;
-import org.htmlunit.WebClient;
-import org.htmlunit.WebWindow;
-
 /**
  * Implementation of {@link Alert}.
  *
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitDriver.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitDriver.java
@@ -48,27 +48,6 @@
 
 import javax.net.ssl.SSLHandshakeException;
 
-import org.openqa.selenium.By;
-import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.HasCapabilities;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.NoSuchSessionException;
-import org.openqa.selenium.NoSuchWindowException;
-import org.openqa.selenium.Platform;
-import org.openqa.selenium.Proxy;
-import org.openqa.selenium.StaleElementReferenceException;
-import org.openqa.selenium.TimeoutException;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.WrapsElement;
-import org.openqa.selenium.htmlunit.w3.Action;
-import org.openqa.selenium.htmlunit.w3.Algorithms;
-import org.openqa.selenium.interactions.Interactive;
-import org.openqa.selenium.interactions.Sequence;
-import org.openqa.selenium.remote.Browser;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
 import org.htmlunit.BrowserVersion;
 import org.htmlunit.Page;
 import org.htmlunit.ProxyConfig;
@@ -86,6 +65,12 @@
 import org.htmlunit.WebWindow;
 import org.htmlunit.WebWindowEvent;
 import org.htmlunit.WebWindowListener;
+import org.htmlunit.corejs.javascript.Context;
+import org.htmlunit.corejs.javascript.IdScriptableObject;
+import org.htmlunit.corejs.javascript.NativeArray;
+import org.htmlunit.corejs.javascript.NativeObject;
+import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.Undefined;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.FrameWindow;
@@ -98,13 +83,26 @@
 import org.htmlunit.javascript.host.html.HTMLElement;
 import org.htmlunit.platform.AwtClipboardHandler;
 import org.htmlunit.util.UrlUtils;
-
-import org.htmlunit.corejs.javascript.Context;
-import org.htmlunit.corejs.javascript.IdScriptableObject;
-import org.htmlunit.corejs.javascript.NativeArray;
-import org.htmlunit.corejs.javascript.NativeObject;
-import org.htmlunit.corejs.javascript.Scriptable;
-import org.htmlunit.corejs.javascript.Undefined;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.HasCapabilities;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.NoSuchSessionException;
+import org.openqa.selenium.NoSuchWindowException;
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.Proxy;
+import org.openqa.selenium.StaleElementReferenceException;
+import org.openqa.selenium.TimeoutException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.WrapsElement;
+import org.openqa.selenium.htmlunit.w3.Action;
+import org.openqa.selenium.htmlunit.w3.Algorithms;
+import org.openqa.selenium.interactions.Interactive;
+import org.openqa.selenium.interactions.Sequence;
+import org.openqa.selenium.remote.Browser;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 /**
  * An implementation of {@link WebDriver} that drives
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitElementFinder.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitElementFinder.java
@@ -23,22 +23,21 @@
 import java.util.List;
 import java.util.Map;
 
-import org.htmlunit.cssparser.parser.CSSException;
-import org.openqa.selenium.By;
-import org.openqa.selenium.InvalidSelectorException;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import org.htmlunit.Page;
 import org.htmlunit.SgmlPage;
+import org.htmlunit.cssparser.parser.CSSException;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.DomNodeList;
 import org.htmlunit.html.HtmlAnchor;
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlPage;
+import org.openqa.selenium.By;
+import org.openqa.selenium.InvalidSelectorException;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebElement;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
  * @author Martin Bartoš
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitInputProcessor.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitInputProcessor.java
@@ -20,11 +20,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.htmlunit.html.DomElement;
 import org.openqa.selenium.htmlunit.w3.Action;
 import org.openqa.selenium.interactions.Coordinates;
 
-import org.htmlunit.html.DomElement;
-
 /**
  * A state machine to handle web diver input sequences. We have to analyze the
  * sequences and construct valid HtmlUnit actions out of them.
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitKeyboard.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitKeyboard.java
@@ -19,14 +19,13 @@
 
 import java.io.IOException;
 
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.WebDriverException;
-
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlFileInput;
 import org.htmlunit.html.HtmlInput;
 import org.htmlunit.html.HtmlNumberInput;
 import org.htmlunit.html.Keyboard;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.WebDriverException;
 
 /**
  * Implements keyboard operations using the HtmlUnit WebDriver.
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitKeyboardMapping.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitKeyboardMapping.java
@@ -20,9 +20,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openqa.selenium.Keys;
-
 import org.htmlunit.javascript.host.event.KeyboardEvent;
+import org.openqa.selenium.Keys;
 
 /**
  * Maps {@link Keys} to their {@link KeyboardEvent} constant.
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitMouse.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitMouse.java
@@ -20,6 +20,10 @@
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 
+import org.htmlunit.ScriptException;
+import org.htmlunit.html.DomElement;
+import org.htmlunit.html.HtmlOption;
+import org.htmlunit.javascript.host.event.MouseEvent;
 import org.openqa.selenium.ElementNotInteractableException;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.TimeoutException;
@@ -28,11 +32,6 @@
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.interactions.Coordinates;
 
-import org.htmlunit.ScriptException;
-import org.htmlunit.html.DomElement;
-import org.htmlunit.html.HtmlOption;
-import org.htmlunit.javascript.host.event.MouseEvent;
-
 /**
  * Implements mouse operations using the HtmlUnit WebDriver.
  *
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitOptions.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitOptions.java
@@ -23,18 +23,17 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.htmlunit.CookieManager;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.InvalidCookieDomainException;
 import org.openqa.selenium.UnableToSetCookieException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.logging.HtmlUnitLogs;
 import org.openqa.selenium.logging.Logs;
 
-import org.htmlunit.CookieManager;
-import org.htmlunit.Page;
-import org.htmlunit.WebClient;
-import org.htmlunit.html.HtmlPage;
-
 /**
  * Manages driver options.
  *
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitTargetLocator.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitTargetLocator.java
@@ -19,6 +19,15 @@
 
 import java.util.List;
 
+import org.htmlunit.Page;
+import org.htmlunit.WebWindow;
+import org.htmlunit.WebWindowNotFoundException;
+import org.htmlunit.html.BaseFrameElement;
+import org.htmlunit.html.DomElement;
+import org.htmlunit.html.FrameWindow;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlHtml;
+import org.htmlunit.html.HtmlPage;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoAlertPresentException;
@@ -31,16 +40,6 @@
 import org.openqa.selenium.WindowType;
 import org.openqa.selenium.WrapsElement;
 
-import org.htmlunit.Page;
-import org.htmlunit.WebWindow;
-import org.htmlunit.WebWindowNotFoundException;
-import org.htmlunit.html.BaseFrameElement;
-import org.htmlunit.html.DomElement;
-import org.htmlunit.html.FrameWindow;
-import org.htmlunit.html.HtmlElement;
-import org.htmlunit.html.HtmlHtml;
-import org.htmlunit.html.HtmlPage;
-
 /**
  * HtmlUnit target locator.
  *
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitTimeouts.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitTimeouts.java
@@ -20,9 +20,8 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import org.openqa.selenium.WebDriver;
-
 import org.htmlunit.WebClient;
+import org.openqa.selenium.WebDriver;
 
 /**
  * Class for timeouts managing.
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitWindow.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitWindow.java
@@ -17,13 +17,12 @@
 
 package org.openqa.selenium.htmlunit;
 
+import org.htmlunit.Page;
+import org.htmlunit.WebWindow;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebDriver;
 
-import org.htmlunit.Page;
-import org.htmlunit.WebWindow;
-
 /**
  *
  * @author Martin Bartoš
diff --git a/src/main/java/org/openqa/selenium/htmlunit/logging/HtmlUnitLogs.java b/src/main/java/org/openqa/selenium/htmlunit/logging/HtmlUnitLogs.java
@@ -23,14 +23,13 @@
 import java.util.Set;
 import java.util.logging.Level;
 
+import org.htmlunit.WebClient;
+import org.htmlunit.WebConsole.Logger;
 import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.LogEntry;
 import org.openqa.selenium.logging.LogType;
 import org.openqa.selenium.logging.Logs;
 
-import org.htmlunit.WebClient;
-import org.htmlunit.WebConsole.Logger;
-
 /**
  * An implementation of the {@link Logs} interface for HtmlUnit. At the moment
  * this is empty.
diff --git a/src/main/java/org/openqa/selenium/htmlunit/w3/Action.java b/src/main/java/org/openqa/selenium/htmlunit/w3/Action.java
@@ -17,15 +17,14 @@
 
 package org.openqa.selenium.htmlunit.w3;
 
+import org.htmlunit.html.DomElement;
 import org.openqa.selenium.htmlunit.HtmlUnitInputProcessor.HtmlUnitAction;
 import org.openqa.selenium.htmlunit.HtmlUnitInputProcessor.KeyDownHtmlUnitAction;
 import org.openqa.selenium.htmlunit.HtmlUnitInputProcessor.KeyUpHtmlUnitAction;
 import org.openqa.selenium.htmlunit.HtmlUnitInputProcessor.PointerDownHtmlUnitAction;
 import org.openqa.selenium.htmlunit.HtmlUnitInputProcessor.PointerMoveHtmlUnitAction;
 import org.openqa.selenium.htmlunit.HtmlUnitInputProcessor.PointerUpHtmlUnitAction;
 
-import org.htmlunit.html.DomElement;
-
 /**
  * An action object constructed with arguments id, type, and subtype is an
  * object with property id set to id, type set to type and subtype set to
diff --git a/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java b/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java
@@ -27,14 +27,13 @@
 import static org.openqa.selenium.htmlunit.HtmlUnitDriver.BROWSER_LANGUAGE_CAPABILITY;
 import static org.openqa.selenium.htmlunit.HtmlUnitDriver.JAVASCRIPT_ENABLED;
 
+import org.htmlunit.BrowserVersion;
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.Browser;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import org.htmlunit.BrowserVersion;
-
 /**
  * Test the determineBrowserVersion method.
  *
diff --git a/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitDriverTest.java b/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitDriverTest.java
@@ -21,6 +21,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.htmlunit.BrowserVersion;
+import org.htmlunit.WebClient;
 import org.junit.Test;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.Proxy;
@@ -29,9 +31,6 @@
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import org.htmlunit.BrowserVersion;
-import org.htmlunit.WebClient;
-
 /**
  * General tests for the HtmlUnitDriver.
  *
diff --git a/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitProxyTest.java b/src/test/java/org/openqa/selenium/htmlunit/HtmlUnitProxyTest.java
@@ -25,14 +25,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.htmlunit.ProxyConfig;
 import org.junit.Test;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.Proxy;
 import org.openqa.selenium.remote.Browser;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import org.htmlunit.ProxyConfig;
-
 /**
  * Test the proxy setting.
  *
diff --git a/src/test/java/org/openqa/selenium/htmlunit/WebDriverTestCase.java b/src/test/java/org/openqa/selenium/htmlunit/WebDriverTestCase.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/WebServerTestCase.java b/src/test/java/org/openqa/selenium/htmlunit/WebServerTestCase.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/WebTestCase.java b/src/test/java/org/openqa/selenium/htmlunit/WebTestCase.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/html/WebClient3Test.java b/src/test/java/org/openqa/selenium/htmlunit/html/WebClient3Test.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserParameterizedRunner.java b/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserParameterizedRunner.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserRunner.java b/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserRunner.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserStatement.java b/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserStatement.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserVersionClassRunner.java b/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserVersionClassRunner.java
diff --git a/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserVersionClassRunnerWithParameters.java b/src/test/java/org/openqa/selenium/htmlunit/junit/BrowserVersionClassRunnerWithParameters.java
