TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #1388: BaseCheckTestSupport.verify fails on Windows

This commit is contained in:
WonderCsabo 2015-07-15 20:36:45 +02:00 committed by Roman Ivanov
parent a767a81473
commit 943ace0dd6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java
View File

@ -133,7 +133,8 @@ public abstract class BaseCheckTestSupport
final String expected = aMessageFileName + ":" + aExpected[i];
String actual = lnr.readLine();
assertEquals("error message " + i, expected, actual);
String parseInt = actual.substring(actual.indexOf(":") + 1);
String parseInt = removeDeviceFromPathOnWindows(actual);
parseInt = parseInt.substring(parseInt.indexOf(":") + 1);
parseInt = parseInt.substring(0, parseInt.indexOf(":"));
int lineNumber = Integer.parseInt(parseInt);
Integer integer = Arrays.asList(aWarnsExpected).contains(lineNumber) ? lineNumber : 0;
@ -187,4 +188,12 @@ public abstract class BaseCheckTestSupport
}
return null;
}
private static String removeDeviceFromPathOnWindows(String string) {
String os = System.getProperty("os.name", "Unix");
if (os.startsWith("Windows")) {
return string.substring(string.indexOf(":") + 1);
}
return string;
}
}