Merge pull request #58 from RossPatterson/WinSmokeTests

na-ka-na · web-flow · commit 239c0af4e43f · 2021-03-15T23:41:33.000-07:00
Make Windows smoke tests actually work.
diff --git a/test/com/ka/spreadsheet/diff/SpreadSheetDifferSmokeTest.java b/test/com/ka/spreadsheet/diff/SpreadSheetDifferSmokeTest.java
@@ -129,7 +129,13 @@ public static void main(String[] args) throws Exception {
   }
 
   private static File resultFile(String resultFile) {
-    return new File(isWindows ? ("win_" + resultFile) : resultFile);
+    if (isWindows) {
+      File tempFile = new File(resultFile);
+      String dir = tempFile.getParent();
+      String filename = "win_" + tempFile.getName();
+      resultFile = dir + File.separator + filename;
+    }
+    return new File(resultFile);
   }
 
   public static void testDiff(String testName, String[] args, @Nullable File expectedOutFile,

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,13 @@ public static void main(String[] args) throws Exception {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`private static File resultFile(String resultFile) {`
`132`		`- return new File(isWindows ? ("win_" + resultFile) : resultFile);`
	`132`	`+ if (isWindows) {`
	`133`	`+ File tempFile = new File(resultFile);`
	`134`	`+ String dir = tempFile.getParent();`
	`135`	`+ String filename = "win_" + tempFile.getName();`
	`136`	`+ resultFile = dir + File.separator + filename;`
	`137`	`+ }`
	`138`	`+ return new File(resultFile);`
`133`	`139`	`}`
`134`	`140`
`135`	`141`	`public static void testDiff(String testName, String[] args, @Nullable File expectedOutFile,`