From e86b0b0f498fca0dea9e2b0f76e548bfe908178f Mon Sep 17 00:00:00 2001 From: Ilya Korennoy Date: Fri, 30 Jan 2026 14:49:23 +0400 Subject: [PATCH] IJPL-930 Use EnumSource instead of MethodSource for DependencyScope parameters in LibraryScopeCacheTest GitOrigin-RevId: e3d08666f66de145402ea7664121fa557dae4884 --- .../roots/libraries/LibraryScopeCacheTest.kt | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryScopeCacheTest.kt b/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryScopeCacheTest.kt index 04c90e24d0cd..333e57e14c3a 100644 --- a/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryScopeCacheTest.kt +++ b/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryScopeCacheTest.kt @@ -17,6 +17,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments +import org.junit.jupiter.params.provider.EnumSource import org.junit.jupiter.params.provider.MethodSource import java.util.stream.Stream @@ -214,7 +215,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library use scope with exported library and exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -245,7 +246,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library use scope with exported library and non-exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -276,7 +277,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library use scope with non-exported library and exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -307,7 +308,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library use scope with non-exported library and non-exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -338,7 +339,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library scope with exported library and exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -369,7 +370,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library scope with exported library and non-exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -400,7 +401,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library scope with non-exported library and exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -431,7 +432,7 @@ class LibraryScopeCacheTest { } @ParameterizedTest - @MethodSource("dependencyScopes") + @EnumSource(DependencyScope::class) fun `library scope with non-exported library and non-exported module dependency`(scope: DependencyScope) { val libraryScopeCache = LibraryScopeCache.getInstance(projectModel.project) val moduleA = projectModel.createModule("moduleA") @@ -486,10 +487,4 @@ class LibraryScopeCacheTest { assertTrue(useScope.contains(sourceRoot), "SDK use scope should contain source root of module that inherits the SDK") } - - companion object { - @JvmStatic - fun dependencyScopes(): Stream = - DependencyScope.entries.map { Arguments.of(it) }.stream() - } }