From c621a7687ac0b1fff38962bfe32f31eb6fe31e97 Mon Sep 17 00:00:00 2001 From: Alexei Barantsev Date: Wed, 28 Nov 2018 00:56:22 +0300 Subject: [PATCH] [java] Running Firefox-specific tests with bazel --- .../org/openqa/selenium/firefox/BUILD.bazel | 12 ++++++ .../org/openqa/selenium/firefox/BUILD.bazel | 38 +++++++++++++++++++ .../selenium/firefox/FirefoxProfileTest.java | 2 +- third_party/firebug/BUILD.bazel | 12 ++++++ third_party/js/selenium/BUILD.bazel | 12 ++++++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 java/client/test/org/openqa/selenium/firefox/BUILD.bazel create mode 100644 third_party/firebug/BUILD.bazel create mode 100644 third_party/js/selenium/BUILD.bazel diff --git a/java/client/src/org/openqa/selenium/firefox/BUILD.bazel b/java/client/src/org/openqa/selenium/firefox/BUILD.bazel index c47fcf44c37a1..452e70dfe7f51 100644 --- a/java/client/src/org/openqa/selenium/firefox/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/firefox/BUILD.bazel @@ -1,8 +1,20 @@ load("//java:version.bzl", "SE_VERSION") +genrule( + name = "webdriver_prefs", + srcs = [ + "//third_party/js/selenium:webdriver_prefs", + ], + outs = ["webdriver_prefs.json"], + cmd = "cp \"$(location //third_party/js/selenium:webdriver_prefs)\" \"$@\"", +) + java_library( name = "firefox", srcs = glob(["*.java"]), + resources = [ + ":webdriver_prefs", + ], tags = [ "maven_coordinates=org.seleniumhq.selenium:selenium-firefox-driver:" + SE_VERSION, ], diff --git a/java/client/test/org/openqa/selenium/firefox/BUILD.bazel b/java/client/test/org/openqa/selenium/firefox/BUILD.bazel new file mode 100644 index 0000000000000..f2ee80ec2710b --- /dev/null +++ b/java/client/test/org/openqa/selenium/firefox/BUILD.bazel @@ -0,0 +1,38 @@ +load("//java:bazel-rules.bzl", "gen_java_selenium_tests") + +genrule( + name = "firebug", + srcs = [ + "//third_party/firebug", + ], + outs = ["firebug.xpi"], + cmd = "cp \"$(location //third_party/firebug)\" \"$@\"", +) + +java_library( + name = "resources", + srcs = [], + resources = [ + ":firebug", + ], + resource_strip_prefix = "java/client/test" +) + +gen_java_selenium_tests( + drivers = ["firefox"], + srcs = glob(["*Test.java"], exclude = ["FirefoxDriverTest.java"]), + deps = [ + ":resources", + "//java/client/src/org/openqa/selenium/firefox", + "//java/client/src/org/openqa/selenium/remote", + "//java/client/test/org/openqa/selenium/build", + "//java/client/test/org/openqa/selenium", + "//java/client/test/org/openqa/selenium/environment", + "//java/client/test/org/openqa/selenium/testing", + "//java/client/test/org/openqa/selenium/testing/drivers", + "//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/firefox/FirefoxProfileTest.java b/java/client/test/org/openqa/selenium/firefox/FirefoxProfileTest.java index 89b1752581d75..56b04d345880e 100644 --- a/java/client/test/org/openqa/selenium/firefox/FirefoxProfileTest.java +++ b/java/client/test/org/openqa/selenium/firefox/FirefoxProfileTest.java @@ -44,7 +44,7 @@ public class FirefoxProfileTest { private static final String FIREBUG_PATH = "third_party/firebug/firebug-1.5.0-fx.xpi"; private static final String FIREBUG_RESOURCE_PATH = - "/org/openqa/selenium/testing/drivers/firebug-1.5.0-fx.xpi"; + "/org/openqa/selenium/firefox/firebug.xpi"; private static final String MOOLTIPASS_PATH = "third_party/firebug/mooltipass-1.1.87.xpi"; private FirefoxProfile profile; diff --git a/third_party/firebug/BUILD.bazel b/third_party/firebug/BUILD.bazel new file mode 100644 index 0000000000000..b0bf72e6216ec --- /dev/null +++ b/third_party/firebug/BUILD.bazel @@ -0,0 +1,12 @@ +filegroup( + name = "firebug", + srcs = [ + "firebug-1.5.0-fx.xpi", + ], + licenses = [ + "notice", # BSD + ], + visibility = [ + "//java/client/test/org/openqa/selenium/firefox:__pkg__", + ], +) diff --git a/third_party/js/selenium/BUILD.bazel b/third_party/js/selenium/BUILD.bazel new file mode 100644 index 0000000000000..fbd8dcb089cd3 --- /dev/null +++ b/third_party/js/selenium/BUILD.bazel @@ -0,0 +1,12 @@ +filegroup( + name = "webdriver_prefs", + srcs = [ + "webdriver.json", + ], + licenses = [ + "notice", # Apache 2 + ], + visibility = [ + "//java/client/src/org/openqa/selenium/firefox:__pkg__", + ], +)