Skip to content

Commit 6c6a564

Browse files
shs96cshs96c
committed
Run FirefoxDriver tests with Buck.
Complete with Yet Another Buck Version Bump.
1 parent ba15b38 commit 6c6a564

File tree

13 files changed

+173
-115
lines changed

13 files changed

+173
-115
lines changed

‎.buckversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7b683678599070e55ff9b0f038f5b1375626dace
1+
845fb318f1447178ea9ddd2aeaf4231cdc8b6887

‎java/client/src/org/openqa/selenium/firefox/BUCK‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ java_library(name = 'firefox',
22
srcs = glob(['*.java', 'internal/*.java']),
33
resources = [
44
':prefs',
5-
'//javascript/firefox-driver:webdriver',
5+
':webdriver.xpi',
66
],
77
deps = [
88
':prefs',
@@ -21,3 +21,7 @@ export_file(name = 'prefs',
2121
src = '//javascript/firefox-driver:webdriver_prefs',
2222
out = 'webdriver_prefs.json',
2323
)
24+
25+
export_file(name = 'webdriver.xpi',
26+
src = '//javascript/firefox-driver:webdriver',
27+
)

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,12 @@ java_library(name = 'annotations',
3939
],
4040
)
4141

42-
java_library(name = 'doubles',
43-
srcs = [
44-
'StubDriver.java',
45-
'StubElement.java',
46-
],
47-
deps = [
48-
'//java/client/src/org/openqa/selenium:webdriver-api',
49-
],
50-
visibility = [
51-
'//java/client/test/...',
52-
'//java/server/test/...',
53-
],
54-
)
55-
5642
java_library(name = 'helpers',
5743
srcs = [
5844
'Build.java',
5945
'Pages.java',
46+
'ParallelTestRunner.java',
47+
'StubDriver.java',
6048
'StubElement.java',
6149
'StubRenderedWebElement.java',
6250
'WaitingConditions.java',
@@ -98,7 +86,6 @@ java_library(name = 'tests',
9886
'//java/client/test/org/openqa/selenium/support:tests',
9987
],
10088
deps = [
101-
':doubles',
10289
':helpers',
10390
'//java/client/src/org/openqa/selenium:webdriver-api',
10491
'//java/client/src/org/openqa/selenium/browserlaunchers:proxies',

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
java_test(name = 'test-synthesized',
2+
srcs = [
3+
'SynthesizedFirefoxDriverTests.java'
4+
],
5+
vm_args = [
6+
'-Dselenium.browser=ff',
7+
],
8+
deps = [
9+
':tests',
10+
'//java/client/src/org/openqa/selenium:webdriver-api',
11+
'//java/client/test/org/openqa/selenium/testing:test-base',
12+
'//java/client/test/org/openqa/selenium:large-tests',
13+
'//third_party/java/junit:junit',
14+
],
15+
)
16+
17+
java_test(name = 'test-native',
18+
srcs = [
19+
'SynthesizedFirefoxDriverTests.java'
20+
],
21+
vm_args = [
22+
'-Dselenium.browser=ff',
23+
'-D"selenium.browser.native_events=true',
24+
],
25+
deps = [
26+
':tests',
27+
'//java/client/src/org/openqa/selenium:webdriver-api',
28+
'//java/client/test/org/openqa/selenium/testing:test-base',
29+
'//java/client/test/org/openqa/selenium:large-tests',
30+
'//third_party/java/junit:junit',
31+
],
32+
)
33+
34+
java_library(name = 'tests',
35+
srcs = glob(['*Test.java', 'internal/*.java']) + [
36+
'FirefoxSpecificTests.java',
37+
],
38+
deps = [
39+
'//java/client/src/org/openqa/selenium:webdriver-api',
40+
'//java/client/src/org/openqa/selenium/firefox:firefox',
41+
'//java/client/src/org/openqa/selenium/io:io',
42+
'//java/client/src/org/openqa/selenium/net:net',
43+
'//java/client/src/org/openqa/selenium/remote:remote',
44+
'//java/client/src/org/openqa/selenium/support/ui:wait',
45+
'//java/client/test/org/openqa/selenium:tests',
46+
'//java/client/test/org/openqa/selenium/testing:test-base',
47+
'//java/client/test/org/openqa/selenium/testing/drivers:drivers',
48+
'//third_party/java/guava-libraries:guava-libraries',
49+
'//third_party/java/hamcrest:hamcrest',
50+
'//third_party/java/junit:junit',
51+
'//third_party/java/mockito:mockito',
52+
],
53+
)

‎java/client/test/org/openqa/selenium/firefox/FirefoxProfileTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.openqa.selenium.io.TemporaryFilesystem;
2323
import org.openqa.selenium.io.Zip;
2424
import org.openqa.selenium.testing.InProject;
25+
import org.openqa.selenium.testing.drivers.Firebug;
2526

2627
import java.io.BufferedReader;
2728
import java.io.File;
@@ -126,7 +127,7 @@ public void shouldInstallExtensionFromDirectory() throws IOException {
126127
@Test
127128
public void shouldInstallExtensionUsingClasspath() throws IOException {
128129
FirefoxProfile profile = new FirefoxProfile();
129-
profile.addExtension(FirefoxProfileTest.class, FIREBUG_RESOURCE_PATH);
130+
profile.addExtension(Firebug.class, FIREBUG_RESOURCE_PATH);
130131
File profileDir = profile.layoutOnDisk();
131132
File extensionDir = new File(profileDir, "extensions/firebug@software.joehewitt.com");
132133
assertTrue(extensionDir.exists());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java_library(name = 'tests',
2525
'//java/client/src/org/openqa/selenium/support/ui:components',
2626
'//java/client/src/org/openqa/selenium/support/ui:elements',
2727
'//java/client/src/org/openqa/selenium/support/ui:wait',
28-
'//java/client/test/org/openqa/selenium:doubles',
28+
'//java/client/test/org/openqa/selenium:helpers',
2929
'//java/client/test/org/openqa/selenium/testing:test-base',
3030
'//third_party/java/guava-libraries:guava-libraries',
3131
'//third_party/java/hamcrest:hamcrest',

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ java_library(name = 'drivers',
1717
'TestIgnorance.java',
1818
'WebDriverBuilder.java',
1919
],
20+
resources = [
21+
':firebug',
22+
],
2023
deps = [
2124
':browser',
2225
'//java/client/src/org/openqa/selenium:webdriver-api',
@@ -41,6 +44,11 @@ java_library(name = 'drivers',
4144
],
4245
)
4346

47+
export_file(name = 'firebug',
48+
src = '//third_party/firebug:firebug',
49+
out = 'firebug-1.5.0-fx.xpi',
50+
)
51+
4452
java_library(name = 'small-tests',
4553
srcs = [
4654
'IgnoreComparitorUnitTest.java',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ java_library(name = 'tests',
77
'//java/client/src/com/thoughtworks/selenium:selenium',
88
'//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
99
'//java/client/src/org/openqa/selenium:webdriver-api',
10-
'//java/client/test/org/openqa/selenium:doubles',
10+
'//java/client/test/org/openqa/selenium:helpers',
1111
'//third_party/java/guava-libraries:guava-libraries',
1212
'//third_party/java/junit:junit',
1313
'//third_party/java/mockito:mockito',

‎javascript/firefox-driver/BUCK‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,49 @@ export_file(name = 'webdriver_prefs',
77
)
88

99

10-
mozilla_extension(name = "webdriver",
10+
mozilla_extension(name = 'webdriver',
1111
content = [
12-
"extension/content/fxdriver.xul",
13-
"extension/content/fx4driver.xul",
12+
'extension/content/fxdriver.xul',
13+
'extension/content/fx4driver.xul',
1414
] + glob(['extension/content/**/*.js']),
1515
components = [
16-
"extension/components/httpd.js",
17-
":bad-cert-listener",
18-
":command-processor",
19-
":command-processor-xpt",
20-
":coordinates-xpt",
21-
":modifier-keys",
22-
":modifier-keys-xpt",
23-
":driver-component",
24-
":httpd-xpt",
25-
":mouse-xpt",
26-
":prompt-service",
27-
":response-handler-xpt",
28-
":session",
29-
":session-store",
30-
":status-xpt",
31-
":synthetic-mouse",
32-
"//cpp:native-events-xpt",
33-
"//cpp:native-mouse-xpt",
34-
"//cpp:native-keyboard-xpt",
35-
"//cpp:native-ime-xpt",
16+
'extension/components/httpd.js',
17+
':bad-cert-listener',
18+
':command-processor',
19+
':command-processor-xpt',
20+
':coordinates-xpt',
21+
':modifier-keys',
22+
':modifier-keys-xpt',
23+
':driver-component',
24+
':httpd-xpt',
25+
':mouse-xpt',
26+
':prompt-service',
27+
':response-handler-xpt',
28+
':session',
29+
':session-store',
30+
':status-xpt',
31+
':synthetic-mouse',
32+
'//cpp:native-events-xpt',
33+
'//cpp:native-mouse-xpt',
34+
'//cpp:native-keyboard-xpt',
35+
'//cpp:native-ime-xpt',
3636
],
3737
platforms = [
38-
':win-platform',
39-
# { "//cpp:webdriver_firefox_esr_previous" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so" },
40-
# { "//cpp:webdriver_firefox_esr_previous_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so" },
41-
# { "//cpp:webdriver_firefox_esr_latest" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so" },
42-
# { "//cpp:webdriver_firefox_esr_latest_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so" },
43-
# { "//cpp:webdriver_firefox_previous" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so" },
44-
# { "//cpp:webdriver_firefox_latest" : "platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so" },
45-
# { "//cpp:webdriver_firefox_previous_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so" },
46-
# { "//cpp:webdriver_firefox_latest_64" : "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so" },
38+
':winnt-x86-msvc',
39+
# { '//cpp:webdriver_firefox_esr_previous' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-previous.so' },
40+
# { '//cpp:webdriver_firefox_esr_previous_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-previous.so' },
41+
# { '//cpp:webdriver_firefox_esr_latest' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-esr-latest.so' },
42+
# { '//cpp:webdriver_firefox_esr_latest_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-esr-latest.so' },
43+
# { '//cpp:webdriver_firefox_previous' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-previous.so' },
44+
# { '//cpp:webdriver_firefox_latest' : 'platform/Linux_x86-gcc3/components/libwebdriver-firefox-latest.so' },
45+
# { '//cpp:webdriver_firefox_previous_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-previous.so' },
46+
# { '//cpp:webdriver_firefox_latest_64' : 'platform/Linux_x86_64-gcc3/components/libwebdriver-firefox-latest.so' },
4747
],
4848
resources = [
4949
':js-resources',
5050
],
51-
chrome = "extension/chrome.manifest",
52-
install = "extension/install.rdf",
51+
chrome = 'extension/chrome.manifest',
52+
install = 'extension/install.rdf',
5353
visibility = [
5454
'PUBLIC',
5555
]
@@ -80,12 +80,6 @@ export_file(name = 'json2.js',
8080
src = 'js/json2.js',
8181
)
8282

83-
folder(name = 'win-platform',
84-
srcs = [
85-
':winnt-x86-msvc',
86-
],
87-
)
88-
8983
folder(name = 'winnt-x86-msvc',
9084
out = 'WINNT_x86-msvc',
9185
srcs = [
@@ -179,6 +173,7 @@ js_binary(name = 'command-processor',
179173
],
180174
deps = [
181175
':error',
176+
':events',
182177
':firefoxdriver',
183178
':logging',
184179
':modals',
@@ -195,22 +190,25 @@ js_binary(name = 'command-processor',
195190
)
196191

197192

198-
js_binary(name = "driver-component",
193+
js_binary(name = 'driver-component',
199194
srcs = [
200-
"js/driver-component.js",
195+
'js/driver-component.js',
201196
],
202197
defines = [
203-
"goog.userAgent.ASSUME_GECKO=true",
198+
'goog.userAgent.ASSUME_GECKO=true',
204199
],
205200
flags = [
206-
"--language_in=ECMASCRIPT5",
201+
'--language_in=ECMASCRIPT5',
207202
],
208203
externs = [
209-
"js/externs.js",
204+
'js/externs.js',
210205
],
211206
deps = [
212-
":webdriver-server",
213-
":webelement",
207+
':dispatcher',
208+
':events',
209+
':firefoxdriver',
210+
':webdriver-server',
211+
':webelement',
214212
],
215213
)
216214

@@ -407,6 +405,7 @@ js_library(name = 'firefoxdriver',
407405
':screenshooter',
408406
':timer',
409407
':utils',
408+
':webelement',
410409
':web-loading-listener',
411410
'//javascript/atoms:dom',
412411
'//javascript/atoms:html5',
@@ -424,6 +423,7 @@ js_library(name = 'logging',
424423
],
425424
deps = [
426425
':files',
426+
':moz',
427427
':prefs',
428428
'//javascript/webdriver:logging',
429429
'//third_party/closure:closure',
@@ -447,7 +447,6 @@ js_library(name = 'modals',
447447
js_library(name = 'moz',
448448
srcs = [ 'js/moz.js' ],
449449
deps = [
450-
':logging',
451450
'//javascript/atoms:json',
452451
'//third_party/closure:closure',
453452
],

0 commit comments

Comments
 (0)