diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/TestsLocationProviderUtil.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/TestsLocationProviderUtil.java index 2a1943cb2082..bdfde7ea61e9 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/TestsLocationProviderUtil.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/TestsLocationProviderUtil.java @@ -46,15 +46,6 @@ public class TestsLocationProviderUtil { private TestsLocationProviderUtil() { } - @Nullable - public static String extractProtocol(@NotNull final String locationUrl) { - final int index = locationUrl.indexOf(PROTOCOL_SEPARATOR); - if (index >= 0) { - return locationUrl.substring(0, index); - } - return null; - } - @Nullable public static String extractPath(@NotNull final String locationUrl) { final int index = locationUrl.indexOf(PROTOCOL_SEPARATOR); @@ -169,10 +160,9 @@ public class TestsLocationProviderUtil { if (fileByPath != null) { return fileByPath; } - // if we are in UnitTest mode probably TempFileSystem is used instead of LocaFileSystem + // if we are in UnitTest mode probably TempFileSystem is used instead of LocalFileSystem if (ApplicationManager.getApplication().isUnitTestMode()) { - final VirtualFile tempFileByPath = TempFileSystem.getInstance().findFileByPath(filePath); - return tempFileByPath; + return TempFileSystem.getInstance().findFileByPath(filePath); } return null; } diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java index 537a1971d8e6..cdd96099dd7b 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java @@ -26,6 +26,7 @@ import com.intellij.ide.util.EditSourceUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; +import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.pom.Navigatable; import com.intellij.testIntegration.TestLocationProvider; import com.intellij.util.containers.ContainerUtilRt; @@ -215,7 +216,7 @@ public class SMTestProxy extends AbstractTestProxy { return null; } - final String protocolId = TestsLocationProviderUtil.extractProtocol(myLocationUrl); + final String protocolId = VirtualFileManager.extractProtocol(myLocationUrl); final String path = TestsLocationProviderUtil.extractPath(myLocationUrl); if (protocolId != null && path != null) { diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/LocationProviderUtilTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/LocationProviderUtilTest.java index dd2a99cfd2db..6e81886907b7 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/LocationProviderUtilTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/LocationProviderUtilTest.java @@ -15,6 +15,7 @@ */ package com.intellij.execution.testframework.sm; +import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.testFramework.UsefulTestCase; /** @@ -23,21 +24,21 @@ import com.intellij.testFramework.UsefulTestCase; public class LocationProviderUtilTest extends UsefulTestCase { public void testExtractProtocol() { assertEquals(null, - TestsLocationProviderUtil.extractProtocol("")); + VirtualFileManager.extractProtocol("")); assertEquals(null, - TestsLocationProviderUtil.extractProtocol("file:/")); + VirtualFileManager.extractProtocol("file:/")); assertEquals("file", - TestsLocationProviderUtil.extractProtocol("file://")); + VirtualFileManager.extractProtocol("file://")); assertEquals("file", - TestsLocationProviderUtil.extractProtocol("file:///some/path/file.rb:24")); + VirtualFileManager.extractProtocol("file:///some/path/file.rb:24")); assertEquals("file", - TestsLocationProviderUtil.extractProtocol("file://./some/path/file.rb:24")); + VirtualFileManager.extractProtocol("file://./some/path/file.rb:24")); assertEquals("ruby_qn", - TestsLocationProviderUtil.extractProtocol("ruby_qn://")); + VirtualFileManager.extractProtocol("ruby_qn://")); assertEquals("ruby_qn", - TestsLocationProviderUtil.extractProtocol("ruby_qn://A::B.method")); + VirtualFileManager.extractProtocol("ruby_qn://A::B.method")); } public void testExtractPath() {