diff --git a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java index 61dbb8ba019d..b3c36dca19f2 100644 --- a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java +++ b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java @@ -796,7 +796,6 @@ public class TypeMigrationTest extends TypeMigrationTestBase { @Override public TypeMigrationRules provide() { final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setBoundScope(GlobalSearchScope.projectScope(getProject())); rules.setMigrationRootType(migrationType); return rules; } @@ -862,7 +861,6 @@ public class TypeMigrationTest extends TypeMigrationTestBase { @Override public TypeMigrationRules provide() { final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setBoundScope(GlobalSearchScope.projectScope(getProject())); rules.setMigrationRootType(migrationType); return rules; } diff --git a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java index cf04cb86a6ef..8f75c4921a1c 100644 --- a/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java +++ b/plugins/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java @@ -12,6 +12,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiField; import com.intellij.psi.PsiType; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.LocalSearchScope; import com.intellij.refactoring.typeMigration.TypeMigrationProcessor; import com.intellij.refactoring.typeMigration.TypeMigrationRules; import com.intellij.usageView.UsageInfo; @@ -41,7 +42,6 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { @Override public TypeMigrationRules provide() throws Exception { final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setBoundScope(GlobalSearchScope.projectScope(getProject())); rules.setMigrationRootType(migrationType); return rules; } @@ -66,7 +66,6 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { @Override public TypeMigrationRules provide() throws Exception { final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setBoundScope(GlobalSearchScope.projectScope(getProject())); rules.setMigrationRootType(migrationType); return rules; } @@ -89,7 +88,6 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { @Override public TypeMigrationRules provide() throws Exception { final TypeMigrationRules rules = new TypeMigrationRules(rootType); - rules.setBoundScope(GlobalSearchScope.projectScope(getProject())); rules.setMigrationRootType(migrationType); return rules; } @@ -121,7 +119,9 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase { assertNotNull("Class " + className + " not found", aClass); - final TestTypeMigrationProcessor pr = new TestTypeMigrationProcessor(getProject(), provider.victims(aClass), provider.provide()); + final TypeMigrationRules rules = provider.provide(); + rules.setBoundScope(new LocalSearchScope(aClass.getContainingFile())); + final TestTypeMigrationProcessor pr = new TestTypeMigrationProcessor(getProject(), provider.victims(aClass), rules); final UsageInfo[] usages = pr.findUsages(); final String report = pr.getLabeler().getMigrationReport();