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

fix svn command line (status parse) test for Linux/Mac

Browse Source
This commit is contained in:
irengrig
2013-01-10 01:27:48 +04:00
parent bcd4a90be1
commit 898ab4f970
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java
+12 -3
View File
@@ -15,6 +15,8 @@
*/
package org.jetbrains.idea.svn;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.Consumer;
import com.intellij.util.containers.Convertor;
@@ -554,6 +556,7 @@ public class SvnParseCommandLineParseTest extends TestCase {
"</status>\n";
final SvnStatusHandler[] handlerArr = new SvnStatusHandler[1];
final String basePath = SystemInfo.isWindows ? "C:/base/" : "/base/";
final SvnStatusHandler handler = new
SvnStatusHandler(new SvnStatusHandler.ExternalDataCallback() {
@Override
@@ -564,7 +567,7 @@ public class SvnParseCommandLineParseTest extends TestCase {
@Override
public void switchChangeList(String newList) {
}
}, new File("C:/base/"), new Convertor<File, SVNInfo>() {
}, new File(basePath), new Convertor<File, SVNInfo>() {
@Override
public SVNInfo convert(File o) {
try {
@@ -578,7 +581,7 @@ public class SvnParseCommandLineParseTest extends TestCase {
final int secondIdx = o.getPath().indexOf(":", idx + 1);
Assert.assertTrue(o.getPath(), secondIdx == -1);
try {
return createStubInfo("C:/base/1", "http://a.b.c");
return createStubInfo(basePath + "1", "http://a.b.c");
}
catch (SVNException e) {
//
@@ -588,11 +591,17 @@ public class SvnParseCommandLineParseTest extends TestCase {
});
handlerArr[0] = handler;
final String osChecked = changePathsIfNix(s);
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
parser.parse(new ByteArrayInputStream(s.getBytes(CharsetToolkit.UTF8_CHARSET)), handler);
parser.parse(new ByteArrayInputStream(osChecked.getBytes(CharsetToolkit.UTF8_CHARSET)), handler);
final MultiMap<String,PortableStatus> changes = handler.getCurrentListChanges();
}
private String changePathsIfNix(String s) {
s = StringUtil.replace(s, "\\", "/");
return StringUtil.replace(s, "C:/", "/c/");
}
private IdeaSVNInfo createStubInfo(final String basePath, final String baseUrl) throws SVNException {
return new IdeaSVNInfo(basePath, SVNURL.parseURIEncoded(baseUrl), SVNRevision.HEAD, SVNNodeKind.FILE, "",
SVNURL.parseURIEncoded("http://a.b.c"), 1, new Date(), "me", null, SVNDepth.EMPTY, 1);