Skip to content

Commit 3cc49c8

Browse files
committed
Run htmlunit-driver tests with Buck.
This will still shell out to CrazyFun at points, but the tests run and pass.
1 parent 68e2497 commit 3cc49c8

File tree

7 files changed

+75
-17
lines changed
  • java/client
    • src/org/openqa/selenium/htmlunit
    • test/org/openqa/selenium

7 files changed

+75
-17
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
java_library(name = 'htmlunit',
22
srcs = glob(['*.java']),
3+
exported_deps = [
4+
'//third_party/java/htmlunit:htmlunit',
5+
'//third_party/java/htmlunit:js-core',
6+
],
37
deps = [
48
'//java/client/src/org/openqa/selenium:webdriver-api',
59
'//java/client/src/org/openqa/selenium/interactions:interactions',
610
'//java/client/src/org/openqa/selenium/logging:api',
711
'//java/client/src/org/openqa/selenium/remote:capabilities',
812
'//java/client/src/org/openqa/selenium/remote:remote',
913
'//third_party/java/guava-libraries:guava-libraries',
10-
'//third_party/java/htmlunit:htmlunit',
11-
'//third_party/java/htmlunit:js-core',
1214
'//third_party/java/sac:sac',
1315
'//third_party/java/xml:xml',
1416
],

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
java_test(name = 'SmallTests',
1+
java_test(name = 'small-tests',
22
srcs = [
33
'SmallTests.java',
44
],
55
deps = [
66
':tests',
7-
'//java/client/test/org/openqa/selenium/testing/drivers:SmallTests',
8-
'//java/client/test/org/openqa/selenium/v1:SmallTests',
7+
'//java/client/test/org/openqa/selenium/support:small-tests',
8+
'//java/client/test/org/openqa/selenium/testing/drivers:small-tests',
9+
'//java/client/test/org/openqa/selenium/v1:small-tests',
910
'//third_party/java/junit:junit',
1011
],
1112
)
1213

13-
java_test(name = 'LargeTests',
14+
java_test(name = 'large-tests',
1415
srcs = [
1516
'StandardSeleniumTests.java',
1617
],
@@ -21,6 +22,9 @@ java_test(name = 'LargeTests',
2122
'//java/client/test/org/openqa/selenium/testing:test-base',
2223
'//third_party/java/junit:junit',
2324
],
25+
visibility = [
26+
'//java/client/test/...',
27+
],
2428
)
2529

2630
java_library(name = 'annotations',
@@ -113,6 +117,9 @@ java_library(name = 'tests',
113117
'//third_party/java/mockito:mockito',
114118
'//third_party/java/webbit:webbit',
115119
],
120+
visibility = [
121+
'//java/client/test/...',
122+
],
116123
)
117124

118125
java_binary(name = 'dump-ignores',
@@ -129,7 +136,7 @@ java_library(name = 'ignored-test-printer',
129136
'internal/IgnoredTestPrinter.java',
130137
],
131138
deps = [
132-
':LargeTests',
139+
':large-tests',
133140
'//java/client/src/org/openqa/selenium:platform',
134141
'//java/client/test/org/openqa/selenium/testing:test-base',
135142
'//java/client/test/org/openqa/selenium/testing/drivers:browser',
@@ -138,4 +145,4 @@ java_library(name = 'ignored-test-printer',
138145
'//third_party/java/json:json',
139146
'//third_party/java/junit:junit',
140147
],
141-
)
148+
)
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
java_library(name = 'htmlunit-specific-tests',
2+
srcs = glob(['*Test.java']) + ['HtmlUnitSpecificTests.java',],
3+
deps = [
4+
'//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
5+
'//java/client/src/org/openqa/selenium/remote:capabilities',
6+
'//java/client/src/org/openqa/selenium:webdriver-api',
7+
'//java/client/test/org/openqa/selenium/testing:test-base',
8+
'//third_party/java/hamcrest:hamcrest',
9+
'//third_party/java/junit:junit',
10+
],
11+
)
12+
13+
java_test(name = 'htmlunit',
14+
srcs = [
15+
'JavascriptEnabledHtmlUnitDriverTests.java',
16+
],
17+
vm_args = [
18+
'-Dselenium.browser=htmlunit_js',
19+
],
20+
deps = [
21+
':htmlunit-specific-tests',
22+
'//java/client/test/org/openqa/selenium:tests',
23+
'//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
24+
'//java/client/src/org/openqa/selenium/remote:remote',
25+
'//java/client/src/org/openqa/selenium:webdriver-api',
26+
'//java/client/test/org/openqa/selenium:large-tests',
27+
'//third_party/java/junit:junit',
28+
],
29+
)
30+
31+
java_test(name = 'htmlunit-no-js',
32+
srcs = [
33+
'HtmlUnitDriverTests.java',
34+
],
35+
vm_args = [
36+
'-Dselenium.browser=htmlunit',
37+
],
38+
deps = [
39+
':htmlunit-specific-tests',
40+
'//java/client/test/org/openqa/selenium:tests',
41+
'//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
42+
'//java/client/src/org/openqa/selenium/remote:remote',
43+
'//java/client/src/org/openqa/selenium:webdriver-api',
44+
'//java/client/test/org/openqa/selenium:large-tests',
45+
'//third_party/java/junit:junit',
46+
],
47+
)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
java_test(name = 'small-tests',
22
srcs = [
3-
'SmallTests',
3+
'SmallTests.java',
44
],
55
deps = [
66
':tests',
7+
'//third_party/java/junit:junit',
78
],
89
visibility = [
10+
'//java/client/test/org/openqa/selenium:small-tests',
911
],
1012
)
1113

java/client/test/org/openqa/selenium/testing/drivers/BUCK

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ java_library(name = 'drivers',
4141
],
4242
)
4343

44-
java_library(name = 'SmallTests',
44+
java_library(name = 'small-tests',
4545
srcs = [
4646
'IgnoreComparitorUnitTest.java',
4747
],
@@ -54,6 +54,6 @@ java_library(name = 'SmallTests',
5454
'//third_party/java/mockito:mockito',
5555
],
5656
visibility = [
57-
'//java/client/test/org/openqa/selenium:SmallTests',
57+
'//java/client/test/org/openqa/selenium:small-tests',
5858
]
59-
)
59+
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ java_library(name = 'tests',
1414
],
1515
)
1616

17-
java_test(name = 'SmallTests',
17+
java_test(name = 'small-tests',
1818
srcs = [
1919
'SmallTests.java',
2020
],
2121
deps = [
2222
':tests',
23-
'//java/client/test/org/openqa/selenium/v1/internal/seleniumemulation:SmallTests',
23+
'//java/client/test/org/openqa/selenium/v1/internal/seleniumemulation:small-tests',
2424
'//third_party/java/junit:junit',
2525
],
2626
visibility = [
27-
'//java/client/test/org/openqa/selenium:SmallTests',
27+
'//java/client/test/org/openqa/selenium:small-tests',
2828
],
2929
)

java/client/test/org/openqa/selenium/v1/internal/seleniumemulation/BUCK

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ java_test(name = 'LargeTests',
1212
],
1313
)
1414

15-
java_test(name = 'SmallTests',
15+
java_test(name = 'small-tests',
1616
srcs = [
1717
'SmallTests.java',
1818
],
@@ -21,7 +21,7 @@ java_test(name = 'SmallTests',
2121
'//third_party/java/junit:junit',
2222
],
2323
visibility = [
24-
'//java/client/test/org/openqa/selenium/v1:SmallTests',
24+
'//java/client/test/org/openqa/selenium/v1:small-tests',
2525
],
2626
)
2727

0 commit comments

Comments
 (0)