Skip to content

Commit

Permalink
Migrate support tests to java_selenium_test_suite
Browse files Browse the repository at this point in the history
  • Loading branch information
shs96c committed Jul 16, 2019
1 parent dec20c7 commit fe1a79a
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 86 deletions.
21 changes: 2 additions & 19 deletions java/client/test/org/openqa/selenium/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion java/client/test/org/openqa/selenium/lift/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
73 changes: 7 additions & 66 deletions java/client/test/org/openqa/selenium/support/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -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"],
]
)
16 changes: 16 additions & 0 deletions java/client/test/org/openqa/selenium/support/events/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -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",
]
)
Original file line number Diff line number Diff line change
@@ -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",
],
)
51 changes: 51 additions & 0 deletions java/client/test/org/openqa/selenium/support/ui/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -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",
]
)

0 comments on commit fe1a79a

Please sign in to comment.