MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

extractProtocol — use platform util

Browse Source
This commit is contained in:
Vladimir Krivosheev
2012-12-27 16:27:12 +04:00
parent 9fc0fe0808
commit 89c3c2931a
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/smRunner/src/com/intellij/execution/testframework/sm/TestsLocationProviderUtil.java
+2 -12
View File
@@ -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;
}
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
+2 -1
View File
@@ -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) {
platform/smRunner/testSrc/com/intellij/execution/testframework/sm/LocationProviderUtilTest.java
+8 -7
View File
@@ -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() {