Moving last part of RC-related test code to com.thoughtworks.selenium…

… package
SeleniumHQ · Oct 30, 2014 · 429477a · 429477a
1 parent 279f3c4
commit 429477a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/java/client/test/com/thoughtworks/selenium/BaseSuite.java b/java/client/test/com/thoughtworks/selenium/BaseSuite.java
@@ -16,6 +16,8 @@
 
 package com.thoughtworks.selenium;
 
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
+
 import java.util.logging.Logger;
 
 import org.junit.ClassRule;
@@ -24,7 +26,6 @@
 import org.junit.rules.TestRule;
 import org.openqa.selenium.environment.GlobalTestEnvironment;
 import org.openqa.selenium.environment.TestEnvironment;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 public class BaseSuite {
 

diff --git a/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java b/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java
@@ -28,6 +28,7 @@
 import com.google.common.io.Files;
 import com.google.common.io.Resources;
 
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
 import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium;
 
 import org.junit.After;
@@ -51,7 +52,6 @@
 import org.openqa.selenium.testing.InProject;
 import org.openqa.selenium.testing.drivers.Browser;
 import org.openqa.selenium.testing.drivers.WebDriverBuilder;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java b/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java
@@ -21,13 +21,13 @@
 import com.thoughtworks.selenium.DefaultSelenium;
 import com.thoughtworks.selenium.Selenium;
 import com.thoughtworks.selenium.SeleniumException;
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 import java.net.MalformedURLException;
 import java.net.URL;

diff --git a/java/client/test/com/thoughtworks/selenium/StartTest.java b/java/client/test/com/thoughtworks/selenium/StartTest.java
@@ -19,6 +19,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -27,7 +29,6 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import org.openqa.selenium.v1.SeleniumTestEnvironment;
 
 import java.net.MalformedURLException;
 import java.net.URL;

diff --git a/...nqa/selenium/v1/CachedContentServlet.java → ...elenium/testing/CachedContentServlet.java b/...nqa/selenium/v1/CachedContentServlet.java → ...elenium/testing/CachedContentServlet.java
@@ -1,4 +1,4 @@
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.testing;
 
 import org.seleniumhq.jetty7.http.HttpFields;
 

diff --git a/...openqa/selenium/v1/SeleniumAppServer.java → ...s/selenium/testing/SeleniumAppServer.java b/...openqa/selenium/v1/SeleniumAppServer.java → ...s/selenium/testing/SeleniumAppServer.java
@@ -14,7 +14,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.testing;
 
 import java.io.File;
 

diff --git a/.../selenium/v1/SeleniumTestEnvironment.java → ...nium/testing/SeleniumTestEnvironment.java b/.../selenium/v1/SeleniumTestEnvironment.java → ...nium/testing/SeleniumTestEnvironment.java
@@ -14,7 +14,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.testing;
 
 import com.google.common.collect.Lists;
 

diff --git a/...nt/test/org/openqa/selenium/v1/build.desc → .../thoughtworks/selenium/testing/build.desc b/...nt/test/org/openqa/selenium/v1/build.desc → .../thoughtworks/selenium/testing/build.desc