Updated tests

Author: Nikhil Bhoski

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

@@ -261,7 +261,7 @@ public void verifyMATLABrunnerFileGenerated() throws Exception {
         scriptBuilder.setMatlabCommand("pwd");
         project.getBuildersList().add(scriptBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
-        jenkins.assertLogContains("MATLAB_ROOT", build);
+        jenkins.assertLogContains("run_matlab_command", build);
     }
 
 	/*
@@ -285,12 +285,12 @@ public void verifyMatrixBuildFails() throws Exception {
 		vals.put("VERSION", "R2018a");
 		Combination c1 = new Combination(vals);
 		MatrixRun build = matrixProject.scheduleBuild2(0).get().getRun(c1);
-		jenkins.assertLogContains("MATLAB_ROOT", build);
+		jenkins.assertLogContains("run_matlab_command", build);
 		jenkins.assertBuildStatus(Result.FAILURE, build);
 		vals.put("VERSION", "R2018b");
 		Combination c2 = new Combination(vals);
 		MatrixRun build2 = matrixProject.scheduleBuild2(0).get().getRun(c2);
-		jenkins.assertLogContains("MATLAB_ROOT", build2);
+		jenkins.assertLogContains("run_matlab_command", build2);
 		jenkins.assertBuildStatus(Result.FAILURE, build2);
 	}
 

src/test/java/com/mathworks/ci/RunMatlabTestsBuilderTest.java

@@ -343,7 +343,7 @@ public void verifyMATLABrunnerFileGeneratedForAutomaticOption() throws Exception
         project.getBuildWrappersList().add(this.buildWrapper);
         project.getBuildersList().add(testBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
-        jenkins.assertLogContains("MATLAB_ROOT", build);
+        jenkins.assertLogContains("run_matlab_command", build);
     }
 
 	/*
@@ -355,7 +355,7 @@ public void verifyMATLABrunnerFileGeneratedForAutomaticOption() throws Exception
 	@Test
 	public void verifyMatrixBuildFails() throws Exception {
 		MatrixProject matrixProject = jenkins.createProject(MatrixProject.class);
-		Axis axes = new Axis("VERSION", "R2018a", "R2018b");
+		Axis axes = new Axis("VERSION", "R2018a", "R2015b");
 		matrixProject.setAxes(new AxisList(axes));
 		String matlabRoot = getMatlabroot("R2018b");
 		this.buildWrapper.setMatlabRootFolder(matlabRoot.replace("R2018b", "$VERSION"));
@@ -370,15 +370,17 @@ public void verifyMatrixBuildFails() throws Exception {
 		Combination c1 = new Combination(vals);
 		MatrixRun build1 = matrixProject.scheduleBuild2(0).get().getRun(c1);
 
-		jenkins.assertLogContains("MATLAB_ROOT", build1);
+		jenkins.assertLogContains("run_matlab_command", build1);
 		jenkins.assertBuildStatus(Result.FAILURE, build1);
 
 		// Check for second Matrix combination
-
-		Combination c2 = new Combination(vals);
+        
+		Map<String, String> val = new HashMap<String, String>();
+        val.put("VERSION", "R2015b");
+		Combination c2 = new Combination(val);
 		MatrixRun build2 = matrixProject.scheduleBuild2(0).get().getRun(c2);
 
-		jenkins.assertLogContains("MATLAB_ROOT", build2);
+		jenkins.assertLogContains("MatlabNotFoundError", build2);
 		jenkins.assertBuildStatus(Result.FAILURE, build2);
 	}