Fix Windows path-based test failures

Author: sameagen-MW

src/main/java/com/mathworks/ci/utilities/MatlabCommandRunner.java

@@ -5,6 +5,7 @@
  *
  */
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -36,7 +37,10 @@ public MatlabCommandRunner(MatlabActionParameters params) throws IOException, In
         this.additionalEnvVars = new HashMap<String,String>();
 
         // Create MATLAB folder
-        FilePath matlabFolder = new FilePath(params.getLauncher().getChannel(), params.getWorkspace().getRemote() + "/.matlab");
+        FilePath matlabFolder = new FilePath(
+                params.getLauncher().getChannel(), params.getWorkspace().getRemote() 
+                + File.separator 
+                + ".matlab");
         matlabFolder.mkdirs();
 
         // Create temp folder

src/test/java/integ/com/mathworks/ci/RunMatlabBuildBuilderTest.java

@@ -149,7 +149,7 @@ public void verifyMATLABlaunchedfromWorkspace() throws Exception {
         project.getBuildersList().add(this.scriptBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         String workspace = build.getWorkspace().getName();
-        jenkins.assertLogContains(File.separator + workspace + File.separator, build);
+        jenkins.assertLogContains("[" + workspace + "]", build);
     }
 
     /*

src/test/java/integ/com/mathworks/ci/RunMatlabCommandBuilderTest.java

@@ -156,7 +156,7 @@ public void verifyMATLABlaunchedfromWorkspace() throws Exception {
         project.getBuildersList().add(this.scriptBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         String workspace = build.getWorkspace().getName();
-        jenkins.assertLogContains(File.separator + workspace + File.separator, build);
+        jenkins.assertLogContains(File.separator + workspace, build);
     }
 
     /*

src/test/java/unit/com/mathworks/ci/utilities/MatlabCommandRunnerTest.java

@@ -95,10 +95,11 @@ public void constructorUsesParamsForTempFolder() throws IOException, Interrupted
     public void correctTempFolderLocation() throws IOException, InterruptedException {
         runner = new MatlabCommandRunner(params);
         FilePath tmp = runner.getTempFolder();
+        FilePath expected = new FilePath(new File(tempDir.getRoot(), ".matlab"));
 
         Assert.assertThat(
                 tmp.getRemote(),
-                startsWith(new File(tempDir.getRoot(), ".matlab").getAbsolutePath()));
+                startsWith(expected.getRemote()));
     }
 
     @Test
@@ -123,7 +124,8 @@ public Object answer(InvocationOnMock invocation) throws IOException {
         Assert.assertTrue(f.exists());
         Assert.assertEquals(
                 runner.getTempFolder().getRemote() 
-                + "/run-matlab-command",
+                + File.separator
+                + "run-matlab-command",
                 f.getRemote());
     }
 
@@ -138,7 +140,8 @@ public void prepareRunnerExecutableMac() throws IOException, InterruptedExceptio
         Assert.assertTrue(f.exists());
         Assert.assertEquals(
                 runner.getTempFolder().getRemote() 
-                + "/run-matlab-command",
+                + File.separator
+                + "run-matlab-command",
                 f.getRemote());
     }
 
@@ -151,7 +154,8 @@ public void prepareRunnerExecutableWindows() throws IOException, InterruptedExce
         Assert.assertTrue(f.exists());
         Assert.assertEquals(
                 runner.getTempFolder().getRemote()
-                + "/run-matlab-command.exe",
+                + File.separator
+                + "run-matlab-command.exe",
                 f.getRemote());
     }
 
@@ -178,7 +182,7 @@ public void copyFileFromResourcePathWorks() throws IOException, InterruptedExcep
         FilePath f = runner.copyFileToTempFolder("testcontent.txt", "target.txt");
 
         Assert.assertTrue(f.exists());
-        Assert.assertEquals("This has text!\n", f.readToString()); 
+        Assert.assertThat(f.readToString(), startsWith("This has text!")); 
     }
 
     @Test
@@ -189,7 +193,8 @@ public void runWorksInBasicCase() throws IOException, InterruptedException, Matl
         runner.runMatlabCommand(myCommand);
 
         String exe = runner.getTempFolder().getRemote()
-            + "/run-matlab-command.exe";
+            + File.separator
+            + "run-matlab-command.exe";
         String cmd = "setenv('MW_ORIG_WORKING_FOLDER', cd('"
             + runner.getTempFolder().getRemote()
             + "'));script_";