Fix the Buck build.

Author: shs96c

java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java

@@ -33,7 +33,6 @@
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
-import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.openqa.selenium.internal.Locatable;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.Ignore;
@@ -216,9 +215,7 @@ public void testShouldBeAbleToClickIfEvenSomethingHorribleHappens() {
   @Test
   public void testShouldBeAbleToGetTheLocationOfAnElement() {
     assumeTrue(driver instanceof JavascriptExecutor);
-    if (driver instanceof HtmlUnitDriver) {
-      assumeTrue(((HtmlUnitDriver) driver).isJavascriptEnabled());
-    }
+    assumeTrue(((HasCapabilities) driver).getCapabilities().isJavascriptEnabled());
 
     driver.get(pages.javascriptPage);
 

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

@@ -11,6 +11,7 @@ java_test(name = 'htmlunit',
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/test/org/openqa/selenium:large-tests',
     '//third_party/java/htmlunit:htmlunit',
+    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/junit:junit',
   ],
 )
@@ -27,7 +28,7 @@ java_test(name = 'htmlunit-no-js',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/test/org/openqa/selenium:large-tests',
-    '//third_party/java/htmlunit:htmlunit',
+    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/junit:junit',
   ],
 )

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

@@ -13,7 +13,7 @@ java_test(name = 'safari',
 )
 
 java_library(name = 'tests',
-  srcs = glob(['*Test.java']) + ['SafariTestBase.java'],
+  srcs = glob(['*Test.java']),
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium/remote:remote',

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

@@ -6,6 +6,7 @@ java_library(name = 'annotations',
     'NativeEventsRequired.java',
     'NeedsLocalEnvironment.java',
     'NeedsFreshDriver.java',
+    'NoDriverAfterTest.java',
     'NotYetImplemented.java',
     'SwitchToTopAfterTest.java',
   ],
@@ -53,6 +54,7 @@ java_library(name = 'test-base',
     '//java/client/src/org/openqa/selenium/support/ui:wait',
     '//java/client/test/org/openqa/selenium/testing/drivers:drivers',
     '//third_party/java/htmlunit:htmlunit',
+    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/guava:guava',
     '//third_party/java/hamcrest:hamcrest',
     '//third_party/java/junit:junit',

java/server/test/org/openqa/grid/e2e/BUCK

@@ -22,7 +22,7 @@ java_library(name = 'tests',
     '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/grid/selenium:classes',
     '//java/server/src/org/openqa/grid/shared:interfaces',
-    '//third_party/java/htmlunit:htmlunit',
+    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/guava:guava',
     '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/junit:junit',

third_party/java/htmlunit/BUCK

@@ -1,3 +1,11 @@
+prebuilt_jar(name = 'htmlunit-driver',
+  binary_jar = 'selenium-htmlunit-driver-2.52.0.jar',
+  deps = [
+    ':htmlunit',
+  ],
+  visibility = ['PUBLIC'],
+)
+
 prebuilt_jar(name = 'htmlunit',
   binary_jar = 'htmlunit-2.18.jar',
   source_jar = 'htmlunit-2.18-sources.jar',
@@ -13,13 +21,16 @@ prebuilt_jar(name = 'htmlunit',
     '//third_party/java/websocket:websocket-client',
     '//third_party/java/xml:xml',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/test/org/openqa/selenium/htmlunit:',
+    '//java/client/test/org/openqa/selenium/testing:test-base',
+  ],
 )
 
 prebuilt_jar(name = 'js-core',
   binary_jar = 'htmlunit-core-js-2.17.jar',
   source_jar = 'htmlunit-core-js-2.17-sources.jar',
   visibility = [
-    '//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
+#    '//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
   ],
 )