From e89da7c1edd026542e9ef533231b0e26b3b6f695 Mon Sep 17 00:00:00 2001 From: Stefano Baghino <43749967+stefanobaghino-da@users.noreply.github.com> Date: Fri, 29 Oct 2021 13:24:03 +0200 Subject: [PATCH] Move non-repudiation proxy conformance tests to their own package (#11464) ... and tag them as manual since they are not under active development. changelog_begin changelog_end --- .../non-repudiation-conformance/BUILD.bazel | 56 +++++++++++++++++++ .../src/test/resources/logback-test.xml | 23 ++++++++ .../NonRepudiationProxyConformance.scala | 0 .../non-repudiation-postgresql/BUILD.bazel | 20 +------ 4 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 runtime-components/non-repudiation-conformance/BUILD.bazel create mode 100644 runtime-components/non-repudiation-conformance/src/test/resources/logback-test.xml rename runtime-components/{non-repudiation-postgresql => non-repudiation-conformance}/src/test/scala/com/daml/nonrepudiation/postgresql/NonRepudiationProxyConformance.scala (100%) diff --git a/runtime-components/non-repudiation-conformance/BUILD.bazel b/runtime-components/non-repudiation-conformance/BUILD.bazel new file mode 100644 index 0000000000..76aab3ae6e --- /dev/null +++ b/runtime-components/non-repudiation-conformance/BUILD.bazel @@ -0,0 +1,56 @@ +# Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +load( + "//bazel_tools:scala.bzl", + "da_scala_library", + "da_scala_test", +) + +da_scala_test( + name = "test", + size = "large", + srcs = glob(["src/test/scala/**/*.scala"]), + resources = [ + "src/test/resources/logback-test.xml", + "//ledger/test-common:dar-files-default", + ], + scala_deps = [ + "@maven//:org_scala_lang_modules_scala_collection_compat", + "@maven//:org_tpolecat_doobie_core", + "@maven//:org_tpolecat_doobie_hikari", + "@maven//:org_typelevel_cats_effect", + ], + tags = ["manual"], + runtime_deps = [ + "@maven//:ch_qos_logback_logback_classic", + ], + deps = [ + "//daml-lf/data", + "//ledger-api/grpc-definitions:ledger_api_proto_scala", + "//ledger/caching", + "//ledger/ledger-api-common", + "//ledger/ledger-api-test-tool:ledger-api-test-tool-default-lib", + "//ledger/ledger-api-test-tool:ledger-api-test-tool-default-test-suites", + "//ledger/ledger-api-test-tool:ledger-api-test-tool-default-tests", + "//ledger/ledger-configuration", + "//ledger/ledger-resources", + "//ledger/participant-integration-api", + "//ledger/sandbox", + "//ledger/sandbox-common", + "//libs-scala/doobie-slf4j", + "//libs-scala/ports", + "//libs-scala/postgresql-testing", + "//libs-scala/resources", + "//libs-scala/resources-akka", + "//libs-scala/resources-grpc", + "//runtime-components/non-repudiation", + "//runtime-components/non-repudiation-client", + "//runtime-components/non-repudiation-postgresql", + "//runtime-components/non-repudiation-testing", + "@maven//:io_grpc_grpc_api", + "@maven//:io_grpc_grpc_core", + "@maven//:io_grpc_grpc_netty", + "@maven//:org_slf4j_slf4j_api", + ], +) diff --git a/runtime-components/non-repudiation-conformance/src/test/resources/logback-test.xml b/runtime-components/non-repudiation-conformance/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..5418f24c23 --- /dev/null +++ b/runtime-components/non-repudiation-conformance/src/test/resources/logback-test.xml @@ -0,0 +1,23 @@ + + + + System.err + + trace + + + %date{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC} %-5level %logger{5}@[%-4.30thread] - %msg%n + + + + + + + + + + + + + + diff --git a/runtime-components/non-repudiation-postgresql/src/test/scala/com/daml/nonrepudiation/postgresql/NonRepudiationProxyConformance.scala b/runtime-components/non-repudiation-conformance/src/test/scala/com/daml/nonrepudiation/postgresql/NonRepudiationProxyConformance.scala similarity index 100% rename from runtime-components/non-repudiation-postgresql/src/test/scala/com/daml/nonrepudiation/postgresql/NonRepudiationProxyConformance.scala rename to runtime-components/non-repudiation-conformance/src/test/scala/com/daml/nonrepudiation/postgresql/NonRepudiationProxyConformance.scala diff --git a/runtime-components/non-repudiation-postgresql/BUILD.bazel b/runtime-components/non-repudiation-postgresql/BUILD.bazel index e8922679c7..a60b5245d7 100644 --- a/runtime-components/non-repudiation-postgresql/BUILD.bazel +++ b/runtime-components/non-repudiation-postgresql/BUILD.bazel @@ -37,11 +37,9 @@ da_scala_library( da_scala_test( name = "test", - size = "large", srcs = glob(["src/test/scala/**/*.scala"]), resources = [ "src/test/resources/logback-test.xml", - "//ledger/test-common:dar-files-default", ], scala_deps = [ "@maven//:org_scala_lang_modules_scala_collection_compat", @@ -51,33 +49,17 @@ da_scala_test( ], runtime_deps = [ "@maven//:ch_qos_logback_logback_classic", + "@maven//:org_postgresql_postgresql", ], deps = [ ":non-repudiation-postgresql", - "//daml-lf/data", "//ledger-api/grpc-definitions:ledger_api_proto_scala", - "//ledger/caching", - "//ledger/ledger-api-common", - "//ledger/ledger-api-test-tool:ledger-api-test-tool-default-lib", - "//ledger/ledger-api-test-tool:ledger-api-test-tool-default-test-suites", - "//ledger/ledger-api-test-tool:ledger-api-test-tool-default-tests", - "//ledger/ledger-configuration", - "//ledger/ledger-resources", - "//ledger/participant-integration-api", - "//ledger/sandbox", - "//ledger/sandbox-common", "//libs-scala/doobie-slf4j", "//libs-scala/ports", "//libs-scala/postgresql-testing", "//libs-scala/resources", - "//libs-scala/resources-akka", - "//libs-scala/resources-grpc", "//runtime-components/non-repudiation", - "//runtime-components/non-repudiation-client", "//runtime-components/non-repudiation-testing", - "@maven//:io_grpc_grpc_api", - "@maven//:io_grpc_grpc_core", - "@maven//:io_grpc_grpc_netty", "@maven//:org_slf4j_slf4j_api", ], )