[bazel]: Add http tests back

SeleniumHQ · May 13, 2019 · dd00c34 · dd00c34
1 parent 85e0ed1
commit dd00c34
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 4 deletions.
diff --git a/java/client/src/org/openqa/selenium/net/BUILD.bazel b/java/client/src/org/openqa/selenium/net/BUILD.bazel
@@ -10,6 +10,7 @@ java_library(
         "//java/client/test/org/openqa/selenium:__pkg__",
         "//java/client/test/org/openqa/selenium/environment:__pkg__",
         "//java/client/test/org/openqa/selenium/net:__pkg__",
+        "//java/client/test/org/openqa/selenium/remote/internal:__pkg__",
         "//java/client/test/org/openqa/selenium/testing/drivers:__pkg__",
     ],
     deps = [

diff --git a/java/client/src/org/openqa/selenium/remote/BUILD.bazel b/java/client/src/org/openqa/selenium/remote/BUILD.bazel
@@ -109,15 +109,12 @@ java_library(
         "html5/RemoteLocationContext.java",
         "html5/RemoteSessionStorage.java",
         "html5/RemoteWebStorage.java",
-        "internal/OkHttpClient.java",
-        "internal/OkHttpWebSocket.java",
-        "internal/JsonToWebElementConverter.java",
-        "internal/WebElementToJsonConverter.java",
         "mobile/RemoteNetworkConnection.java",
     ] + glob([
         "codec/*.java",
         "codec/jwp/*.java",
         "codec/w3c/*.java",
+        "internal/*.java",
         "service/*.java",
     ]),
     resources = [

diff --git a/java/client/src/org/openqa/selenium/remote/http/BUILD.bazel b/java/client/src/org/openqa/selenium/remote/http/BUILD.bazel
@@ -9,6 +9,7 @@ java_library(
         "//java/client/src/org/openqa/selenium/safari:__pkg__",
         "//java/client/test/org/openqa/selenium/environment:__pkg__",
         "//java/client/test/org/openqa/selenium/net:__pkg__",
+        "//java/client/test/org/openqa/selenium/remote:__subpackages__",
         "//java/client/test/org/openqa/selenium/testing/drivers:__pkg__",
     ],
     deps = [

diff --git a/java/client/test/org/openqa/selenium/remote/http/okhttp/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/http/okhttp/BUILD.bazel
@@ -0,0 +1,15 @@
+load("//java:rules.bzl", "java_test_suite")
+
+java_test_suite(
+    name = "SmallTests",
+    size = "small",
+    srcs = glob(["*.java"]),
+    tags = [
+        "no-sandbox",
+    ],
+    deps = [
+        "//java/client/src/org/openqa/selenium/remote/http",
+        "//java/client/src/org/openqa/selenium/remote/http/okhttp",
+        "//java/client/test/org/openqa/selenium/remote/internal:test-lib",
+    ],
+)
diff --git a/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel
@@ -0,0 +1,42 @@
+load("//java:rules.bzl", "java_test_suite")
+
+java_library(
+    name = "test-lib",
+    testonly = True,
+    srcs = [
+        "HttpClientTestBase.java",
+    ],
+    deps = [
+        "//java/client/src/org/openqa/selenium:core",
+        "//java/client/src/org/openqa/selenium/json",
+        "//java/client/src/org/openqa/selenium/net",
+        "//java/client/src/org/openqa/selenium/remote/http",
+        "//third_party/java/assertj",
+        "//third_party/java/guava",
+        "//third_party/java/jetty",
+        "//third_party/java/junit",
+        "//third_party/java/servlet:javax.servlet-api",
+    ],
+    visibility = [
+        "//java/client/test/org/openqa/selenium:__subpackages__",
+    ]
+)
+
+java_test_suite(
+    name = "SmallTests",
+    srcs = glob(["*Test.java"]),
+    size = "small",
+    tags = [
+        "no-sandbox",
+    ],
+    deps = [
+        ":test-lib",
+        "//java/client/src/org/openqa/selenium:core",
+        "//java/client/src/org/openqa/selenium/remote",
+        "//java/client/src/org/openqa/selenium/remote/http",
+        "//java/client/test/org/openqa/selenium:helpers",
+        "//third_party/java/assertj",
+        "//third_party/java/guava",
+        "//third_party/java/junit",
+    ],
+)