Fixed test failures

Author: nbhoski

src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java

@@ -188,7 +188,13 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
         // Set Environment variable
         setEnv(initialEnvironment);
 
-        String nodeSpecificMatlab = getNodeSpecificMatlab(Computer.currentComputer(), listener) + getNodeSpecificExecutable(launcher);
+        String nodeSpecificMatlab = "";
+        if(getNodeSpecificMatlab(Computer.currentComputer(), listener) != null) {
+             nodeSpecificMatlab = getNodeSpecificMatlab(Computer.currentComputer(), listener) + getNodeSpecificExecutable(launcher);
+        } else {
+            throw new IOException ("ERROR***");
+        }
+
         FilePath matlabExecutablePath = new FilePath(launcher.getChannel(), nodeSpecificMatlab);
 
         if (!matlabExecutablePath.exists()) {

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

@@ -62,6 +62,7 @@ public static void classSetup() throws URISyntaxException, IOException {
             url = classLoader.getResource("com/mathworks/ci/linux/bin/matlab.sh");
             try {
                 matlabExecutorAbsolutePath = new File(url.toURI()).getAbsolutePath();
+                System.out.println ("THE EXECUTOR PATH IS" + matlabExecutorAbsolutePath);
 
                 // Need to do this operation due to bug in maven Resource copy plugin [
                 // https://issues.apache.org/jira/browse/MRESOURCES-132 ]

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

@@ -93,13 +93,7 @@ private int execMatlabCommand(FilePath workspace, Launcher launcher,
             TaskListener listener) throws IOException, InterruptedException {
         ProcStarter matlabLauncher;
         try {
-            matlabLauncher = launcher.launch().pwd(workspace).envs(this.env);
-            if (matlabRel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_BATCH_SUPPORT)) {
-                ListenerLogDecorator outStream = new ListenerLogDecorator(listener);
-                matlabLauncher = matlabLauncher.cmds(testMatlabBuild()).stderr(outStream);
-            } else {
-                matlabLauncher = matlabLauncher.cmds(testMatlabBuild()).stdout(listener);
-            }
+            matlabLauncher = launcher.launch().pwd(workspace).envs(this.env).cmds(testMatlabBuild()).stdout(listener);
 
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());

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

@@ -94,13 +94,7 @@ private int execMatlabCommand(FilePath workspace, Launcher launcher,
             TaskListener listener) throws IOException, InterruptedException {
         ProcStarter matlabLauncher;
         try {
-            matlabLauncher = launcher.launch().pwd(workspace).envs(this.env);
-            if (matlabRel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_BATCH_SUPPORT)) {
-                ListenerLogDecorator outStream = new ListenerLogDecorator(listener);
-                matlabLauncher = matlabLauncher.cmds(testMatlabCommand()).stderr(outStream);
-            } else {
-                matlabLauncher = matlabLauncher.cmds(testMatlabCommand()).stdout(listener);
-            }
+            matlabLauncher = launcher.launch().pwd(workspace).envs(this.env).cmds(testMatlabCommand()).stdout(listener);
 
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());

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

@@ -179,14 +179,7 @@ public int execCommand(FilePath workspace, Launcher launcher, TaskListener liste
         }
         ProcStarter matlabLauncher;
         try {
-            matlabLauncher = launcher.launch().pwd(workspace).envs(this.env);
-            if (this.matlabroot != null && matlabRel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_BATCH_SUPPORT)) {
-                ListenerLogDecorator outStream = new ListenerLogDecorator(listener);
-                matlabLauncher = matlabLauncher.cmds(testMatlabCommand()).stderr(outStream);
-            } else {
-                matlabLauncher = matlabLauncher.cmds(testMatlabCommand()).stdout(listener);
-            }
-
+            matlabLauncher = launcher.launch().pwd(workspace).envs(this.env).cmds(testMatlabCommand()).stdout(listener);
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());
             return 1;