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

execution: (test) Trim trailing spaces in PtyCommandLineTest

Browse Source 
For some reason WinPty loses trailing spaces in the argument.
This commit is contained in:
Eldar Abusalimov
2017-04-14 13:38:49 +03:00
parent c31f7ca36f
commit fe9ea5b112
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
+2 -2
View File
@@ -291,7 +291,7 @@ public class GeneralCommandLineTest {
if (argument.trim().isEmpty()) continue; // would report "ECHO is on"
GeneralCommandLine commandLine = createCommandLine(ExecUtil.getWindowsShellName(), "/D", "/C", "echo", argument);
String output = execAndGetOutput(commandLine);
assertEquals(commandLine.getPreparedCommandLine(), argument + "\n", output);
assertEquals(commandLine.getPreparedCommandLine(), filterExpectedOutput(argument) + "\n", output);
}
}
@@ -305,7 +305,7 @@ public class GeneralCommandLineTest {
for (String argument : ARGUMENTS) {
GeneralCommandLine commandLine = createCommandLine(cygwinPrintf.getPath(), "[%s]\\\\n", argument);
String output = execAndGetOutput(commandLine);
assertEquals(commandLine.getPreparedCommandLine(), filterExpectedOutput("[" + argument + "]\n"), output);
assertEquals(commandLine.getPreparedCommandLine(), filterExpectedOutput("[" + argument + "]") + "\n", output);
}
}
platform/platform-tests/testSrc/com/intellij/execution/PtyCommandLineTest.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class PtyCommandLineTest extends GeneralCommandLineTest {
@NotNull
@Override
protected String filterExpectedOutput(@NotNull String output) {
if (SystemInfo.isWindows) output = expandTabs(output, 8);
if (SystemInfo.isWindows) output = StringUtil.trimTrailing(expandTabs(output, 8));
return output;
}