rs-grpc-bridge: Split the test library from the tests, and actually r…

…un the tests. (#5166) * rs-grpc-bridge: Separate the test library from tests. I don't want _logback-test.xml_ shipping with the TestExecutionSequencerFactory. * rs-grpc-bridge: Actually run the tests. How we managed to miss this, I don't know. CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Mar 24, 2020 · a56b3fd · a56b3fd
1 parent 37dc2f2
commit a56b3fd
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 7 deletions.
diff --git a/ledger-api/rs-grpc-akka/BUILD.bazel b/ledger-api/rs-grpc-akka/BUILD.bazel
@@ -36,7 +36,7 @@ da_scala_library(
     deps = [
         ":rs-grpc-akka",
         "//ledger-api/rs-grpc-bridge",
-        "//ledger-api/rs-grpc-bridge:rs-grpc-bridge-test",
+        "//ledger-api/rs-grpc-bridge:rs-grpc-bridge-test-lib",
         "//ledger-api/sample-service",
         "//ledger-api/testing-utils",
         "@maven//:com_google_protobuf_protobuf_java",

diff --git a/ledger-api/rs-grpc-bridge/BUILD.bazel b/ledger-api/rs-grpc-bridge/BUILD.bazel
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 The DAML Authors. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel_tools:scala.bzl", "da_scala_library")
+load("//bazel_tools:scala.bzl", "da_scala_library", "da_scala_test")
 load("//bazel_tools:java.bzl", "da_java_library")
 
 da_java_library(
@@ -24,13 +24,10 @@ da_java_library(
 )
 
 da_scala_library(
-    name = "rs-grpc-bridge-test",
+    name = "rs-grpc-bridge-test-lib",
     srcs = glob([
-        "src/test/java/**/*.java",
-        "src/test/scala/**/*.scala",
+        "src/test/lib/java/**/*.java",
     ]),
-    resource_strip_prefix = "ledger-api/rs-grpc-bridge/src/test/resources/",
-    resources = glob(["src/test/resources/**/*"]),
     visibility = [
         "//visibility:public",
     ],
@@ -48,3 +45,28 @@ da_scala_library(
         "@maven//:org_testng_testng",
     ],
 )
+
+da_scala_test(
+    name = "rs-grpc-bridge-test",
+    srcs = glob([
+        "src/test/suite/scala/**/*.scala",
+    ]),
+    resource_strip_prefix = "ledger-api/rs-grpc-bridge/src/test/suite/resources/",
+    resources = glob(["src/test/suite/resources/**/*"]),
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        ":rs-grpc-bridge",
+        ":rs-grpc-bridge-test-lib",
+        "//ledger-api/rs-grpc-testing-utils",
+        "@maven//:io_grpc_grpc_stub",
+        "@maven//:org_reactivestreams_reactive_streams",
+        "@maven//:org_reactivestreams_reactive_streams_examples",
+        "@maven//:org_reactivestreams_reactive_streams_tck",
+        "@maven//:org_scalactic_scalactic_2_12",
+        "@maven//:org_scalatest_scalatest_2_12",
+        "@maven//:org_slf4j_slf4j_api",
+        "@maven//:org_testng_testng",
+    ],
+)
diff --git a/...dapter/TestExecutionSequencerFactory.java → ...dapter/TestExecutionSequencerFactory.java b/...dapter/TestExecutionSequencerFactory.java → ...dapter/TestExecutionSequencerFactory.java
diff --git a/...ridge/src/test/resources/logback-test.xml → ...src/test/suite/resources/logback-test.xml b/...ridge/src/test/resources/logback-test.xml → ...src/test/suite/resources/logback-test.xml
diff --git a/...apter/client/rs/ClientPublisherTest.scala → ...apter/client/rs/ClientPublisherTest.scala b/...apter/client/rs/ClientPublisherTest.scala → ...apter/client/rs/ClientPublisherTest.scala
diff --git a/...adapter/client/rs/PublisherCreation.scala → ...adapter/client/rs/PublisherCreation.scala b/...adapter/client/rs/PublisherCreation.scala → ...adapter/client/rs/PublisherCreation.scala
diff --git a/...apter/server/rs/BufferingSubscriber.scala → ...apter/server/rs/BufferingSubscriber.scala b/...apter/server/rs/BufferingSubscriber.scala → ...apter/server/rs/BufferingSubscriber.scala
diff --git a/...ver/rs/ServerSubscriberBlackboxTest.scala → ...ver/rs/ServerSubscriberBlackboxTest.scala b/...ver/rs/ServerSubscriberBlackboxTest.scala → ...ver/rs/ServerSubscriberBlackboxTest.scala
diff --git a/...erver/rs/ServerSubscriberStressTest.scala → ...erver/rs/ServerSubscriberStressTest.scala b/...erver/rs/ServerSubscriberStressTest.scala → ...erver/rs/ServerSubscriberStressTest.scala
diff --git a/...ver/rs/ServerSubscriberWhiteboxTest.scala → ...ver/rs/ServerSubscriberWhiteboxTest.scala b/...ver/rs/ServerSubscriberWhiteboxTest.scala → ...ver/rs/ServerSubscriberWhiteboxTest.scala
diff --git a/.../adapter/server/rs/TestingException.scala → .../adapter/server/rs/TestingException.scala b/.../adapter/server/rs/TestingException.scala → .../adapter/server/rs/TestingException.scala