From 8b4a71923631af9580b77fb7657453e79450c983 Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Fri, 22 Apr 2016 16:10:14 +0100 Subject: [PATCH] Compile more tests using Buck. This is everything in the `./go tests` target that is used for Se3. --- .../src/org/openqa/selenium/remote/BUCK | 6 ++ .../test/org/openqa/selenium/chrome/BUCK | 25 +++++++ java/client/test/org/openqa/selenium/ie/BUCK | 30 ++++++++ .../test/org/openqa/selenium/opera/BUCK | 25 +++++++ .../test/org/openqa/selenium/remote/BUCK | 75 +++++++++++++++++++ .../test/org/openqa/selenium/support/BUCK | 17 +++++ .../org/openqa/selenium/remote/server/BUCK | 5 +- .../openqa/selenium/remote/server/log/BUCK | 1 + .../org/openqa/selenium/remote/server/BUCK | 40 ++++++++++ .../openqa/selenium/remote/server/log/BUCK | 11 +++ third_party/java/cglib/BUCK | 7 ++ third_party/java/jetty/BUCK | 1 + third_party/java/servlet/BUCK | 2 +- 13 files changed, 241 insertions(+), 4 deletions(-) create mode 100644 java/client/test/org/openqa/selenium/chrome/BUCK create mode 100644 java/client/test/org/openqa/selenium/ie/BUCK create mode 100644 java/client/test/org/openqa/selenium/opera/BUCK create mode 100644 java/client/test/org/openqa/selenium/remote/BUCK create mode 100644 java/server/test/org/openqa/selenium/remote/server/BUCK create mode 100644 java/server/test/org/openqa/selenium/remote/server/log/BUCK create mode 100644 third_party/java/cglib/BUCK diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK index c223f3e780875..e3e6bc8c6f91b 100644 --- a/java/client/src/org/openqa/selenium/remote/BUCK +++ b/java/client/src/org/openqa/selenium/remote/BUCK @@ -32,6 +32,7 @@ java_library( java_library(name = 'augmenter', srcs = [ + 'Augmenter.java', 'AugmenterProvider.java', 'AddFindsByCss.java', 'AddFindsChildByCss.java', @@ -39,6 +40,7 @@ java_library(name = 'augmenter', 'AddRotatable.java', 'BaseAugmenter.java', 'InterfaceImplementation.java', + 'JdkAugmenter.java', 'html5/AddApplicationCache.java', 'html5/AddLocationContext.java', 'html5/AddWebStorage.java', @@ -47,8 +49,12 @@ java_library(name = 'augmenter', deps = [ ':capabilities', ':remote', + '//third_party/java/cglib:cglib', '//third_party/java/guava:guava', ], + visibility = [ + '//java/client/test/...', + ], ) java_library(name = 'remote', diff --git a/java/client/test/org/openqa/selenium/chrome/BUCK b/java/client/test/org/openqa/selenium/chrome/BUCK new file mode 100644 index 0000000000000..20ef329a769ba --- /dev/null +++ b/java/client/test/org/openqa/selenium/chrome/BUCK @@ -0,0 +1,25 @@ +java_test(name = 'chrome', + srcs = [ + 'ChromeDriverTests.java' + ], + vm_args = [ + '-Dselenium.browser=chrome', + ], + deps = [ + ':tests', + '//java/client/test/org/openqa/selenium:large-tests', + '//third_party/java/junit:junit', + ], +) + +java_library(name = 'tests', + srcs = glob(['*Test.java']), + deps = [ + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/src/org/openqa/selenium/chrome:chrome', + '//java/client/src/org/openqa/selenium/remote:remote', + '//java/client/test/org/openqa/selenium/testing:test-base', + '//third_party/java/gson:gson', + '//third_party/java/junit:junit', + ], +) diff --git a/java/client/test/org/openqa/selenium/ie/BUCK b/java/client/test/org/openqa/selenium/ie/BUCK new file mode 100644 index 0000000000000..17751ccbcdbf7 --- /dev/null +++ b/java/client/test/org/openqa/selenium/ie/BUCK @@ -0,0 +1,30 @@ +java_test(name = 'ie', + srcs = [ + 'InternetExplorerDriverTests.java' + ], + vm_args = [ + '-Dselenium.browser=ie', + '-Dselenium.browser.native_events=true', + ], + deps = [ + ':tests', + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/test/org/openqa/selenium/testing:test-base', + '//java/client/test/org/openqa/selenium:large-tests', + '//third_party/java/junit:junit', + ], +) + +java_library(name = 'tests', + srcs = glob(['*Test.java']), + deps = [ + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/src/org/openqa/selenium/ie:ie', + '//java/client/src/org/openqa/selenium/remote:remote', + '//java/client/src/org/openqa/selenium/support/ui:wait', + '//java/client/test/org/openqa/selenium/testing:test-base', + '//java/client/test/org/openqa/selenium/testing/drivers:drivers', + '//third_party/java/guava:guava', + '//third_party/java/junit:junit', + ], +) diff --git a/java/client/test/org/openqa/selenium/opera/BUCK b/java/client/test/org/openqa/selenium/opera/BUCK new file mode 100644 index 0000000000000..42a22b9d4ef3a --- /dev/null +++ b/java/client/test/org/openqa/selenium/opera/BUCK @@ -0,0 +1,25 @@ +java_test(name = 'opera', + srcs = [ + 'OperaBlinkDriverTests.java' + ], + vm_args = [ + '-Dselenium.browser=operablink', + ], + deps = [ + ':tests', + '//java/client/test/org/openqa/selenium:large-tests', + '//third_party/java/junit:junit', + ], +) + +java_library(name = 'tests', + srcs = glob(['*Test.java']), + deps = [ + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/src/org/openqa/selenium/opera:opera', + '//java/client/src/org/openqa/selenium/remote:remote', + '//java/client/test/org/openqa/selenium/testing:test-base', + '//third_party/java/gson:gson', + '//third_party/java/junit:junit', + ], +) diff --git a/java/client/test/org/openqa/selenium/remote/BUCK b/java/client/test/org/openqa/selenium/remote/BUCK new file mode 100644 index 0000000000000..efcfb614140b0 --- /dev/null +++ b/java/client/test/org/openqa/selenium/remote/BUCK @@ -0,0 +1,75 @@ +java_test(name = 'common-tests', + srcs = [ + 'BeanToJsonConverterTest.java', + 'DesiredCapabilitiesTest.java', + 'HttpRequest.java', + 'JsonToBeanConverterTest.java', + 'RemoteCommonTests.java', + 'http/JsonHttpCommandCodecTest.java', + 'http/JsonHttpResponseCodecTest.java', + ], + deps = [ + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/src/org/openqa/selenium/remote:remote', + '//third_party/java/gson:gson', + '//third_party/java/guava:guava', + '//third_party/java/hamcrest:hamcrest', + '//third_party/java/httpcomponents:httpclient', + '//third_party/java/junit:junit', + ]) + +java_test(name = 'client-tests', + srcs = [ + 'AugmenterTest.java', + 'BaseAugmenterTest.java', + 'ErrorHandlerTest.java', + 'JdkAugmenterTest.java', + 'RemoteClientTests.java', + 'RemoteLogsTest.java', + 'RemoteWebDriverInitializationTest.java', + 'internal/CircularOutputStreamTest.java', + 'internal/WebElementToJsonConverterTest.java', + ], + deps = [ + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/src/org/openqa/selenium/io:io', + '//java/client/src/org/openqa/selenium/remote:augmenter', + '//java/client/src/org/openqa/selenium/remote:remote', + '//third_party/java/gson:gson', + '//third_party/java/guava:guava', + '//third_party/java/hamcrest:hamcrest', + '//third_party/java/junit:junit', + '//third_party/java/mockito:mockito', + ]) + +java_test(name = 'remote-driver-tests', + srcs = [ + 'RemoteWebDriverTests.java', + ], + vm_args = [ + '-Dselenium.browser=ff', + '-Dselenium.browser.remote=true', + ], + deps = [ + ':remote-driver-test-lib', + '//java/client/test/org/openqa/selenium:large-tests', + '//third_party/java/junit:junit', + # '//java/client/src/org/openqa/selenium/remote', + # '//java/client/test/org/openqa/selenium:tests', + ], +) + +java_library(name = 'remote-driver-test-lib', + srcs = [ + 'RemoteWebDriverScreenshotTest.java', + ], + deps = [ + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/src/org/openqa/selenium/remote:augmenter', + '//java/client/src/org/openqa/selenium/remote:remote', + '//java/client/test/org/openqa/selenium/testing:test-base', + '//java/client/test/org/openqa/selenium/testing/drivers:drivers', + '//third_party/java/guava:guava', + '//third_party/java/junit:junit', + ], +) diff --git a/java/client/test/org/openqa/selenium/support/BUCK b/java/client/test/org/openqa/selenium/support/BUCK index 5d9d3b67c55c0..b1f40d5f20e2d 100644 --- a/java/client/test/org/openqa/selenium/support/BUCK +++ b/java/client/test/org/openqa/selenium/support/BUCK @@ -11,6 +11,23 @@ java_test(name = 'small-tests', ], ) +java_test(name = 'large-tests', + srcs = [ + 'LargeTests.java', + ], + vm_args = [ + '-Dselenium.browser=ff', + ], + deps = [ + ':tests', + '//java/client/src/org/openqa/selenium/firefox:firefox', + '//java/client/src/org/openqa/selenium/remote:remote', + '//java/client/test/org/openqa/selenium/testing:test-base', + '//third_party/java/guava:guava', + '//third_party/java/junit:junit', + ], +) + java_library(name = 'tests', srcs = glob(['**/*Test.java']) + [ 'ui/FakeClock.java', diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK index 236fac931fcbf..cf7be174cc7b2 100644 --- a/java/server/src/org/openqa/selenium/remote/server/BUCK +++ b/java/server/src/org/openqa/selenium/remote/server/BUCK @@ -14,7 +14,7 @@ java_library(name = 'sessions', visibility = [ '//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet', '//java/server/src/org/openqa/selenium/server:server', - '//java/server/test/com/thoughtworks/selenium/webdriven:webdriven', + '//java/server/test/...', ], ) @@ -63,8 +63,7 @@ java_library(name = 'server', '//java/server/src/org/openqa/grid/selenium:classes', '//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet', '//java/server/src/org/openqa/selenium/server:server', - '//java/server/test/com/thoughtworks/selenium/webdriven:webdriven', - '//java/server/test/org/openqa/grid:test', + '//java/server/test/...', ], ) diff --git a/java/server/src/org/openqa/selenium/remote/server/log/BUCK b/java/server/src/org/openqa/selenium/remote/server/log/BUCK index 931b9f473b1c5..c6b770b8ad0dc 100644 --- a/java/server/src/org/openqa/selenium/remote/server/log/BUCK +++ b/java/server/src/org/openqa/selenium/remote/server/log/BUCK @@ -8,5 +8,6 @@ java_library(name = 'log', ], visibility = [ '//java/server/src/...', + '//java/server/test/...', ], ) diff --git a/java/server/test/org/openqa/selenium/remote/server/BUCK b/java/server/test/org/openqa/selenium/remote/server/BUCK new file mode 100644 index 0000000000000..a57da21c3954a --- /dev/null +++ b/java/server/test/org/openqa/selenium/remote/server/BUCK @@ -0,0 +1,40 @@ +java_test(name = 'small-tests', + srcs = [ + 'RemoteServerTests.java', + ], + vm_args = [ + '-Dselenium.browser=htmlunit', + '-Dselenium.browser.remote=true', + ], + deps = [ + ':tests', + '//third_party/java/junit:junit', + ], +) + +java_library(name = 'tests', + srcs = glob([ + '*.java', + 'handler/**/*.java', + 'rest/*.java', + 'testing/*.java', + 'xdrpc/*.java', + ]), + deps = [ + '//java/client/src/org/openqa/selenium:webdriver-api', + '//java/client/src/org/openqa/selenium/io:io', + '//java/client/src/org/openqa/selenium/remote:remote', + '//java/client/test/org/openqa/selenium/testing:test-base', + '//java/client/test/org/openqa/selenium/testing/drivers:drivers', + '//java/server/src/org/openqa/selenium/remote/server:server', + '//java/server/src/org/openqa/selenium/remote/server:sessions', + '//third_party/java/hamcrest:hamcrest', + '//third_party/java/httpcomponents:httpclient', + '//third_party/java/gson:gson', + '//third_party/java/guava:guava', + '//third_party/java/jetty:jetty', + '//third_party/java/junit:junit', + '//third_party/java/mockito:mockito', + '//third_party/java/servlet:servlet-api', + ], +) diff --git a/java/server/test/org/openqa/selenium/remote/server/log/BUCK b/java/server/test/org/openqa/selenium/remote/server/log/BUCK new file mode 100644 index 0000000000000..18cfa693d1859 --- /dev/null +++ b/java/server/test/org/openqa/selenium/remote/server/log/BUCK @@ -0,0 +1,11 @@ +java_test(name = 'test', + srcs = glob(['*.java']), + deps = [ + '//java/client/src/org/openqa/selenium/logging:api', + '//java/client/src/org/openqa/selenium/logging:logging', + '//java/client/src/org/openqa/selenium/remote:api', + '//java/server/src/org/openqa/selenium/remote/server/log:log', + '//third_party/java/junit:junit', + ], +) + diff --git a/third_party/java/cglib/BUCK b/third_party/java/cglib/BUCK new file mode 100644 index 0000000000000..77e84a7d94671 --- /dev/null +++ b/third_party/java/cglib/BUCK @@ -0,0 +1,7 @@ +prebuilt_jar(name = 'cglib', + binary_jar = 'cglib-nodep-2.1_3.jar', + visibility = [ + '//java/client/src/org/openqa/selenium/remote:augmenter', + ], +) + diff --git a/third_party/java/jetty/BUCK b/third_party/java/jetty/BUCK index 554f44bddf755..4a4e6e8e44f75 100644 --- a/third_party/java/jetty/BUCK +++ b/third_party/java/jetty/BUCK @@ -19,6 +19,7 @@ java_library( '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib', '//java/server/src/org/openqa/grid:grid', '//java/server/test/com/thoughtworks/selenium/webdriven:webdriven', + '//java/server/test/org/openqa/selenium/remote/server:tests', ], ) diff --git a/third_party/java/servlet/BUCK b/third_party/java/servlet/BUCK index 729f3a22e5cc1..9b4407e3364bd 100644 --- a/third_party/java/servlet/BUCK +++ b/third_party/java/servlet/BUCK @@ -16,7 +16,7 @@ prebuilt_jar(name = 'servlet-api', '//java/server/src/org/openqa/selenium/remote/server:server', # Including the tests - '//java/server/test/org/openqa/grid/...', + '//java/server/test/org/openqa/...', # Everything declared in the jetty BUCK file. '//third_party/java/jetty:',