From 249a1dbe68d0140d7c2183ab68dc549fb6316735 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 23 Oct 2015 11:17:05 +0200 Subject: [PATCH] Move selenium package to util.selenium package --- .../administration/BulkDeletionTest.java | 2 +- .../ProjectAdministrationTest.java | 2 +- .../administration/PropertySetsTest.java | 2 +- .../administration/SubCategoriesTest.java | 2 +- .../administration/suite/ui/I18nTest.java | 2 +- .../suite/measure/MeasureFiltersTest.java | 2 +- .../java/issue/suite/ManualRulesTest.java | 2 +- .../QualityGateNotificationTest.java | 2 +- .../src/test/java/server/ServerTest.java | 2 +- .../suite/ServerAdministrationTest.java | 2 +- .../test/java/server/suite/ServerTest.java | 2 +- .../java/updatecenter/UpdateCenterTest.java | 2 +- .../java/{ => util}/selenium/Browser.java | 2 +- .../selenium/ByCssSelectorOrByNameOrById.java | 9 +++--- .../java/{ => util}/selenium/Consumer.java | 2 +- .../{ => util}/selenium/ElementFilter.java | 5 ++-- .../java/{ => util}/selenium/Failure.java | 2 +- .../{ => util}/selenium/LazyDomElement.java | 13 ++++----- .../java/{ => util}/selenium/LazyShould.java | 28 +++++++++---------- .../java/{ => util}/selenium/Optional.java | 2 +- .../test/java/{ => util}/selenium/Retry.java | 7 ++--- .../{ => util}/selenium/SeleneseTest.java | 17 ++++++----- .../{ => util}/selenium/SeleniumDriver.java | 2 +- .../test/java/{ => util}/selenium/Text.java | 2 +- .../{ => util}/selenium/ThreadSafeDriver.java | 9 +++--- .../{ => util}/selenium/WebElementHelper.java | 2 +- 26 files changed, 60 insertions(+), 66 deletions(-) rename it/it-tests/src/test/java/{ => util}/selenium/Browser.java (98%) rename it/it-tests/src/test/java/{ => util}/selenium/ByCssSelectorOrByNameOrById.java (99%) rename it/it-tests/src/test/java/{ => util}/selenium/Consumer.java (97%) rename it/it-tests/src/test/java/{ => util}/selenium/ElementFilter.java (98%) rename it/it-tests/src/test/java/{ => util}/selenium/Failure.java (98%) rename it/it-tests/src/test/java/{ => util}/selenium/LazyDomElement.java (99%) rename it/it-tests/src/test/java/{ => util}/selenium/LazyShould.java (90%) rename it/it-tests/src/test/java/{ => util}/selenium/Optional.java (98%) rename it/it-tests/src/test/java/{ => util}/selenium/Retry.java (99%) rename it/it-tests/src/test/java/{ => util}/selenium/SeleneseTest.java (99%) rename it/it-tests/src/test/java/{ => util}/selenium/SeleniumDriver.java (98%) rename it/it-tests/src/test/java/{ => util}/selenium/Text.java (98%) rename it/it-tests/src/test/java/{ => util}/selenium/ThreadSafeDriver.java (99%) rename it/it-tests/src/test/java/{ => util}/selenium/WebElementHelper.java (98%) diff --git a/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java b/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java index 739ca839477..6d9bea7e398 100644 --- a/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java +++ b/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java @@ -26,7 +26,7 @@ import com.sonar.orchestrator.selenium.Selenese; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/administration/suite/administration/ProjectAdministrationTest.java b/it/it-tests/src/test/java/administration/suite/administration/ProjectAdministrationTest.java index 0116963a3bc..d2a73d9fd93 100644 --- a/it/it-tests/src/test/java/administration/suite/administration/ProjectAdministrationTest.java +++ b/it/it-tests/src/test/java/administration/suite/administration/ProjectAdministrationTest.java @@ -42,7 +42,7 @@ import org.sonar.wsclient.qualitygate.UpdateCondition; import org.sonar.wsclient.services.PropertyQuery; import org.sonar.wsclient.services.ResourceQuery; import org.sonar.wsclient.user.UserParameters; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/administration/suite/administration/PropertySetsTest.java b/it/it-tests/src/test/java/administration/suite/administration/PropertySetsTest.java index 9d12033afc0..e24b9b08bd0 100644 --- a/it/it-tests/src/test/java/administration/suite/administration/PropertySetsTest.java +++ b/it/it-tests/src/test/java/administration/suite/administration/PropertySetsTest.java @@ -26,7 +26,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.wsclient.services.PropertyQuery; import org.sonar.wsclient.services.PropertyUpdateQuery; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/it/it-tests/src/test/java/administration/suite/administration/SubCategoriesTest.java b/it/it-tests/src/test/java/administration/suite/administration/SubCategoriesTest.java index bdaa258983e..e733108ada0 100644 --- a/it/it-tests/src/test/java/administration/suite/administration/SubCategoriesTest.java +++ b/it/it-tests/src/test/java/administration/suite/administration/SubCategoriesTest.java @@ -26,7 +26,7 @@ import com.sonar.orchestrator.selenium.Selenese; import org.junit.ClassRule; import org.junit.Test; import org.sonar.wsclient.services.PropertyQuery; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java b/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java index 13bd5808066..ceaae083974 100644 --- a/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java +++ b/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java @@ -27,7 +27,7 @@ import com.sonar.orchestrator.selenium.Selenese; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java index d46717c3065..db4aec15f98 100644 --- a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java +++ b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java @@ -29,7 +29,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.wsclient.SonarClient; import org.sonar.wsclient.user.UserParameters; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/issue/suite/ManualRulesTest.java b/it/it-tests/src/test/java/issue/suite/ManualRulesTest.java index 7efb925dcea..e7ded7a6f62 100644 --- a/it/it-tests/src/test/java/issue/suite/ManualRulesTest.java +++ b/it/it-tests/src/test/java/issue/suite/ManualRulesTest.java @@ -27,7 +27,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; public class ManualRulesTest { diff --git a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java b/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java index c2f8450d7d2..ad6d638dcfa 100644 --- a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java +++ b/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java @@ -24,8 +24,8 @@ import org.sonar.wsclient.services.Resource; import org.sonar.wsclient.services.ResourceQuery; import org.subethamail.wiser.Wiser; import org.subethamail.wiser.WiserMessage; -import selenium.SeleneseTest; import util.ItUtils; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.projectDir; diff --git a/it/it-tests/src/test/java/server/ServerTest.java b/it/it-tests/src/test/java/server/ServerTest.java index 95a2956ed97..9c4bc971939 100644 --- a/it/it-tests/src/test/java/server/ServerTest.java +++ b/it/it-tests/src/test/java/server/ServerTest.java @@ -19,8 +19,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.wsclient.services.Server; import org.sonar.wsclient.services.ServerQuery; -import selenium.SeleneseTest; import util.ItUtils; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java b/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java index 617899891d0..b2d85d657c2 100644 --- a/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java +++ b/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java @@ -22,7 +22,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.wsclient.services.Server; import org.sonar.wsclient.services.ServerQuery; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/it/it-tests/src/test/java/server/suite/ServerTest.java b/it/it-tests/src/test/java/server/suite/ServerTest.java index 57ab6c3b33f..27a2aeab267 100644 --- a/it/it-tests/src/test/java/server/suite/ServerTest.java +++ b/it/it-tests/src/test/java/server/suite/ServerTest.java @@ -23,8 +23,8 @@ import org.junit.rules.ExpectedException; import org.sonar.wsclient.base.HttpException; import org.sonar.wsclient.services.PropertyDeleteQuery; import org.sonar.wsclient.services.PropertyUpdateQuery; -import selenium.SeleneseTest; import util.ItUtils; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java b/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java index d42907bfb85..790883b9e34 100644 --- a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java +++ b/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java @@ -13,7 +13,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.wsclient.services.Plugin; import org.sonar.wsclient.services.UpdateCenterQuery; -import selenium.SeleneseTest; +import util.selenium.SeleneseTest; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.pluginArtifact; diff --git a/it/it-tests/src/test/java/selenium/Browser.java b/it/it-tests/src/test/java/util/selenium/Browser.java similarity index 98% rename from it/it-tests/src/test/java/selenium/Browser.java rename to it/it-tests/src/test/java/util/selenium/Browser.java index 42a98e900f8..8d687f66d7c 100644 --- a/it/it-tests/src/test/java/selenium/Browser.java +++ b/it/it-tests/src/test/java/util/selenium/Browser.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import org.openqa.selenium.firefox.FirefoxDriver; diff --git a/it/it-tests/src/test/java/selenium/ByCssSelectorOrByNameOrById.java b/it/it-tests/src/test/java/util/selenium/ByCssSelectorOrByNameOrById.java similarity index 99% rename from it/it-tests/src/test/java/selenium/ByCssSelectorOrByNameOrById.java rename to it/it-tests/src/test/java/util/selenium/ByCssSelectorOrByNameOrById.java index e510210cd15..8edc9efacfa 100644 --- a/it/it-tests/src/test/java/selenium/ByCssSelectorOrByNameOrById.java +++ b/it/it-tests/src/test/java/util/selenium/ByCssSelectorOrByNameOrById.java @@ -17,8 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; +import java.io.Serializable; +import java.util.Collections; +import java.util.List; import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebElement; @@ -26,10 +29,6 @@ import org.openqa.selenium.internal.FindsByCssSelector; import org.openqa.selenium.internal.FindsById; import org.openqa.selenium.internal.FindsByName; -import java.io.Serializable; -import java.util.Collections; -import java.util.List; - public class ByCssSelectorOrByNameOrById extends By implements Serializable { private static final long serialVersionUID = -3910258723099459239L; diff --git a/it/it-tests/src/test/java/selenium/Consumer.java b/it/it-tests/src/test/java/util/selenium/Consumer.java similarity index 97% rename from it/it-tests/src/test/java/selenium/Consumer.java rename to it/it-tests/src/test/java/util/selenium/Consumer.java index d50e570cea7..4bdee4b6ab3 100644 --- a/it/it-tests/src/test/java/selenium/Consumer.java +++ b/it/it-tests/src/test/java/util/selenium/Consumer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; public interface Consumer { void accept(T t); diff --git a/it/it-tests/src/test/java/selenium/ElementFilter.java b/it/it-tests/src/test/java/util/selenium/ElementFilter.java similarity index 98% rename from it/it-tests/src/test/java/selenium/ElementFilter.java rename to it/it-tests/src/test/java/util/selenium/ElementFilter.java index b4a069ae004..cad64ee82b0 100644 --- a/it/it-tests/src/test/java/selenium/ElementFilter.java +++ b/it/it-tests/src/test/java/util/selenium/ElementFilter.java @@ -17,12 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import com.google.common.base.Function; -import org.openqa.selenium.WebElement; - import java.util.Collection; +import org.openqa.selenium.WebElement; class ElementFilter { private static final ElementFilter ANY = new ElementFilter("", new Function, Collection>() { diff --git a/it/it-tests/src/test/java/selenium/Failure.java b/it/it-tests/src/test/java/util/selenium/Failure.java similarity index 98% rename from it/it-tests/src/test/java/selenium/Failure.java rename to it/it-tests/src/test/java/util/selenium/Failure.java index 2225ebbc793..d4b4ba2a247 100644 --- a/it/it-tests/src/test/java/selenium/Failure.java +++ b/it/it-tests/src/test/java/util/selenium/Failure.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import java.util.ArrayList; import java.util.List; diff --git a/it/it-tests/src/test/java/selenium/LazyDomElement.java b/it/it-tests/src/test/java/util/selenium/LazyDomElement.java similarity index 99% rename from it/it-tests/src/test/java/selenium/LazyDomElement.java rename to it/it-tests/src/test/java/util/selenium/LazyDomElement.java index dcf2ee2f363..cdaf402c2aa 100644 --- a/it/it-tests/src/test/java/selenium/LazyDomElement.java +++ b/it/it-tests/src/test/java/util/selenium/LazyDomElement.java @@ -17,22 +17,21 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; +import java.util.Collection; +import java.util.List; +import java.util.NoSuchElementException; +import javax.annotation.Nullable; import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.Select; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.List; -import java.util.NoSuchElementException; - class LazyDomElement { private final SeleniumDriver driver; private final By selector; @@ -169,4 +168,4 @@ class LazyDomElement { public String toString() { return Text.toString(selector) + filter.getDescription(); } -} \ No newline at end of file +} diff --git a/it/it-tests/src/test/java/selenium/LazyShould.java b/it/it-tests/src/test/java/util/selenium/LazyShould.java similarity index 90% rename from it/it-tests/src/test/java/selenium/LazyShould.java rename to it/it-tests/src/test/java/util/selenium/LazyShould.java index c344ba70e2a..17a5f39d23f 100644 --- a/it/it-tests/src/test/java/selenium/LazyShould.java +++ b/it/it-tests/src/test/java/util/selenium/LazyShould.java @@ -17,19 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; -import com.google.common.base.*; +import com.google.common.base.Function; +import com.google.common.base.Joiner; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; -import org.openqa.selenium.WebElement; - -import javax.annotation.Nullable; import java.util.List; import java.util.NoSuchElementException; import java.util.regex.Pattern; - -import static selenium.Text.plural; -import static selenium.WebElementHelper.text; +import javax.annotation.Nullable; +import org.openqa.selenium.WebElement; class LazyShould { private final LazyDomElement element; @@ -78,7 +78,7 @@ class LazyShould { return !elements.isEmpty() && FluentIterable.from(elements).anyMatch(new Predicate() { @Override public boolean apply(WebElement element) { - return regexp.matcher(text(element)).matches(); + return regexp.matcher(WebElementHelper.text(element)).matches(); } }); } @@ -90,7 +90,7 @@ class LazyShould { @Nullable @Override public String apply(@Nullable WebElement element) { - return text(element); + return WebElementHelper.text(element); } }); } @@ -107,9 +107,9 @@ class LazyShould { @Override public boolean apply(@Nullable WebElement element) { if (text.startsWith("exact:")) { - return text(element).equals(text.substring(6)); + return WebElementHelper.text(element).equals(text.substring(6)); } - return text(element).contains(text); + return WebElementHelper.text(element).contains(text); } }); } @@ -120,7 +120,7 @@ class LazyShould { return "It contains " + statuses(elements, new Function() { @Override public String apply(WebElement element) { - return text(element); + return WebElementHelper.text(element); } }); } @@ -139,7 +139,7 @@ class LazyShould { new Function, String>() { @Override public String apply(List elements) { - return "It contains " + plural(elements.size(), "element"); + return "It contains " + Text.plural(elements.size(), "element"); } }); } diff --git a/it/it-tests/src/test/java/selenium/Optional.java b/it/it-tests/src/test/java/util/selenium/Optional.java similarity index 98% rename from it/it-tests/src/test/java/selenium/Optional.java rename to it/it-tests/src/test/java/util/selenium/Optional.java index ed4b626bc2e..35d97a05e67 100644 --- a/it/it-tests/src/test/java/selenium/Optional.java +++ b/it/it-tests/src/test/java/util/selenium/Optional.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import java.util.NoSuchElementException; diff --git a/it/it-tests/src/test/java/selenium/Retry.java b/it/it-tests/src/test/java/util/selenium/Retry.java similarity index 99% rename from it/it-tests/src/test/java/selenium/Retry.java rename to it/it-tests/src/test/java/util/selenium/Retry.java index cc13823546d..089642c0d7d 100644 --- a/it/it-tests/src/test/java/selenium/Retry.java +++ b/it/it-tests/src/test/java/util/selenium/Retry.java @@ -17,18 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import com.google.common.base.Predicate; import com.google.common.base.Supplier; +import java.util.NoSuchElementException; +import java.util.concurrent.TimeUnit; import org.openqa.selenium.InvalidElementStateException; import org.openqa.selenium.NotFoundException; import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebDriverException; -import java.util.NoSuchElementException; -import java.util.concurrent.TimeUnit; - import static java.util.concurrent.TimeUnit.SECONDS; class Retry { diff --git a/it/it-tests/src/test/java/selenium/SeleneseTest.java b/it/it-tests/src/test/java/util/selenium/SeleneseTest.java similarity index 99% rename from it/it-tests/src/test/java/selenium/SeleneseTest.java rename to it/it-tests/src/test/java/util/selenium/SeleneseTest.java index 1c5de9446bc..51e3371faa6 100644 --- a/it/it-tests/src/test/java/selenium/SeleneseTest.java +++ b/it/it-tests/src/test/java/util/selenium/SeleneseTest.java @@ -17,10 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.selenium.Selenese; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Pattern; import org.assertj.core.util.Strings; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -29,18 +35,11 @@ import org.openqa.selenium.By; import org.openqa.selenium.NotFoundException; import org.openqa.selenium.WebElement; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Pattern; - import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; import static java.util.regex.Pattern.DOTALL; import static org.assertj.core.api.Assertions.assertThat; -import static selenium.Retry._30_SECONDS; +import static util.selenium.Retry._30_SECONDS; public class SeleneseTest { private final Selenese suite; diff --git a/it/it-tests/src/test/java/selenium/SeleniumDriver.java b/it/it-tests/src/test/java/util/selenium/SeleniumDriver.java similarity index 98% rename from it/it-tests/src/test/java/selenium/SeleniumDriver.java rename to it/it-tests/src/test/java/util/selenium/SeleniumDriver.java index 7a60acf8172..5b0392a9652 100644 --- a/it/it-tests/src/test/java/selenium/SeleniumDriver.java +++ b/it/it-tests/src/test/java/util/selenium/SeleniumDriver.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; public interface SeleniumDriver extends org.openqa.selenium.WebDriver, org.openqa.selenium.JavascriptExecutor, org.openqa.selenium.internal.FindsById, org.openqa.selenium.internal.FindsByClassName, org.openqa.selenium.internal.FindsByLinkText, org.openqa.selenium.internal.FindsByName, org.openqa.selenium.internal.FindsByCssSelector, org.openqa.selenium.internal.FindsByTagName, org.openqa.selenium.internal.FindsByXPath, org.openqa.selenium.interactions.HasInputDevices, org.openqa.selenium.HasCapabilities, org.openqa.selenium.TakesScreenshot { } diff --git a/it/it-tests/src/test/java/selenium/Text.java b/it/it-tests/src/test/java/util/selenium/Text.java similarity index 98% rename from it/it-tests/src/test/java/selenium/Text.java rename to it/it-tests/src/test/java/util/selenium/Text.java index aba0f42454f..2dba5cb5366 100644 --- a/it/it-tests/src/test/java/selenium/Text.java +++ b/it/it-tests/src/test/java/util/selenium/Text.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import com.google.common.base.Joiner; import org.openqa.selenium.By; diff --git a/it/it-tests/src/test/java/selenium/ThreadSafeDriver.java b/it/it-tests/src/test/java/util/selenium/ThreadSafeDriver.java similarity index 99% rename from it/it-tests/src/test/java/selenium/ThreadSafeDriver.java rename to it/it-tests/src/test/java/util/selenium/ThreadSafeDriver.java index 1f507cb5c3b..abe92e43eae 100644 --- a/it/it-tests/src/test/java/selenium/ThreadSafeDriver.java +++ b/it/it-tests/src/test/java/util/selenium/ThreadSafeDriver.java @@ -17,10 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; - -import org.openqa.selenium.remote.RemoteWebDriver; -import org.openqa.selenium.remote.UnreachableBrowserException; +package util.selenium; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -29,6 +26,8 @@ import java.lang.reflect.Proxy; import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; +import org.openqa.selenium.remote.RemoteWebDriver; +import org.openqa.selenium.remote.UnreachableBrowserException; class ThreadSafeDriver { private ThreadSafeDriver() { @@ -78,4 +77,4 @@ class ThreadSafeDriver { return interfaces.toArray(new Class[interfaces.size()]); } -} \ No newline at end of file +} diff --git a/it/it-tests/src/test/java/selenium/WebElementHelper.java b/it/it-tests/src/test/java/util/selenium/WebElementHelper.java similarity index 98% rename from it/it-tests/src/test/java/selenium/WebElementHelper.java rename to it/it-tests/src/test/java/util/selenium/WebElementHelper.java index 0d7a8ed810f..99ef6cf650d 100644 --- a/it/it-tests/src/test/java/selenium/WebElementHelper.java +++ b/it/it-tests/src/test/java/util/selenium/WebElementHelper.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package selenium; +package util.selenium; import org.openqa.selenium.WebElement; -- 2.39.5