Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from Oct 29, 2020
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef8858f
chore(build): Update ScalaTest.
Oct 28, 2020
7acf6a9
fix(build): Add missing deps.
Oct 28, 2020
a351480
Merge branch 'develop' into fix/DSP-919-test-failures
Oct 28, 2020
2c11f8b
Merge branch 'develop' into fix/DSP-919-test-failures
Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions salsah1/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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",
Expand Down
15 changes: 15 additions & 0 deletions salsah1/src/test/scala/org/knora/salsah/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 11 additions & 1 deletion third_party/dependencies.bzl
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
]

Expand Down
10 changes: 10 additions & 0 deletions webapi/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions webapi/src/test/scala/org/knora/webapi/messages/util/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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(
Expand Down
5 changes: 2 additions & 3 deletions webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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",
Expand All @@ -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,
)
5 changes: 2 additions & 3 deletions webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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",
Expand All @@ -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,
)
5 changes: 2 additions & 3 deletions webapi/src/test/scala/org/knora/webapi/responders/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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",
Expand All @@ -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,
)
23 changes: 7 additions & 16 deletions webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/BUILD.bazel
View file
Open in desktop
Expand Up @@ -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",
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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,
)