From 22ee933775ace30b85195022cb43b43d4466630e Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 30 Mar 2011 10:50:24 +0400 Subject: [PATCH] make configureByFiles() return configured files --- .../testFramework/fixtures/CodeInsightTestFixture.java | 2 +- .../fixtures/impl/CodeInsightTestFixtureImpl.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java index b79f51cf8265..746a46a62a71 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java @@ -213,7 +213,7 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture { PsiFile configureByFile(@TestDataFile @NonNls String file); - void configureByFiles(@TestDataFile @NonNls String... files); + PsiFile[] configureByFiles(@TestDataFile @NonNls String... files); PsiFile configureByText(FileType fileType, @NonNls String text); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index 62605f5fdb76..499cc9c2d8e6 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -1107,13 +1107,15 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig InspectionProjectProfileManager.getInstance(getProject()).setProjectProfile(profile.getName()); } - private void configureByFilesInner(@NonNls String... filePaths) { + private PsiFile[] configureByFilesInner(@NonNls String... filePaths) { assertInitialized(); myFile = null; myEditor = null; + PsiFile[] psiFiles = new PsiFile[filePaths.length]; for (int i = filePaths.length - 1; i >= 0; i--) { - configureByFileInner(filePaths[i]); + psiFiles[i] = configureByFileInner(filePaths[i]); } + return psiFiles; } @Override @@ -1124,8 +1126,8 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig } @Override - public void configureByFiles(@NonNls final String... files) { - configureByFilesInner(files); + public PsiFile[] configureByFiles(@NonNls final String... files) { + return configureByFilesInner(files); } @Override