Skip to content

Commit 8b4a719

Browse files
committed
Compile more tests using Buck.
This is everything in the `./go tests` target that is used for Se3.
1 parent 8f600a7 commit 8b4a719

File tree

13 files changed

+241
-4
lines changed
  • java
    • client
    • server
      • src/org/openqa/selenium/remote/server
      • test/org/openqa/selenium/remote/server
  • third_party/java

13 files changed

+241
-4
lines changed

java/client/src/org/openqa/selenium/remote/BUCK

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ java_library(
3232

3333
java_library(name = 'augmenter',
3434
srcs = [
35+
'Augmenter.java',
3536
'AugmenterProvider.java',
3637
'AddFindsByCss.java',
3738
'AddFindsChildByCss.java',
3839
'AddRemoteTouchScreen.java',
3940
'AddRotatable.java',
4041
'BaseAugmenter.java',
4142
'InterfaceImplementation.java',
43+
'JdkAugmenter.java',
4244
'html5/AddApplicationCache.java',
4345
'html5/AddLocationContext.java',
4446
'html5/AddWebStorage.java',
@@ -47,8 +49,12 @@ java_library(name = 'augmenter',
4749
deps = [
4850
':capabilities',
4951
':remote',
52+
'//third_party/java/cglib:cglib',
5053
'//third_party/java/guava:guava',
5154
],
55+
visibility = [
56+
'//java/client/test/...',
57+
],
5258
)
5359

5460
java_library(name = 'remote',
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
java_test(name = 'chrome',
2+
srcs = [
3+
'ChromeDriverTests.java'
4+
],
5+
vm_args = [
6+
'-Dselenium.browser=chrome',
7+
],
8+
deps = [
9+
':tests',
10+
'//java/client/test/org/openqa/selenium:large-tests',
11+
'//third_party/java/junit:junit',
12+
],
13+
)
14+
15+
java_library(name = 'tests',
16+
srcs = glob(['*Test.java']),
17+
deps = [
18+
'//java/client/src/org/openqa/selenium:webdriver-api',
19+
'//java/client/src/org/openqa/selenium/chrome:chrome',
20+
'//java/client/src/org/openqa/selenium/remote:remote',
21+
'//java/client/test/org/openqa/selenium/testing:test-base',
22+
'//third_party/java/gson:gson',
23+
'//third_party/java/junit:junit',
24+
],
25+
)
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
java_test(name = 'ie',
2+
srcs = [
3+
'InternetExplorerDriverTests.java'
4+
],
5+
vm_args = [
6+
'-Dselenium.browser=ie',
7+
'-Dselenium.browser.native_events=true',
8+
],
9+
deps = [
10+
':tests',
11+
'//java/client/src/org/openqa/selenium:webdriver-api',
12+
'//java/client/test/org/openqa/selenium/testing:test-base',
13+
'//java/client/test/org/openqa/selenium:large-tests',
14+
'//third_party/java/junit:junit',
15+
],
16+
)
17+
18+
java_library(name = 'tests',
19+
srcs = glob(['*Test.java']),
20+
deps = [
21+
'//java/client/src/org/openqa/selenium:webdriver-api',
22+
'//java/client/src/org/openqa/selenium/ie:ie',
23+
'//java/client/src/org/openqa/selenium/remote:remote',
24+
'//java/client/src/org/openqa/selenium/support/ui:wait',
25+
'//java/client/test/org/openqa/selenium/testing:test-base',
26+
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
27+
'//third_party/java/guava:guava',
28+
'//third_party/java/junit:junit',
29+
],
30+
)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
java_test(name = 'opera',
2+
srcs = [
3+
'OperaBlinkDriverTests.java'
4+
],
5+
vm_args = [
6+
'-Dselenium.browser=operablink',
7+
],
8+
deps = [
9+
':tests',
10+
'//java/client/test/org/openqa/selenium:large-tests',
11+
'//third_party/java/junit:junit',
12+
],
13+
)
14+
15+
java_library(name = 'tests',
16+
srcs = glob(['*Test.java']),
17+
deps = [
18+
'//java/client/src/org/openqa/selenium:webdriver-api',
19+
'//java/client/src/org/openqa/selenium/opera:opera',
20+
'//java/client/src/org/openqa/selenium/remote:remote',
21+
'//java/client/test/org/openqa/selenium/testing:test-base',
22+
'//third_party/java/gson:gson',
23+
'//third_party/java/junit:junit',
24+
],
25+
)
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
java_test(name = 'common-tests',
2+
srcs = [
3+
'BeanToJsonConverterTest.java',
4+
'DesiredCapabilitiesTest.java',
5+
'HttpRequest.java',
6+
'JsonToBeanConverterTest.java',
7+
'RemoteCommonTests.java',
8+
'http/JsonHttpCommandCodecTest.java',
9+
'http/JsonHttpResponseCodecTest.java',
10+
],
11+
deps = [
12+
'//java/client/src/org/openqa/selenium:webdriver-api',
13+
'//java/client/src/org/openqa/selenium/remote:remote',
14+
'//third_party/java/gson:gson',
15+
'//third_party/java/guava:guava',
16+
'//third_party/java/hamcrest:hamcrest',
17+
'//third_party/java/httpcomponents:httpclient',
18+
'//third_party/java/junit:junit',
19+
])
20+
21+
java_test(name = 'client-tests',
22+
srcs = [
23+
'AugmenterTest.java',
24+
'BaseAugmenterTest.java',
25+
'ErrorHandlerTest.java',
26+
'JdkAugmenterTest.java',
27+
'RemoteClientTests.java',
28+
'RemoteLogsTest.java',
29+
'RemoteWebDriverInitializationTest.java',
30+
'internal/CircularOutputStreamTest.java',
31+
'internal/WebElementToJsonConverterTest.java',
32+
],
33+
deps = [
34+
'//java/client/src/org/openqa/selenium:webdriver-api',
35+
'//java/client/src/org/openqa/selenium/io:io',
36+
'//java/client/src/org/openqa/selenium/remote:augmenter',
37+
'//java/client/src/org/openqa/selenium/remote:remote',
38+
'//third_party/java/gson:gson',
39+
'//third_party/java/guava:guava',
40+
'//third_party/java/hamcrest:hamcrest',
41+
'//third_party/java/junit:junit',
42+
'//third_party/java/mockito:mockito',
43+
])
44+
45+
java_test(name = 'remote-driver-tests',
46+
srcs = [
47+
'RemoteWebDriverTests.java',
48+
],
49+
vm_args = [
50+
'-Dselenium.browser=ff',
51+
'-Dselenium.browser.remote=true',
52+
],
53+
deps = [
54+
':remote-driver-test-lib',
55+
'//java/client/test/org/openqa/selenium:large-tests',
56+
'//third_party/java/junit:junit',
57+
# '//java/client/src/org/openqa/selenium/remote',
58+
# '//java/client/test/org/openqa/selenium:tests',
59+
],
60+
)
61+
62+
java_library(name = 'remote-driver-test-lib',
63+
srcs = [
64+
'RemoteWebDriverScreenshotTest.java',
65+
],
66+
deps = [
67+
'//java/client/src/org/openqa/selenium:webdriver-api',
68+
'//java/client/src/org/openqa/selenium/remote:augmenter',
69+
'//java/client/src/org/openqa/selenium/remote:remote',
70+
'//java/client/test/org/openqa/selenium/testing:test-base',
71+
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
72+
'//third_party/java/guava:guava',
73+
'//third_party/java/junit:junit',
74+
],
75+
)

java/client/test/org/openqa/selenium/support/BUCK

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,23 @@ java_test(name = 'small-tests',
1111
],
1212
)
1313

14+
java_test(name = 'large-tests',
15+
srcs = [
16+
'LargeTests.java',
17+
],
18+
vm_args = [
19+
'-Dselenium.browser=ff',
20+
],
21+
deps = [
22+
':tests',
23+
'//java/client/src/org/openqa/selenium/firefox:firefox',
24+
'//java/client/src/org/openqa/selenium/remote:remote',
25+
'//java/client/test/org/openqa/selenium/testing:test-base',
26+
'//third_party/java/guava:guava',
27+
'//third_party/java/junit:junit',
28+
],
29+
)
30+
1431
java_library(name = 'tests',
1532
srcs = glob(['**/*Test.java']) + [
1633
'ui/FakeClock.java',

java/server/src/org/openqa/selenium/remote/server/BUCK

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ java_library(name = 'sessions',
1414
visibility = [
1515
'//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
1616
'//java/server/src/org/openqa/selenium/server:server',
17-
'//java/server/test/com/thoughtworks/selenium/webdriven:webdriven',
17+
'//java/server/test/...',
1818
],
1919
)
2020

@@ -63,8 +63,7 @@ java_library(name = 'server',
6363
'//java/server/src/org/openqa/grid/selenium:classes',
6464
'//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
6565
'//java/server/src/org/openqa/selenium/server:server',
66-
'//java/server/test/com/thoughtworks/selenium/webdriven:webdriven',
67-
'//java/server/test/org/openqa/grid:test',
66+
'//java/server/test/...',
6867
],
6968
)
7069

java/server/src/org/openqa/selenium/remote/server/log/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ java_library(name = 'log',
88
],
99
visibility = [
1010
'//java/server/src/...',
11+
'//java/server/test/...',
1112
],
1213
)
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
java_test(name = 'small-tests',
2+
srcs = [
3+
'RemoteServerTests.java',
4+
],
5+
vm_args = [
6+
'-Dselenium.browser=htmlunit',
7+
'-Dselenium.browser.remote=true',
8+
],
9+
deps = [
10+
':tests',
11+
'//third_party/java/junit:junit',
12+
],
13+
)
14+
15+
java_library(name = 'tests',
16+
srcs = glob([
17+
'*.java',
18+
'handler/**/*.java',
19+
'rest/*.java',
20+
'testing/*.java',
21+
'xdrpc/*.java',
22+
]),
23+
deps = [
24+
'//java/client/src/org/openqa/selenium:webdriver-api',
25+
'//java/client/src/org/openqa/selenium/io:io',
26+
'//java/client/src/org/openqa/selenium/remote:remote',
27+
'//java/client/test/org/openqa/selenium/testing:test-base',
28+
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
29+
'//java/server/src/org/openqa/selenium/remote/server:server',
30+
'//java/server/src/org/openqa/selenium/remote/server:sessions',
31+
'//third_party/java/hamcrest:hamcrest',
32+
'//third_party/java/httpcomponents:httpclient',
33+
'//third_party/java/gson:gson',
34+
'//third_party/java/guava:guava',
35+
'//third_party/java/jetty:jetty',
36+
'//third_party/java/junit:junit',
37+
'//third_party/java/mockito:mockito',
38+
'//third_party/java/servlet:servlet-api',
39+
],
40+
)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
java_test(name = 'test',
2+
srcs = glob(['*.java']),
3+
deps = [
4+
'//java/client/src/org/openqa/selenium/logging:api',
5+
'//java/client/src/org/openqa/selenium/logging:logging',
6+
'//java/client/src/org/openqa/selenium/remote:api',
7+
'//java/server/src/org/openqa/selenium/remote/server/log:log',
8+
'//third_party/java/junit:junit',
9+
],
10+
)
11+

0 commit comments

Comments
 (0)