From 229e495b63706e85f7b5eae0a87e92d6bd34a101 Mon Sep 17 00:00:00 2001
From: Aleksey Dobrynin <aleksey.dobrynin@jetbrains.com>
Date: Mon, 9 Mar 2026 10:33:08 +0100
Subject: [PATCH] [junit]: IDEA-386776 IJ-CR-195055 JUnit version detection
 with customizable scope via registry key

(cherry picked from commit c5e5fd5388f1eea72def08677174af1809603a17)

IJ-CR-195055

GitOrigin-RevId: 55c55179321b769b876df4141fbe747997355360
---
 plugins/junit/resources/META-INF/plugin.xml                   | 4 ++--
 .../junit/src/com/intellij/execution/junit/TestObject.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/junit/resources/META-INF/plugin.xml b/plugins/junit/resources/META-INF/plugin.xml
index bef7eac8a1d5..000fffa4cdf0 100644
--- a/plugins/junit/resources/META-INF/plugin.xml
+++ b/plugins/junit/resources/META-INF/plugin.xml
@@ -161,8 +161,8 @@
                  defaultValue="600"
                  description="Timeout in seconds for the test runner to terminate gracefully after receiving a shutdown signal. A negative value disables the timeout, allowing unlimited wait."/>
     <registryKey key="junit.version.detection.scope"
-                 defaultValue="withDependenciesAndLibraries"
-                 description="Scope used to detect the JUnit version in a module. Supported values: 'runtime' (module runtime), 'module' (module only), 'testsWithDependents' (tests with dependent modules), 'WithLibraries' (module with libraries), and 'withDependenciesAndLibraries' (module with dependencies and libraries; used by default)."/>
+                 defaultValue="[runtime|module|testsWithDependents|withLibraries|withDependenciesAndLibraries*]"
+                 description="Scope used to detect the JUnit version in a module."/>
   </extensions>
 
   <extensionPoints>
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 5c3edc619233..206874a28e22 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -645,7 +645,7 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
       case "runtime" -> GlobalSearchScope.moduleRuntimeScope(module, true);
       case "module" -> GlobalSearchScope.moduleScope(module);
       case "testsWithDependents" -> GlobalSearchScope.moduleTestsWithDependentsScope(module);
-      case "WithLibraries" -> GlobalSearchScope.moduleWithLibrariesScope(module);
+      case "withLibraries" -> GlobalSearchScope.moduleWithLibrariesScope(module);
       default -> GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, true);
     };
   }