chore(build): Update ScalaTest (DSP-919) (#1745)

dasch-swiss · Oct 29, 2020 · bbaeadd · bbaeadd
1 parent 1bbdc3e
commit bbaeadd
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 29 deletions.
diff --git a/salsah1/BUILD.bazel b/salsah1/BUILD.bazel
@@ -90,6 +90,11 @@ scala_library(
         "@maven//:com_typesafe_akka_akka_stream_2_12",
         "@maven//:com_typesafe_config",
         "@maven//:org_scalatest_scalatest_2_12",
+        "@maven//:org_scalatest_scalatest_core_2_12",
+        "@maven//:org_scalatest_scalatest_wordspec_2_12",
+        "@maven//:org_scalatest_scalatest_matchers_core_2_12",
+        "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
+        "@maven//:org_scalatest_scalatest_compatible",
         "@maven//:org_scalactic_scalactic_2_12",
         # Selenium
         "@maven//:org_seleniumhq_selenium_selenium_support",

diff --git a/salsah1/src/test/scala/org/knora/salsah/BUILD.bazel b/salsah1/src/test/scala/org/knora/salsah/BUILD.bazel
@@ -43,6 +43,11 @@ scala_web_test_suite(
         "@maven//:com_typesafe_akka_akka_stream_2_12",
         "@maven//:com_typesafe_config",
         "@maven//:org_scalatest_scalatest_2_12",
+        "@maven//:org_scalatest_scalatest_core_2_12",
+        "@maven//:org_scalatest_scalatest_wordspec_2_12",
+        "@maven//:org_scalatest_scalatest_matchers_core_2_12",
+        "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
+        "@maven//:org_scalatest_scalatest_compatible",
         "@maven//:org_scalactic_scalactic_2_12",
         # Selenium
         "@maven//:org_seleniumhq_selenium_selenium_support",
@@ -82,6 +87,11 @@ scala_web_test_suite(
         "@maven//:com_typesafe_akka_akka_stream_2_12",
         "@maven//:com_typesafe_config",
         "@maven//:org_scalatest_scalatest_2_12",
+        "@maven//:org_scalatest_scalatest_core_2_12",
+        "@maven//:org_scalatest_scalatest_wordspec_2_12",
+        "@maven//:org_scalatest_scalatest_matchers_core_2_12",
+        "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
+        "@maven//:org_scalatest_scalatest_compatible",
         "@maven//:org_scalactic_scalactic_2_12",
         # Selenium
         "@maven//:org_seleniumhq_selenium_selenium_support",
@@ -121,6 +131,11 @@ scala_web_test_suite(
         "@maven//:com_typesafe_akka_akka_stream_2_12",
         "@maven//:com_typesafe_config",
         "@maven//:org_scalatest_scalatest_2_12",
+        "@maven//:org_scalatest_scalatest_core_2_12",
+        "@maven//:org_scalatest_scalatest_wordspec_2_12",
+        "@maven//:org_scalatest_scalatest_matchers_core_2_12",
+        "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
+        "@maven//:org_scalatest_scalatest_compatible",
         "@maven//:org_scalactic_scalactic_2_12",
         # Selenium
         "@maven//:org_seleniumhq_selenium_selenium_support",

diff --git a/third_party/dependencies.bzl b/third_party/dependencies.bzl
@@ -121,7 +121,12 @@ def dependencies():
             "com.typesafe.akka:akka-testkit_2.12:%s" % (AKKA_VERSION),
             "com.typesafe.akka:akka-stream-testkit_2.12:%s" % (AKKA_VERSION),
             "com.typesafe.akka:akka-http-testkit_2.12:%s" % (AKKA_HTTP_VERSION),
-            "org.scalatest:scalatest_2.12:3.1.2",
+            "org.scalatest:scalatest_2.12:3.2.2",
+            "org.scalatest:scalatest-core_2.12:3.2.2",
+            "org.scalatest:scalatest-wordspec_2.12:3.2.2",
+            "org.scalatest:scalatest-matchers-core_2.12:3.2.2",
+            "org.scalatest:scalatest-shouldmatchers_2.12:3.2.2",
+            "org.scalatest:scalatest-compatible:3.2.2",
             "org.testcontainers:testcontainers:1.15.0-rc2",
             "junit:junit:4.13",
             "io.gatling.highcharts:gatling-charts-highcharts:3.2.1",
@@ -172,6 +177,11 @@ BASE_TEST_DEPENDENCIES = [
     "@maven//:com_typesafe_akka_akka_stream_2_12",
     "@maven//:com_typesafe_config",
     "@maven//:org_scalatest_scalatest_2_12",
+    "@maven//:org_scalatest_scalatest_core_2_12",
+    "@maven//:org_scalatest_scalatest_wordspec_2_12",
+    "@maven//:org_scalatest_scalatest_matchers_core_2_12",
+    "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
+    "@maven//:org_scalatest_scalatest_compatible",
     "@maven//:org_scalactic_scalactic_2_12",
 ]
 

diff --git a/webapi/BUILD.bazel b/webapi/BUILD.bazel
@@ -178,6 +178,11 @@ scala_library(
         "@maven//:org_eclipse_rdf4j_rdf4j_client",
         "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_scalatest_scalatest_2_12",
+        "@maven//:org_scalatest_scalatest_core_2_12",
+        "@maven//:org_scalatest_scalatest_wordspec_2_12",
+        "@maven//:org_scalatest_scalatest_matchers_core_2_12",
+        "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
+        "@maven//:org_scalatest_scalatest_compatible",
         "@maven//:org_testcontainers_testcontainers",
         "@maven//:junit_junit",
         "@maven//:org_apache_commons_commons_pool2",
@@ -232,6 +237,11 @@ scala_library(
         "@maven//:org_scala_lang_scala_reflect",
         "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_scalatest_scalatest_2_12",
+        "@maven//:org_scalatest_scalatest_core_2_12",
+        "@maven//:org_scalatest_scalatest_wordspec_2_12",
+        "@maven//:org_scalatest_scalatest_matchers_core_2_12",
+        "@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
+        "@maven//:org_scalatest_scalatest_compatible",
         "@maven//:org_testcontainers_testcontainers",
         "@maven//:junit_junit",
         "@maven//:org_xmlunit_xmlunit_core",

diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/util/BUILD.bazel
@@ -55,9 +55,7 @@ scala_test(
     # unused_dependency_checker_mode = "warn",
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
 
 scala_test(

diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/BUILD.bazel
@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
 load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES")
+load("//third_party:dependencies.bzl", "BASE_TEST_DEPENDENCIES")
 
 scala_test(
     name = "PermissionMessagesV1Spec",
@@ -18,7 +19,5 @@ scala_test(
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
         "//webapi:test_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/BUILD.bazel
@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
 load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES")
+load("//third_party:dependencies.bzl", "BASE_TEST_DEPENDENCIES")
 
 scala_test(
     name = "UserMessagesV1Spec",
@@ -18,8 +19,6 @@ scala_test(
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
         "//webapi:test_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_springframework_security_spring_security_core",
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/responders/BUILD.bazel
@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
 load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES")
+load("//third_party:dependencies.bzl", "BASE_TEST_DEPENDENCIES")
 
 filegroup(
     name = "srcs",
@@ -25,7 +26,5 @@ scala_test(
     # unused_dependency_checker_mode = "warn",
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/BUILD.bazel
@@ -2,6 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
 load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES")
+load("//third_party:dependencies.bzl", "BASE_TEST_DEPENDENCIES")
 
 scala_test(
     name = "UpgradePluginPR1307Spec",
@@ -16,13 +17,11 @@ scala_test(
     # unused_dependency_checker_mode = "warn",
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_eclipse_rdf4j_rdf4j_client",
         "@maven//:org_eclipse_rdf4j_rdf4j_repository_sail",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_api",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_memory"
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
 
 scala_test(
@@ -38,13 +37,11 @@ scala_test(
     # unused_dependency_checker_mode = "warn",
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_eclipse_rdf4j_rdf4j_client",
         "@maven//:org_eclipse_rdf4j_rdf4j_repository_sail",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_api",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_memory"
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
 
 scala_test(
@@ -60,13 +57,11 @@ scala_test(
     # unused_dependency_checker_mode = "warn",
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_eclipse_rdf4j_rdf4j_client",
         "@maven//:org_eclipse_rdf4j_rdf4j_repository_sail",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_api",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_memory"
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
 
 scala_test(
@@ -82,13 +77,11 @@ scala_test(
     # unused_dependency_checker_mode = "warn",
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_eclipse_rdf4j_rdf4j_client",
         "@maven//:org_eclipse_rdf4j_rdf4j_repository_sail",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_api",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_memory"
-    ],
+    ] + BASE_TEST_DEPENDENCIES,
 )
 
 scala_test(
@@ -104,11 +97,9 @@ scala_test(
     # unused_dependency_checker_mode = "warn",
     deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
         "//webapi:main_library",
-        "@maven//:org_scalatest_scalatest_2_12",
-        "@maven//:org_scalactic_scalactic_2_12",
         "@maven//:org_eclipse_rdf4j_rdf4j_client",
         "@maven//:org_eclipse_rdf4j_rdf4j_repository_sail",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_api",
         "@maven//:org_eclipse_rdf4j_rdf4j_sail_memory"
-    ],
-)
+    ] + BASE_TEST_DEPENDENCIES,
+)