Revamp Closure JsUnit tests runtime and optimize test/build flows. (#…

…1137)
grpc · Sep 21, 2021 · 32fe124 · 32fe124
1 parent d9a6c7a
commit 32fe124
Show file tree

Hide file tree

Showing 32 changed files with 688 additions and 608 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+**/node_modules
+packages/grpc-web/generated
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,16 +1,9 @@
 version: '3'
 services:
-  common:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/common/Dockerfile
-    image: grpcweb/common
   prereqs:
     build:
       context: ./
       dockerfile: ./net/grpc/gateway/docker/prereqs/Dockerfile
-    depends_on:
-      - common
     image: grpcweb/prereqs
   echo-server:
     build:
@@ -34,8 +27,6 @@ services:
     build:
       context: ./
       dockerfile: ./net/grpc/gateway/docker/node_interop_server/Dockerfile
-    depends_on:
-      - common
     image: grpcweb/node-interop-server
     ports:
       - "7074:7074"
@@ -114,3 +105,8 @@ services:
     depends_on:
       - prereqs
     image: grpcweb/protoc-plugin
+  jsunit-test:
+    build:
+      context: ./
+      dockerfile: ./packages/grpc-web/docker/jsunit-test/Dockerfile
+    image: grpcweb/jsunit-test
diff --git a/javascript/net/grpc/web/BUILD.bazel b/javascript/net/grpc/web/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library", "closure_js_test")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 
 cc_binary(
@@ -239,49 +239,3 @@ closure_js_library(
     ],
     visibility = ["//visibility:public"],
 )
-
-closure_js_test(
-    name = "grpcwebclientbase_test",
-    srcs = [
-        "grpcwebclientbase_test.js",
-    ],
-    entry_points = [
-        "goog:grpc.web.GrpcWebClientBaseTest",
-    ],
-    suppress = [
-        "visibility",
-        "checkTypes",
-        "deprecated",
-        "reportUnknownTypes",
-        "strictCheckTypes",
-    ],
-    deps = [
-        ":clientreadablestream",
-        ":grpcwebclientbase",
-        ":interceptor",
-        "@io_bazel_rules_closure//closure/library/crypt:base64",
-        "@io_bazel_rules_closure//closure/library/events",
-        "@io_bazel_rules_closure//closure/library/net:eventtype",
-        "@io_bazel_rules_closure//closure/library/structs:map",
-        "@io_bazel_rules_closure//closure/library/testing:jsunit",
-        "@io_bazel_rules_closure//closure/library/testing:testsuite",
-    ],
-)
-
-closure_js_test(
-    name = "grpcwebstreamparser_test",
-    srcs = [
-        "grpcwebstreamparser_test.js",
-    ],
-    entry_points = [
-        "goog:grpc.web.GrpcWebStreamParserTest",
-    ],
-    suppress = [
-        "reportUnknownTypes",
-    ],
-    deps = [
-        ":grpcwebstreamparser",
-        "@io_bazel_rules_closure//closure/library/testing:jsunit",
-        "@io_bazel_rules_closure//closure/library/testing:testsuite",
-    ],
-)
diff --git a/javascript/net/grpc/web/grpcwebclientbase_test.js b/javascript/net/grpc/web/grpcwebclientbase_test.js
@@ -239,6 +239,13 @@ class MockXhr {
     }
   }
 
+  /**
+   * @param {number} ms
+   */
+  setTimeoutInterval(ms) {
+    return;
+  }
+
   /**
    * @param {boolean} withCredentials
    */
-Original file line number
+Diff line change
@@ Expand Up / @@ -239,6 +239,13 @@ class MockXhr { @@
         }
       }
+      /**
+       * @param {number} ms
+       */
+      setTimeoutInterval(ms) {
+        return;
+      }
       /**
        * @param {boolean} withCredentials
        */
@@ Expand Down @@