From fe1a79ae856bfd4d032fa09f76a4c62199a8bc3c Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Tue, 16 Jul 2019 12:53:23 +0100 Subject: [PATCH] Migrate support tests to java_selenium_test_suite --- .../test/org/openqa/selenium/BUILD.bazel | 21 +----- .../test/org/openqa/selenium/lift/BUILD.bazel | 2 +- .../org/openqa/selenium/support/BUILD.bazel | 73 ++----------------- .../selenium/support/events/BUILD.bazel | 16 ++++ .../selenium/support/pagefactory/BUILD.bazel | 35 +++++++++ .../openqa/selenium/support/ui/BUILD.bazel | 51 +++++++++++++ 6 files changed, 112 insertions(+), 86 deletions(-) create mode 100644 java/client/test/org/openqa/selenium/support/events/BUILD.bazel create mode 100644 java/client/test/org/openqa/selenium/support/pagefactory/BUILD.bazel create mode 100644 java/client/test/org/openqa/selenium/support/ui/BUILD.bazel diff --git a/java/client/test/org/openqa/selenium/BUILD.bazel b/java/client/test/org/openqa/selenium/BUILD.bazel index dae5a337ac7da..ae5e01dfcbe60 100644 --- a/java/client/test/org/openqa/selenium/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/BUILD.bazel @@ -6,27 +6,11 @@ test_suite( "//java/client/test/org/openqa/selenium/io:SmallTests", "//java/client/test/org/openqa/selenium/net:SmallTests", "//java/client/test/org/openqa/selenium/os:AllTests", - "//java/client/test/org/openqa/selenium/support:small-tests", +# "//java/client/test/org/openqa/selenium/support:small-tests", "//java/client/test/org/openqa/selenium/testing:SmallTests", ], ) -java_library( - name = "large-tests", - srcs = ["StandardSeleniumTests.java"], - visibility = [ - "//java/client/test:__subpackages__", - ], - deps = [ - ":tests", - "//java/client/src/org/openqa/selenium:core", - "//java/client/test/org/openqa/selenium/environment", - "//java/client/test/org/openqa/selenium/support:tests", - "//java/client/test/org/openqa/selenium/testing:test-base", - "//third_party/java/junit", - ], -) - java_library( name = "helpers", srcs = [ @@ -41,7 +25,7 @@ java_library( ], deps = [ "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/support/ui:wait", + "//java/client/src/org/openqa/selenium/support", "//java/client/test/org/openqa/selenium/environment", "//third_party/java/guava", "//third_party/java/junit", @@ -78,7 +62,6 @@ java_library( "//java/client/test/org/openqa/selenium/build", "//java/client/test/org/openqa/selenium/environment", "//java/client/test/org/openqa/selenium/net", - "//java/client/test/org/openqa/selenium/support:tests", "//java/client/test/org/openqa/selenium/testing:annotations", "//java/client/test/org/openqa/selenium/testing:test-base", "//java/client/test/org/openqa/selenium/testing/drivers", diff --git a/java/client/test/org/openqa/selenium/lift/BUILD.bazel b/java/client/test/org/openqa/selenium/lift/BUILD.bazel index 59cd209bd053f..edd619754a786 100644 --- a/java/client/test/org/openqa/selenium/lift/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/lift/BUILD.bazel @@ -7,7 +7,7 @@ java_test_suite( deps = [ "//java/client/src/org/openqa/selenium:core", "//java/client/src/org/openqa/selenium/lift", - "//java/client/test/org/openqa/selenium/support:clock", + "//java/client/test/org/openqa/selenium/support/ui:clock", "//third_party/java/hamcrest:hamcrest-core", "//third_party/java/hamcrest:hamcrest-library", "//third_party/java/junit", diff --git a/java/client/test/org/openqa/selenium/support/BUILD.bazel b/java/client/test/org/openqa/selenium/support/BUILD.bazel index d8711f1519d46..ebd57f173a8eb 100644 --- a/java/client/test/org/openqa/selenium/support/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/support/BUILD.bazel @@ -1,74 +1,15 @@ -java_test( - name = "small-tests", - size = "small", - srcs = [ - "SmallTests.java", - ], - test_class = "org.openqa.selenium.support.SmallTests", - visibility = [ - "//java/client/test/org/openqa/selenium:__pkg__", - ], - deps = [ - ":tests", - "//third_party/java/junit", - ], -) +load("//java:test.bzl", "java_test_suite") -java_test( - name = "large-tests", - srcs = [ - "LargeTests.java", - ], - jvm_flags = [ - "-Dselenium.browser=ff", - "-Dorg.openqa.selenium.environment.webserver.ignoreMissingJsRoots=true", - ], - local = True, - test_class = "org.openqa.selenium.support.LargeTests", - deps = [ - ":tests", - "//java/client/src/org/openqa/selenium/firefox", - "//java/client/src/org/openqa/selenium/remote", - "//java/client/test/org/openqa/selenium/testing:test-base", - "//third_party/java/guava", - "//third_party/java/junit", - ], -) - -java_library( - name = "tests", - srcs = glob(["**/*Test.java"]), - visibility = ["//java/client/test/org/openqa/selenium:__pkg__"], +java_test_suite( + name = "SmallTests", + size = "small", + srcs = glob(["*Test.java"]), deps = [ - ":clock", "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/remote", "//java/client/src/org/openqa/selenium/support", - "//java/client/src/org/openqa/selenium/support:page-factory", - "//java/client/src/org/openqa/selenium/support/events", - "//java/client/src/org/openqa/selenium/support/ui:clock", - "//java/client/src/org/openqa/selenium/support/ui:components", - "//java/client/src/org/openqa/selenium/support/ui:elements", - "//java/client/src/org/openqa/selenium/support/ui:wait", - "//java/client/test/org/openqa/selenium:helpers", - "//java/client/test/org/openqa/selenium/testing:annotations", - "//java/client/test/org/openqa/selenium/testing:test-base", - "//java/client/test/org/openqa/selenium/testing/drivers:browser", + "//java/client/test/org/openqa/selenium/support/ui:clock", "//third_party/java/assertj", - "//third_party/java/guava", "//third_party/java/junit", "//third_party/java/mockito:mockito-core", - ], -) - -java_library( - name = "clock", - srcs = [ - "ui/TickingClock.java", - ], - visibility = [ - "//java/client/test:__subpackages__", - "//java/server/test:__subpackages__", - ], - deps = ["//java/client/src/org/openqa/selenium/support/ui:clock"], + ] ) diff --git a/java/client/test/org/openqa/selenium/support/events/BUILD.bazel b/java/client/test/org/openqa/selenium/support/events/BUILD.bazel new file mode 100644 index 0000000000000..a0555c2c4acda --- /dev/null +++ b/java/client/test/org/openqa/selenium/support/events/BUILD.bazel @@ -0,0 +1,16 @@ +load("//java:test.bzl", "java_test_suite") + +java_test_suite( + name = "SmallTests", + size = "small", + srcs = glob(["*.java"]), + deps = [ + "//java/client/src/org/openqa/selenium:core", + "//java/client/src/org/openqa/selenium/support", + "//java/client/test/org/openqa/selenium:helpers", + "//third_party/java/assertj", + "//third_party/java/guava", + "//third_party/java/junit", + "//third_party/java/mockito:mockito-core", + ] +) diff --git a/java/client/test/org/openqa/selenium/support/pagefactory/BUILD.bazel b/java/client/test/org/openqa/selenium/support/pagefactory/BUILD.bazel new file mode 100644 index 0000000000000..108af84de8611 --- /dev/null +++ b/java/client/test/org/openqa/selenium/support/pagefactory/BUILD.bazel @@ -0,0 +1,35 @@ +load("//java:test.bzl", "java_test_suite", "java_selenium_test_suite") + +MEDIUM_TESTS = [ + "UsingPageFactoryTest.java", +] + +java_test_suite( + name = "SmallTests", + size = "small", + srcs = glob(["*Test.java"], exclude = MEDIUM_TESTS), + deps = [ + "//java/client/src/org/openqa/selenium:core", + "//java/client/src/org/openqa/selenium/support", + "//java/client/test/org/openqa/selenium/support/ui:clock", + "//third_party/java/assertj", + "//third_party/java/junit", + "//third_party/java/mockito:mockito-core", + ], +) + + +java_selenium_test_suite( + name = "MediumTests", + size = "medium", + browsers = ["firefox"], + srcs = MEDIUM_TESTS, + deps = [ + "//java/client/src/org/openqa/selenium/remote", + "//java/client/src/org/openqa/selenium/support", + "//java/client/test/org/openqa/selenium/testing:test-base", + "//third_party/java/assertj", + "//third_party/java/junit", + "//third_party/java/mockito:mockito-core", + ], +) diff --git a/java/client/test/org/openqa/selenium/support/ui/BUILD.bazel b/java/client/test/org/openqa/selenium/support/ui/BUILD.bazel new file mode 100644 index 0000000000000..5bd1c1f706583 --- /dev/null +++ b/java/client/test/org/openqa/selenium/support/ui/BUILD.bazel @@ -0,0 +1,51 @@ +load("//java:test.bzl", "java_test_suite", "java_selenium_test_suite") + +LARGE_TESTS = [ + "SelectElementTest.java", + "SelectLargeTest.java", +] + +java_library( + name = "clock", + srcs = [ + "TickingClock.java", + ], + visibility = [ + "//java/client/test:__subpackages__", + "//java/server/test:__subpackages__", + ], + deps = ["//java/client/src/org/openqa/selenium/support/ui:clock"], +) + +java_test_suite( + name = "SmallTests", + srcs = glob(["*Test.java"], exclude = LARGE_TESTS), + deps = [ + ":clock", + "//java/client/src/org/openqa/selenium/remote", + "//java/client/src/org/openqa/selenium/support", + "//third_party/java/assertj", + "//third_party/java/guava", + "//third_party/java/junit", + "//third_party/java/mockito:mockito-core", + ] +) + +java_selenium_test_suite( + name = "MediumTests", + size = "medium", + srcs = LARGE_TESTS, + browsers = [ + "firefox", + ], + deps = [ + "//java/client/src/org/openqa/selenium:core", + "//java/client/src/org/openqa/selenium/support", + "//java/client/test/org/openqa/selenium/testing:annotations", + "//java/client/test/org/openqa/selenium/testing:test-base", + "//java/client/test/org/openqa/selenium/testing/drivers", + "//third_party/java/assertj", + "//third_party/java/guava", + "//third_party/java/junit", + ] +)