Sorting more RC and WDBS tests around

SeleniumHQ · Oct 29, 2014 · 1b8e7c0 · 1b8e7c0
1 parent dbb21c6
commit 1b8e7c0
Show file tree

Hide file tree

Showing 21 changed files with 5,179 additions and 5,231 deletions.
diff --git a/cpp/iedriver/Generated/atoms.h b/cpp/iedriver/Generated/atoms.h
diff --git a/ignores.json b/ignores.json
diff --git a/...g/openqa/selenium/v1/MockBrowserTest.java → ...houghtworks/selenium/MockBrowserTest.java b/...g/openqa/selenium/v1/MockBrowserTest.java → ...houghtworks/selenium/MockBrowserTest.java
@@ -16,7 +16,7 @@
 */
 
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertArrayEquals;

diff --git a/...enium/v1/remotecontrol/StabilityTest.java → .../thoughtworks/selenium/StabilityTest.java b/...enium/v1/remotecontrol/StabilityTest.java → .../thoughtworks/selenium/StabilityTest.java
@@ -16,7 +16,7 @@
 */
 
 
-package org.openqa.selenium.v1.remotecontrol;
+package com.thoughtworks.selenium;
 
 import com.thoughtworks.selenium.DefaultSelenium;
 
@@ -32,7 +32,7 @@
 public class StabilityTest {
 
   @Test
-  public void retrievelastRemoteControlLogsDoesNotTriggerOutOfMemoryErrors() {
+  public void retrieveLastRemoteControlLogsDoesNotTriggerOutOfMemoryErrors() {
     final DefaultSelenium seleniumDriver;
 
     seleniumDriver = new DefaultSelenium("localhost", 4444, "*chrome", "http://localhost:4444");

diff --git a/java/client/test/com/thoughtworks/selenium/WebDriverSeleniumTestSuite.java b/java/client/test/com/thoughtworks/selenium/WebDriverSeleniumTestSuite.java
@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import com.thoughtworks.selenium.BaseSuite;
 import com.thoughtworks.selenium.corebased.SeleniumMouseTest;
 import com.thoughtworks.selenium.corebased.TestAddLocationStrategy;
 import com.thoughtworks.selenium.corebased.TestAddSelection;

diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/BUCK b/java/client/test/com/thoughtworks/selenium/webdriven/BUCK
@@ -1,6 +1,8 @@
 java_test(name = 'LargeTests',
   srcs = [
+    'LargeTests.java',
     'ScriptMutatorTest.java',
+    'WebDriverBackedSeleniumLargeTest.java',
   ],
   deps = [
     '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
@@ -20,13 +22,10 @@ java_test(name = 'small-tests',
     ':tests',
     '//third_party/java/junit:junit',
   ],
-  visibility = [
-    '//java/client/test/org/openqa/selenium/v1:small-tests',
-  ],
 )
 
 java_library(name = 'tests',
-  srcs = glob(['*Test.java'], excludes = ['ScriptMutatorTest.java',]),
+  srcs = glob(['*Test.java'], excludes = ['ScriptMutatorTest.java','WebDriverBackedSeleniumLargeTest.java']),
   deps = [
     '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
     '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',

diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/CompoundMutatorTest.java b/java/client/test/com/thoughtworks/selenium/webdriven/CompoundMutatorTest.java
@@ -18,8 +18,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import com.thoughtworks.selenium.webdriven.CompoundMutator;
-import com.thoughtworks.selenium.webdriven.ScriptMutator;
 
 import static org.junit.Assert.assertTrue;
 

diff --git a/...m/v1/FastWebDriverBackedSeleniumTest.java → ...iven/FastWebDriverBackedSeleniumTest.java b/...m/v1/FastWebDriverBackedSeleniumTest.java → ...iven/FastWebDriverBackedSeleniumTest.java
@@ -15,13 +15,11 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.webdriven;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium;
-
 import org.junit.Test;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;

diff --git a/...st/org/openqa/selenium/v1/SmallTests.java → ...tworks/selenium/webdriven/LargeTests.java b/...st/org/openqa/selenium/v1/SmallTests.java → ...tworks/selenium/webdriven/LargeTests.java
@@ -15,16 +15,15 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.webdriven;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    FastWebDriverBackedSeleniumTest.class,
-    WebDriverCommandProcessorTest.class,
-    com.thoughtworks.selenium.webdriven.SmallTests.class
+    ScriptMutatorTest.class,
+    WebDriverBackedSeleniumLargeTest.class
 })
-public class SmallTests {
+public class LargeTests {
 }
diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/ScriptMutatorTest.java b/java/client/test/com/thoughtworks/selenium/webdriven/ScriptMutatorTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertEquals;
 
 import com.thoughtworks.selenium.Selenium;
-import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium;
 
 import org.junit.Test;
 import org.openqa.selenium.testing.JUnit4TestBase;

diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/SmallTests.java b/java/client/test/com/thoughtworks/selenium/webdriven/SmallTests.java
@@ -23,9 +23,10 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     CompoundMutatorTest.class,
-    ScriptMutatorTest.class,
+    FastWebDriverBackedSeleniumTest.class,
     TimerTest.class,
-    VariableDeclarationTest.class
+    VariableDeclarationTest.class,
+    WebDriverCommandProcessorTest.class
 })
 public class SmallTests {
 }
diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/TimerTest.java b/java/client/test/com/thoughtworks/selenium/webdriven/TimerTest.java
@@ -22,8 +22,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.WebDriver;
-import com.thoughtworks.selenium.webdriven.SeleneseCommand;
-import com.thoughtworks.selenium.webdriven.Timer;
 
 import static org.junit.Assert.fail;
 

diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/VariableDeclarationTest.java b/java/client/test/com/thoughtworks/selenium/webdriven/VariableDeclarationTest.java
@@ -18,7 +18,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import com.thoughtworks.selenium.webdriven.VariableDeclaration;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/.../v1/WebDriverBackedSeleniumLargeTest.java → ...ven/WebDriverBackedSeleniumLargeTest.java b/.../v1/WebDriverBackedSeleniumLargeTest.java → ...ven/WebDriverBackedSeleniumLargeTest.java
@@ -14,14 +14,12 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.webdriven;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import com.thoughtworks.selenium.Selenium;
-import com.thoughtworks.selenium.webdriven.Wait;
-import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...ium/v1/WebDriverCommandProcessorTest.java → ...driven/WebDriverCommandProcessorTest.java b/...ium/v1/WebDriverCommandProcessorTest.java → ...driven/WebDriverCommandProcessorTest.java
@@ -14,13 +14,12 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.v1;
+package com.thoughtworks.selenium.webdriven;
 
 import org.junit.Test;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.StubDriver;
 import org.openqa.selenium.WebDriver;
-import com.thoughtworks.selenium.webdriven.WebDriverCommandProcessor;
 
 import static org.junit.Assert.fail;
 

diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/build.desc b/java/client/test/com/thoughtworks/selenium/webdriven/build.desc
@@ -2,13 +2,33 @@
 java_library(name = "small_tests",
   srcs = [
     "CompoundMutatorTest.java",
+    "FastWebDriverBackedSeleniumTest.java",
     "SmallTests.java",
     "TimerTest.java",
     "VariableDeclarationTest.java",
+    "WebDriverCommandProcessorTest.java",
   ],
   deps = [
     "//java/client/src/com/thoughtworks/selenium:api",
     "//java/client/src/org/openqa/selenium:webdriver-api",
     "//java/client/src/com/thoughtworks/selenium/webdriven:webdriven",
+    "//java/client/test/org/openqa/selenium:base",
+    "//third_party/java/junit",
+    "//third_party/java/mockito",
+  ])
+
+java_library(name = "test-webdriver",
+  srcs = [
+    "LargeTests.java",
+    "ScriptMutatorTest.java",
+    "WebDriverBackedSeleniumLargeTest.java",
+  ],
+  deps = [
+    "//java/client/src/com/thoughtworks/selenium/webdriven",
+    "//java/client/src/org/openqa/selenium:webdriver-api",
+    "//java/client/src/org/openqa/selenium/remote",
+    "//java/client/src/org/openqa/selenium/support",
+    "//java/client/test/org/openqa/selenium:base",
+    "//java/client/test/org/openqa/selenium/testing:junit_4",
     "//third_party/java/junit",
   ])
diff --git a/java/client/test/org/openqa/selenium/SmallTests.java b/java/client/test/org/openqa/selenium/SmallTests.java
@@ -61,6 +61,6 @@
     ZipTest.class,
 
     org.openqa.selenium.support.SmallTests.class,
-    org.openqa.selenium.v1.SmallTests.class
+    com.thoughtworks.selenium.webdriven.SmallTests.class
 })
 public class SmallTests {}
diff --git a/java/client/test/org/openqa/selenium/build.desc b/java/client/test/org/openqa/selenium/build.desc
@@ -70,13 +70,13 @@ java_library(name = "tests",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote:common",
     "//java/client/src/org/openqa/selenium/support/ui:wait",
+    "//java/client/test/com/thoughtworks/selenium/webdriven:small_tests",
     "//java/client/test/org/openqa/selenium/environment",
     "//java/client/test/org/openqa/selenium/testing:junit_4",
     "//java/client/test/org/openqa/selenium/testing:proxy",
     "//java/client/test/org/openqa/selenium/testing:util",
     "//java/client/test/org/openqa/selenium/testing/drivers:tests",
     "//java/client/test/org/openqa/selenium/support:tests",
-    "//java/client/test/org/openqa/selenium/v1:small_tests",
     "//third_party/java/commons-io",
     "//third_party/java/junit",
     "//third_party/java/mockito",

diff --git a/java/client/test/org/openqa/selenium/v1/BUCK b/java/client/test/org/openqa/selenium/v1/BUCK
diff --git a/java/client/test/org/openqa/selenium/v1/SeleniumAppServer.java b/java/client/test/org/openqa/selenium/v1/SeleniumAppServer.java
@@ -21,7 +21,6 @@
 import org.openqa.selenium.environment.webserver.Jetty7AppServer;
 import org.openqa.selenium.testing.InProject;
 import org.seleniumhq.jetty7.servlet.ServletContextHandler;
-import org.seleniumhq.jetty7.webapp.WebAppContext;
 
 public class SeleniumAppServer extends Jetty7AppServer {
 

diff --git a/java/client/test/org/openqa/selenium/v1/build.desc b/java/client/test/org/openqa/selenium/v1/build.desc
@@ -1,19 +1,4 @@
 
-java_library(name = "test-webdriver",
-  srcs = [
-    "internal/**/*.java",
-    "support/*.java",
-  ],
-  deps = [
-    "//java/client/src/com/thoughtworks/selenium/webdriven",
-    "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//java/client/src/org/openqa/selenium/remote",
-    "//java/client/src/org/openqa/selenium/support",
-    "//java/client/test/org/openqa/selenium:base",
-    "//java/client/test/org/openqa/selenium/testing:junit_4",
-    "//third_party/java/junit",
-  ])
-
 java_library(name = "environment",
   srcs = [
     "SeleniumTestEnvironment.java",
@@ -27,18 +12,3 @@ java_library(name = "environment",
     "//java/server/test/org/openqa/selenium:server-with-tests:uber",
     "//third_party/java/guava-libraries",
   ])
-
-java_test(name = "small_tests",
-  srcs = [
-    "SmallTests.java",
-    "FastWebDriverBackedSeleniumTest.java",
-    "WebDriverCommandProcessorTest.java",
-  ],
-  deps = [
-    "//java/client/src/org/openqa/selenium:base",
-    "//java/client/test/org/openqa/selenium:base",
-    "//java/client/test/org/openqa/selenium/testing:junit_4",
-    "//java/client/test/org/openqa/selenium/v1/internal/seleniumemulation:small_tests",
-    "//third_party/java/junit",
-    "//third_party/java/mockito",
-  ])