diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitDependencyScopeSuggester.java b/plugins/junit/src/com/intellij/execution/junit/JUnitDependencyScopeSuggester.java index 0b5269b7b647..addb0b6fbc5e 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitDependencyScopeSuggester.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitDependencyScopeSuggester.java @@ -17,8 +17,10 @@ package com.intellij.execution.junit; import com.intellij.openapi.roots.DependencyScope; import com.intellij.openapi.roots.LibraryDependencyScopeSuggester; +import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryUtil; +import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,8 +31,9 @@ public class JUnitDependencyScopeSuggester extends LibraryDependencyScopeSuggest @Nullable @Override public DependencyScope getDefaultDependencyScope(@NotNull Library library) { - if (LibraryUtil.isClassAvailableInLibrary(library, "junit.framework.TestCase") - || LibraryUtil.isClassAvailableInLibrary(library, "org.junit.Test")) { + VirtualFile[] files = library.getFiles(OrderRootType.CLASSES); + if (files.length == 1 && (LibraryUtil.isClassAvailableInLibrary(files, "junit.framework.TestCase") + || LibraryUtil.isClassAvailableInLibrary(library, "org.junit.Test"))) { return DependencyScope.TEST; } return null; diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGDependencyScopeSuggester.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGDependencyScopeSuggester.java index cc647cb4742d..1a7f1e266270 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGDependencyScopeSuggester.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGDependencyScopeSuggester.java @@ -17,8 +17,10 @@ package com.theoryinpractice.testng.configuration; import com.intellij.openapi.roots.DependencyScope; import com.intellij.openapi.roots.LibraryDependencyScopeSuggester; +import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryUtil; +import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,7 +31,8 @@ public class TestNGDependencyScopeSuggester extends LibraryDependencyScopeSugges @Nullable @Override public DependencyScope getDefaultDependencyScope(@NotNull Library library) { - if (LibraryUtil.isClassAvailableInLibrary(library, "org.testng.annotations.Test")) { + VirtualFile[] files = library.getFiles(OrderRootType.CLASSES); + if (files.length == 1 && LibraryUtil.isClassAvailableInLibrary(files, "org.testng.annotations.Test")) { return DependencyScope.TEST; } return null;