Skip to content

Commit

Permalink
[buck] Fix build files so java tree compiles again
Browse files Browse the repository at this point in the history
  • Loading branch information
@shs96c
shs96c committed Nov 26, 2018
1 parent 9c32a5c commit 1d9e98a
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 26 deletions.
2 changes: 1 addition & 1 deletion java/client/test/com/thoughtworks/selenium/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ java_library(
'//java/client/src/org/openqa/selenium:selenium',
'//java/client/src/org/openqa/selenium/remote:remote',
'//java/client/test/org/openqa/selenium:helpers',
'//java/client/test/org/openqa/selenium/build:build',
'//java/client/test/org/openqa/selenium/environment:environment',
'//java/client/test/org/openqa/selenium/testing:helpers',
'//java/client/test/org/openqa/selenium/testing:test-base',
'//java/client/test/org/openqa/selenium/testing/drivers:browser',
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
Expand Down
2 changes: 1 addition & 1 deletion java/client/test/org/openqa/selenium/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ java_test(name = 'small-tests',
':tests',
'//java/client/test/com/thoughtworks/selenium/webdriven:small-tests',
'//java/client/test/org/openqa/selenium/support:small-tests',
'//java/client/test/org/openqa/selenium/testing/drivers:small-tests',
'//java/client/test/org/openqa/selenium/testing:small-tests',
'//third_party/java/junit:junit',
],
)
Expand Down
8 changes: 5 additions & 3 deletions java/client/test/org/openqa/selenium/atoms/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ export_file(
src = '//javascript/webdriver/atoms:inputs',
)


java_test(name = 'test',
srcs = [ 'AtomsRhinoTests.java' ],
labels = [
"small",
],
resources = [
':execute_script',
':execute_script',
':atoms_inputs',
],
deps = [
Expand All @@ -28,7 +30,7 @@ java_library(
deps = [
'//java/client/src/org/openqa/selenium/json:json',
'//java/client/test/org/openqa/selenium:helpers',
'//java/client/test/org/openqa/selenium/testing:helpers',
'//java/client/test/org/openqa/selenium/build:build',
'//third_party/java/assertj:assertj',
'//third_party/java/guava:guava',
'//third_party/java/htmlunit:htmlunit',
Expand Down
1 change: 1 addition & 0 deletions java/client/test/org/openqa/selenium/chrome/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ java_library(name = 'tests',
'//java/client/src/org/openqa/selenium/chrome:chrome',
'//java/client/src/org/openqa/selenium/remote:remote',
'//java/client/src/org/openqa/selenium/support/ui:wait',
'//java/client/test/org/openqa/selenium/build:build',
'//java/client/test/org/openqa/selenium/testing:test-base',
'//third_party/java/assertj:assertj',
'//third_party/java/guava:guava',
Expand Down
3 changes: 0 additions & 3 deletions java/client/test/org/openqa/selenium/chrome/ChromeOptionsFunctionalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
import java.nio.file.Files;
import java.util.Base64;

/**
* Functional tests for {@link ChromeOptions}.
*/
public class ChromeOptionsFunctionalTest extends JUnit4TestBase {

private static final String EXT_PATH = "third_party/chrome_ext/backspace.crx";
Expand Down
1 change: 1 addition & 0 deletions java/client/test/org/openqa/selenium/environment/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ java_library(name = "webserver-test-base",
deps = [
":environment",
"//java/client/src/org/openqa/selenium/remote:remote",
"//java/client/src/org/openqa/selenium/support:support",
"//third_party/java/junit:junit",
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
],
Expand Down
1 change: 1 addition & 0 deletions java/client/test/org/openqa/selenium/ie/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ java_library(name = 'tests',
'//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:helpers',
'//java/client/test/org/openqa/selenium/testing:test-base',
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
'//third_party/java/assertj:assertj',
Expand Down
1 change: 0 additions & 1 deletion java/client/test/org/openqa/selenium/safari/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ java_library(name = 'tests',
'//java/client/test/org/openqa/selenium:tests',
'//java/client/test/org/openqa/selenium/environment:environment',
'//java/client/test/org/openqa/selenium/testing:annotations',
'//java/client/test/org/openqa/selenium/testing:helpers',
'//java/client/test/org/openqa/selenium/testing:test-base',
'//third_party/java/assertj:assertj',
'//third_party/java/guava:guava',
Expand Down
19 changes: 19 additions & 0 deletions java/client/test/org/openqa/selenium/testing/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,22 @@ java_library(name = 'test-base',
'//java/server/test/...',
],
)

java_library(name = 'small-tests',
srcs = [
'IgnoreComparatorUnitTest.java',
],
deps = [
':test-base',
'//java/client/test/org/openqa/selenium/testing/drivers:browser',
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
'//java/client/src/org/openqa/selenium:selenium',
'//java/client/test/org/openqa/selenium/testing:annotations',
'//third_party/java/guava:guava',
'//third_party/java/junit:junit',
'//third_party/java/mockito:mockito-core',
],
visibility = [
'//java/client/test/org/openqa/selenium:small-tests',
]
)
17 changes: 0 additions & 17 deletions java/client/test/org/openqa/selenium/testing/drivers/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,3 @@ export_file(name = 'firebug',
src = '//third_party/firebug:firebug',
out = 'firebug-1.5.0-fx.xpi',
)

java_library(name = 'small-tests',
srcs = [
'IgnoreComparatorUnitTest.java',
],
deps = [
':drivers',
'//java/client/src/org/openqa/selenium:selenium',
'//java/client/test/org/openqa/selenium/testing:annotations',
'//third_party/java/guava:guava',
'//third_party/java/junit:junit',
'//third_party/java/mockito:mockito-core',
],
visibility = [
'//java/client/test/org/openqa/selenium:small-tests',
]
)
1 change: 1 addition & 0 deletions java/server/test/com/thoughtworks/selenium/webdriven/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ java_test(name = 'webdriven',
'//java/client/src/org/openqa/selenium/remote:remote',
'//java/client/test/org/openqa/selenium:helpers',
'//java/client/test/org/openqa/selenium/environment:environment',
'//java/client/test/org/openqa/selenium/testing:test-base',
'//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
'//java/server/src/org/openqa/selenium/remote/server:server',
'//java/server/src/org/openqa/selenium/remote/server:webdriver-servlet',
Expand Down
1 change: 1 addition & 0 deletions java/server/test/org/openqa/selenium/remote/server/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ java_library(name = 'tests',
deps = [
'//java/client/src/org/openqa/selenium:selenium',
'//java/client/src/org/openqa/selenium/remote:remote',
'//java/client/test/org/openqa/selenium:helpers',
'//java/client/test/org/openqa/selenium/testing:test-base',
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
'//java/server/src/org/openqa/selenium/grid/web:web',
Expand Down

0 comments on commit 1d9e98a

Please sign in to comment.