Pulled getVirtualFileByName() up to PyTestCase

python/testSrc/com/jetbrains/python/PyControlFlowBuilderTest.java

@@ -3,7 +3,6 @@ package com.jetbrains.python;
 import com.intellij.codeInsight.controlflow.ControlFlow;
 import com.intellij.codeInsight.controlflow.Instruction;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache;
@@ -14,7 +13,6 @@ import com.jetbrains.python.psi.PyClass;
 import com.jetbrains.python.psi.PyFile;
 import com.jetbrains.python.psi.PyFunction;
 
-import java.io.File;
 import java.io.IOException;
 
 /**
@@ -234,7 +232,7 @@ public class PyControlFlowBuilderTest extends LightMarkedTestCase {
     for (Instruction instruction : instructions) {
       buffer.append(instruction).append("\n");
     }
-    final VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(fullPath.replace(File.separatorChar, '/'));
+    final VirtualFile vFile = getVirtualFileByName(fullPath);
     try {
       final String fileText = StringUtil.convertLineSeparators(VfsUtil.loadText(vFile), "\n");
       assertEquals(fileText.trim(), buffer.toString().trim());

python/testSrc/com/jetbrains/python/PyQuickDocTest.java

@@ -1,7 +1,6 @@
 package com.jetbrains.python;
 
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -11,7 +10,6 @@ import com.jetbrains.python.fixtures.LightMarkedTestCase;
 import com.jetbrains.python.psi.*;
 import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
@@ -35,7 +33,7 @@ public class PyQuickDocTest extends LightMarkedTestCase {
 
   private void checkByHTML(String text, @TestDataFile String filePath) {
     final String fullPath = getTestDataPath() + filePath;
-    final VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(fullPath.replace(File.separatorChar, '/'));
+    final VirtualFile vFile = getVirtualFileByName(fullPath);
     assertNotNull("file " + fullPath + " not found", vFile);
 
     String loadedText;

python/testSrc/com/jetbrains/python/fixtures/LightMarkedTestCase.java

@@ -1,7 +1,6 @@
 package com.jetbrains.python.fixtures;
 
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -10,7 +9,6 @@ import com.intellij.testFramework.TestDataFile;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NonNls;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -49,7 +47,7 @@ public abstract class LightMarkedTestCase extends PyTestCase {
    */
   protected Map<String, PsiElement> configureByFile(@TestDataFile @NonNls String filePath, @NonNls String markerRegexp) {
     final String fullPath = getTestDataPath() + filePath;
-    final VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(fullPath.replace(File.separatorChar, '/'));
+    final VirtualFile vFile = getVirtualFileByName(fullPath);
     assertNotNull("file " + fullPath + " not found", vFile);
 
     final String text;

python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java

@@ -31,6 +31,8 @@ import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
+
 /**
  * @author yole
  */
@@ -46,6 +48,11 @@ public abstract class PyTestCase extends UsefulTestCase {
   protected CodeInsightTestFixture myFixture;
   private static boolean ourPlatformPrefixInitialized;
 
+  @Nullable
+  protected static VirtualFile getVirtualFileByName(String fileName) {
+    return LocalFileSystem.getInstance().findFileByPath(fileName.replace(File.separatorChar, '/'));
+  }
+
   @Override
   protected void setUp() throws Exception {
     super.setUp();

python/testSrc/com/jetbrains/python/refactoring/PyCodeFragmentTest.java

@@ -4,7 +4,6 @@ import com.intellij.codeInsight.codeFragment.CannotCreateCodeFragmentException;
 import com.intellij.codeInsight.codeFragment.CodeFragment;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -15,7 +14,6 @@ import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
 import com.jetbrains.python.fixtures.LightMarkedTestCase;
 import com.jetbrains.python.psi.PyFile;
 
-import java.io.File;
 import java.util.TreeSet;
 
 /**
@@ -35,7 +33,7 @@ public class PyCodeFragmentTest extends LightMarkedTestCase {
     final String testName = getTestName(false).toLowerCase();
     final String fullPath = getTestDataPath() + testName + ".test";
 
-    final VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(fullPath.replace(File.separatorChar, '/'));
+    final VirtualFile vFile = getVirtualFileByName(fullPath);
     String fileText = StringUtil.convertLineSeparators(VfsUtil.loadText(vFile), "\n");
 
     final int beginMarker = fileText.indexOf(BEGIN_MARKER);

python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java

@@ -1,7 +1,6 @@
 package com.jetbrains.python.refactoring;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor;
@@ -16,7 +15,6 @@ import com.jetbrains.python.psi.stubs.PyFunctionNameIndex;
 import com.jetbrains.python.refactoring.move.PyMoveClassOrFunctionProcessor;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
@@ -178,11 +176,6 @@ public class PyMoveTest extends PyTestCase {
     }
   }
 
-  @Nullable
-  private static VirtualFile getVirtualFileByName(String fileName) {
-    return LocalFileSystem.getInstance().findFileByPath(fileName.replace(File.separatorChar, '/'));
-  }
-
   @Nullable
   private PsiNamedElement findFirstNamedElement(String name) {
     final Collection<PyClass> classes = PyClassNameIndex.find(name, myFixture.getProject(), false);

python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java

@@ -1,7 +1,6 @@
 package com.jetbrains.python.refactoring;
 
 import com.intellij.codeInsight.TargetElementUtilBase;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
@@ -10,9 +9,7 @@ import com.intellij.testFramework.PlatformTestUtil;
 import com.jetbrains.python.PythonTestUtil;
 import com.jetbrains.python.fixtures.PyTestCase;
 import com.jetbrains.python.psi.LanguageLevel;
-import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
 import java.io.IOException;
 
 /**
@@ -197,7 +194,7 @@ public class PyRenameTest extends PyTestCase {
     PsiDocumentManager.getInstance(myFixture.getProject()).commitAllDocuments();
     myFixture.configureFromTempProjectFile("a.py");
     myFixture.renameElementAtCaret(newName);
-    VirtualFile dir2 = getVirtualFileByName(PythonTestUtil.getTestDataPath() + "/" + RENAME_DATA_PATH + testName + "/after");
+    VirtualFile dir2 = PyTestCase.getVirtualFileByName(PythonTestUtil.getTestDataPath() + "/" + RENAME_DATA_PATH + testName + "/after");
     try {
       PlatformTestUtil.assertDirectoriesEqual(dir2, dir1);
     }
@@ -205,9 +202,4 @@ public class PyRenameTest extends PyTestCase {
       throw new RuntimeException(e);
     }
   }
-
-  @Nullable
-  private static VirtualFile getVirtualFileByName(String fileName) {
-    return LocalFileSystem.getInstance().findFileByPath(fileName.replace(File.separatorChar, '/'));
-  }
 }