diff --git a/libraries/hamcrest/BUILD.bazel b/libraries/hamcrest/BUILD.bazel new file mode 100644 index 000000000000..6e239039a559 --- /dev/null +++ b/libraries/hamcrest/BUILD.bazel @@ -0,0 +1,20 @@ +### auto-generated section `build intellij.libraries.hamcrest` start +load("@rules_java//java:defs.bzl", "java_library") +load("@rules_jvm//:jvm.bzl", "jvm_resources") + +jvm_resources( + name = "hamcrest_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +java_library( + name = "hamcrest", + visibility = ["//visibility:public"], + exports = ["@lib//:hamcrest"], + runtime_deps = [ + ":hamcrest_resources", + "@lib//:hamcrest", + ] +) +### auto-generated section `build intellij.libraries.hamcrest` end \ No newline at end of file diff --git a/libraries/junit5-launcher/BUILD.bazel b/libraries/junit5-launcher/BUILD.bazel new file mode 100644 index 000000000000..8da958e01817 --- /dev/null +++ b/libraries/junit5-launcher/BUILD.bazel @@ -0,0 +1,20 @@ +### auto-generated section `build intellij.libraries.junit5.launcher` start +load("@rules_java//java:defs.bzl", "java_library") +load("@rules_jvm//:jvm.bzl", "jvm_resources") + +jvm_resources( + name = "junit5-launcher_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +java_library( + name = "junit5-launcher", + visibility = ["//visibility:public"], + exports = ["@lib//:junit5Launcher"], + runtime_deps = [ + ":junit5-launcher_resources", + "@lib//:junit5Launcher", + ] +) +### auto-generated section `build intellij.libraries.junit5.launcher` end \ No newline at end of file diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel index 284aa2fa0595..f214ff43c2fa 100644 --- a/platform/testFramework/BUILD.bazel +++ b/platform/testFramework/BUILD.bazel @@ -24,73 +24,78 @@ jvm_provided_library( lib = "//libraries/junit4" ) +jvm_provided_library( + name = "junit5-launcher_provided", + lib = "//libraries/junit5-launcher" +) + jvm_library( name = "testFramework", module_name = "intellij.platform.testFramework", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), deps = [ - "//platform/lang-api:lang", - "//platform/lang-impl", - "//platform/observable:ide-observable", - "//platform/execution-impl", - "//platform/editor-ui-ex:editor-ex", - "//platform/indexing-impl", - "//platform/usageView", - "//platform/ide-core-impl", - "//platform/refactoring", - "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", - "//platform/platform-impl:ide-impl", - "//platform/testFramework/bootstrap:tools-testsBootstrap", - "//platform/analysis-impl", - "//java/java-runtime:rt", - "@lib//:kotlin-stdlib", - "//platform/boot", "@lib//:jet_check", - "//platform/testFramework/core", - "//platform/service-container:serviceContainer", - "//platform/workspace/jps", - "//platform/diagnostic/telemetry", - "//platform/workspace/storage", + "@lib//:junit5-provided", + "@lib//:junit5Params-provided", + "@lib//:assert_j", + "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", - "//platform/util-class-loader:util-classLoader", - "//platform/core-ui", + "//java/java-runtime:rt", + "//platform/analysis-impl", + "//platform/backend/observation", + "//platform/backend/workspace", + "//platform/boot", "//platform/code-style-impl:codeStyle-impl", + "//platform/core-ui", + "//platform/diagnostic/telemetry", + "//platform/editor-ui-ex:editor-ex", + "//platform/execution-impl", + "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", + "//platform/ide-core-impl", + "//platform/platform-impl:ide-impl", + "//platform/observable:ide-observable", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-io-impl:ide-util-io-impl", "//platform/platform-util-netty:ide-util-netty", - "@lib//:junit5Launcher-provided", - "@lib//:junit5-provided", - "@lib//:junit5Params-provided", - "//platform/util/jdom", - "//platform/testFramework/common", - "//platform/backend/workspace", - "//platform/util/coroutines", - "@lib//:assert_j", - "//platform/todo", + "//platform/indexing-impl", + "//platform/lang-api:lang", + "//platform/lang-impl", + "//platform/refactoring", + "//platform/service-container:serviceContainer", "//platform/syntax/syntax-api:syntax", "//platform/syntax/syntax-psi:psi", - "//platform/backend/observation", + "//platform/testFramework/common", + "//platform/testFramework/core", + "//platform/todo", + "//platform/usageView", + "//platform/util-class-loader:util-classLoader", + "//platform/util/coroutines", + "//platform/util/jdom", + "//platform/workspace/jps", + "//platform/workspace/storage", + "//platform/testFramework/bootstrap:tools-testsBootstrap", ":junit4_provided", + ":junit5-launcher_provided", ], exports = [ - "//platform/execution-impl", - "//libraries/junit4", - "//platform/ide-core-impl", - "//platform/platform-impl:ide-impl", "@lib//:jet_check", - "//platform/testFramework/core", - "//platform/core-ui", "@lib//:junit5-provided", "@lib//:junit5Params-provided", + "//libraries/junit4", + "//platform/core-ui", + "//platform/execution-impl", + "//platform/ide-core-impl", + "//platform/platform-impl:ide-impl", "//platform/testFramework/common", + "//platform/testFramework/core", ], runtime_deps = [ ":testFramework_resources", "//resources-en:java-resources-en", - "//xml/dom-impl", "//images", "//RegExpSupport:regexp", + "//xml/dom-impl", ] ) @@ -100,61 +105,61 @@ jvm_library( srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java"], allow_empty = True), associates = [":testFramework"], deps = [ - "//platform/lang-api:lang", - "//platform/lang-impl", - "//platform/observable:ide-observable", - "//platform/execution-impl", - "//platform/editor-ui-ex:editor-ex", - "//platform/indexing-impl", - "//libraries/junit4", - "//platform/usageView", - "//platform/ide-core-impl", - "//platform/refactoring", - "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", - "//platform/platform-impl:ide-impl", - "//platform/platform-impl:ide-impl_test_lib", - "//platform/testFramework/bootstrap:tools-testsBootstrap", - "//platform/analysis-impl", - "//java/java-runtime:rt", - "@lib//:kotlin-stdlib", - "//platform/boot", "@lib//:jet_check", - "//platform/testFramework/core", - "//platform/service-container:serviceContainer", - "//platform/service-container:serviceContainer_test_lib", - "//platform/workspace/jps", - "//platform/diagnostic/telemetry", - "//platform/diagnostic/telemetry:telemetry_test_lib", - "//platform/workspace/storage", - "@lib//:kotlinx-coroutines-core", - "//platform/util-class-loader:util-classLoader", - "//platform/core-ui", - "//platform/code-style-impl:codeStyle-impl", - "//platform/platform-util-io:ide-util-io", - "//platform/platform-util-io-impl:ide-util-io-impl", - "//platform/platform-util-netty:ide-util-netty", - "@lib//:junit5Launcher-provided", "@lib//:junit5-provided", "@lib//:junit5Params-provided", - "//platform/util/jdom", - "//platform/testFramework/common", + "@lib//:assert_j", + "@lib//:kotlin-stdlib", + "@lib//:kotlinx-coroutines-core", + "@lib//:http-client", "@lib//:jackson", "@lib//:jackson-databind", "@lib//:jackson-module-kotlin", - "@lib//:http-client", - "@lib//:platform-test_framework-okhttp3-mockwebserver", "@lib//:okhttp", + "//java/java-runtime:rt", + "//libraries/junit4", + "//libraries/junit5-launcher", + "//platform/analysis-impl", + "//platform/backend/observation", + "//platform/backend/observation:observation_test_lib", "//platform/backend/workspace", - "//platform/util/coroutines", - "@lib//:assert_j", - "//platform/testFramework/junit5", - "//platform/testFramework/junit5:junit5_test_lib", - "//platform/todo", + "//platform/boot", + "//platform/code-style-impl:codeStyle-impl", + "//platform/core-ui", + "//platform/diagnostic/telemetry", + "//platform/diagnostic/telemetry:telemetry_test_lib", + "//platform/editor-ui-ex:editor-ex", + "//platform/execution-impl", + "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", + "//platform/ide-core-impl", + "//platform/platform-impl:ide-impl", + "//platform/platform-impl:ide-impl_test_lib", + "//platform/observable:ide-observable", + "//platform/platform-util-io:ide-util-io", + "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-netty:ide-util-netty", + "//platform/indexing-impl", + "//platform/lang-api:lang", + "//platform/lang-impl", + "//platform/refactoring", + "//platform/service-container:serviceContainer", + "//platform/service-container:serviceContainer_test_lib", "//platform/syntax/syntax-api:syntax", "//platform/syntax/syntax-api:syntax_test_lib", "//platform/syntax/syntax-psi:psi", - "//platform/backend/observation", - "//platform/backend/observation:observation_test_lib", + "//platform/testFramework/common", + "//platform/testFramework/core", + "//platform/testFramework/junit5", + "//platform/testFramework/junit5:junit5_test_lib", + "//platform/todo", + "//platform/usageView", + "//platform/util-class-loader:util-classLoader", + "//platform/util/coroutines", + "//platform/util/jdom", + "//platform/workspace/jps", + "//platform/workspace/storage", + "//platform/testFramework/bootstrap:tools-testsBootstrap", + "@lib//:platform-test_framework-okhttp3-mockwebserver", ], runtime_deps = [ ":testFramework_resources", diff --git a/platform/testFramework/junit5/BUILD.bazel b/platform/testFramework/junit5/BUILD.bazel index 7f125e98312a..51730942bb8e 100644 --- a/platform/testFramework/junit5/BUILD.bazel +++ b/platform/testFramework/junit5/BUILD.bazel @@ -1,5 +1,5 @@ ### auto-generated section `build intellij.platform.testFramework.junit5` start -load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources", "jvm_test") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_provided_library", "jvm_resources", "jvm_test") jvm_resources( name = "junit5_resources", @@ -13,35 +13,45 @@ jvm_resources( strip_prefix = "test-resources" ) +jvm_provided_library( + name = "junit5_provided", + lib = "//libraries/junit5" +) + +jvm_provided_library( + name = "junit5-launcher_provided", + lib = "//libraries/junit5-launcher" +) + jvm_library( name = "junit5", module_name = "intellij.platform.testFramework.junit5", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), deps = [ - "//platform/core-impl", + "@lib//:junit5Jupiter", "@lib//:jetbrains-annotations", "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", - "@lib//:junit5Launcher-provided", - "@lib//:junit5", - "//platform/analysis-api:analysis", - "@lib//:junit5Jupiter", - "//platform/util", - "//platform/util-ex", - "//platform/core-api:core", - "//platform/ide-core-impl", - "//platform/projectModel-impl", - "//platform/platform-impl:ide-impl", - "//platform/testFramework/common", - "//java/java-runtime:rt", - "//platform/util/coroutines", "@lib//:opentest4j", - "//platform/testFramework/core", - "//platform/util/jdom", + "//java/java-runtime:rt", + "//platform/analysis-api:analysis", + "//platform/core-api:core", + "//platform/core-impl", "//platform/eel", "//platform/eel-provider", "//platform/execution", + "//platform/ide-core-impl", + "//platform/platform-impl:ide-impl", + "//platform/projectModel-impl", + "//platform/testFramework/common", + "//platform/testFramework/core", + "//platform/util", + "//platform/util/coroutines", + "//platform/util-ex", + "//platform/util/jdom", + ":junit5_provided", + ":junit5-launcher_provided", ], exports = ["//platform/testFramework/common"], runtime_deps = [":junit5_resources"] @@ -53,31 +63,31 @@ jvm_library( srcs = glob(["test/**/*.kt", "test/**/*.java"], allow_empty = True), associates = [":junit5"], deps = [ - "//platform/core-impl", + "@lib//:junit5Jupiter", "@lib//:jetbrains-annotations", "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", - "@lib//:junit5Launcher-provided", - "@lib//:junit5", - "//platform/analysis-api:analysis", - "@lib//:junit5Jupiter", - "//platform/util", - "//platform/util-ex", - "//platform/core-api:core", - "//platform/ide-core-impl", - "//platform/projectModel-impl", - "//platform/platform-impl:ide-impl", - "//platform/platform-impl:ide-impl_test_lib", - "//platform/testFramework/common", - "//java/java-runtime:rt", - "//platform/util/coroutines", - "@lib//:junit5Params", "@lib//:opentest4j", - "//platform/testFramework/core", - "//platform/util/jdom", + "@lib//:junit5Params", + "//java/java-runtime:rt", + "//libraries/junit5", + "//libraries/junit5-launcher", + "//platform/analysis-api:analysis", + "//platform/core-api:core", + "//platform/core-impl", "//platform/eel", "//platform/eel-provider", "//platform/execution", + "//platform/ide-core-impl", + "//platform/platform-impl:ide-impl", + "//platform/platform-impl:ide-impl_test_lib", + "//platform/projectModel-impl", + "//platform/testFramework/common", + "//platform/testFramework/core", + "//platform/util", + "//platform/util/coroutines", + "//platform/util-ex", + "//platform/util/jdom", ], runtime_deps = [ ":junit5_resources", diff --git a/python/junit5Tests-framework/BUILD.bazel b/python/junit5Tests-framework/BUILD.bazel index 4f5857a1d6a4..3e5c02e9bd11 100644 --- a/python/junit5Tests-framework/BUILD.bazel +++ b/python/junit5Tests-framework/BUILD.bazel @@ -1,6 +1,12 @@ ### auto-generated section `build intellij.python.community.junit5Tests.framework` start load("@rules_java//java:defs.bzl", "java_library") -load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_test") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources", "jvm_test") + +jvm_resources( + name = "community-junit5Tests-framework_test_resources", + files = glob(["testResources/**/*"]), + strip_prefix = "testResources" +) java_library( name = "community-junit5Tests-framework", @@ -44,7 +50,10 @@ jvm_library( "@lib//:python-community-junit5_tests-framework-uk-webcompere-system-stubs-jupiter", "@lib//:io-mockk-jvm", ], - runtime_deps = ["//python/pluginCore:community-plugin"] + runtime_deps = [ + ":community-junit5Tests-framework_test_resources", + "//python/pluginCore:community-plugin", + ] ) jvm_test( diff --git a/python/junit5Tests-framework/conda/BUILD.bazel b/python/junit5Tests-framework/conda/BUILD.bazel index 0a58c55fb508..4f464a414aad 100644 --- a/python/junit5Tests-framework/conda/BUILD.bazel +++ b/python/junit5Tests-framework/conda/BUILD.bazel @@ -1,6 +1,12 @@ ### auto-generated section `build intellij.python.community.junit5Tests.framework.conda` start load("@rules_java//java:defs.bzl", "java_library") -load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_test") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources", "jvm_test") + +jvm_resources( + name = "python-community-junit5Tests-framework-conda_test_resources", + files = glob(["testResources/**/*"]), + strip_prefix = "testResources" +) java_library( name = "python-community-junit5Tests-framework-conda", @@ -20,7 +26,8 @@ jvm_library( "@lib//:jetbrains-annotations", "//platform/execution", "//platform/core-api:core", - ] + ], + runtime_deps = [":python-community-junit5Tests-framework-conda_test_resources"] ) jvm_test( diff --git a/python/python-venv/BUILD.bazel b/python/python-venv/BUILD.bazel index 3d8434ce7043..4de8a7c42ee1 100644 --- a/python/python-venv/BUILD.bazel +++ b/python/python-venv/BUILD.bazel @@ -7,6 +7,12 @@ jvm_resources( strip_prefix = "resources" ) +jvm_resources( + name = "community-impl-venv_test_resources", + files = glob(["testResources/**/*"]), + strip_prefix = "testResources" +) + jvm_library( name = "community-impl-venv", module_name = "intellij.python.community.impl.venv", @@ -49,7 +55,10 @@ jvm_library( "//platform/ide-core-impl", "//platform/execution", ], - runtime_deps = [":community-impl-venv_resources"] + runtime_deps = [ + ":community-impl-venv_resources", + ":community-impl-venv_test_resources", + ] ) jvm_test( diff --git a/python/setup-test-environment/BUILD.bazel b/python/setup-test-environment/BUILD.bazel index 89f2aa8d18f4..92dbd1a8a93a 100644 --- a/python/setup-test-environment/BUILD.bazel +++ b/python/setup-test-environment/BUILD.bazel @@ -1,5 +1,11 @@ ### auto-generated section `build intellij.python.community.testFramework.testEnv` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "community-testFramework-testEnv_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "community-testFramework-testEnv", @@ -15,6 +21,7 @@ jvm_library( "@lib//:kotlin-reflect", "//platform/lang-impl", "//platform/platform-impl:ide-impl", - ] + ], + runtime_deps = [":community-testFramework-testEnv_resources"] ) ### auto-generated section `build intellij.python.community.testFramework.testEnv` end \ No newline at end of file diff --git a/python/setup-test-environment/conda/BUILD.bazel b/python/setup-test-environment/conda/BUILD.bazel index 453bff85e145..b5fee20eadcd 100644 --- a/python/setup-test-environment/conda/BUILD.bazel +++ b/python/setup-test-environment/conda/BUILD.bazel @@ -1,5 +1,11 @@ ### auto-generated section `build intellij.python.community.testFramework.testEnv.conda` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "python-community-testFramework-testEnv-conda_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "python-community-testFramework-testEnv-conda", @@ -14,6 +20,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/execution", "//platform/util", - ] + ], + runtime_deps = [":python-community-testFramework-testEnv-conda_resources"] ) ### auto-generated section `build intellij.python.community.testFramework.testEnv.conda` end \ No newline at end of file