Updating the tests

mathworks · Jul 16, 2024 · 0b45d32 · 0b45d32
1 parent 313d60d
commit 0b45d32
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 14 deletions.
diff --git a/src/integ-test/java/com/mathworks/ci/DockerSupportIT.java b/src/integ-test/java/com/mathworks/ci/DockerSupportIT.java
@@ -1,5 +1,9 @@
 package com.mathworks.ci;
 
+import com.mathworks.ci.freestyle.RunMatlabCommandBuilder;
+import com.mathworks.ci.freestyle.RunMatlabTestsBuilder;
+import com.mathworks.ci.freestyle.options.SourceFolder;
+import com.mathworks.ci.freestyle.options.SourceFolderPaths;
 import com.sun.akuma.CLibrary;
 import hudson.FilePath;
 import hudson.model.WorkspaceBrowser;
@@ -28,7 +32,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.StringUtils;
 import jenkins.model.*;

diff --git a/src/integ-test/java/com/mathworks/ci/FilterTestFolderIT.java b/src/integ-test/java/com/mathworks/ci/FilterTestFolderIT.java
@@ -20,7 +20,6 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.concurrent.TimeUnit;
 
 public class FilterTestFolderIT {
  private WorkflowJob project;

diff --git a/src/integ-test/java/com/mathworks/ci/GlobalToolIT.java b/src/integ-test/java/com/mathworks/ci/GlobalToolIT.java
@@ -2,6 +2,7 @@
 
 import com.gargoylesoftware.htmlunit.WebAssert;
 import com.gargoylesoftware.htmlunit.html.*;
+import com.mathworks.ci.freestyle.RunMatlabCommandBuilder;
 import hudson.matrix.*;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
@@ -19,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;

diff --git a/src/integ-test/java/com/mathworks/ci/PersistentIT.java b/src/integ-test/java/com/mathworks/ci/PersistentIT.java
@@ -2,6 +2,8 @@
 
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+import com.mathworks.ci.freestyle.RunMatlabTestsBuilder;
+import com.mathworks.ci.freestyle.options.SourceFolderPaths;
 import groovy.util.GroovyTestCase;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
@@ -16,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

diff --git a/src/integ-test/java/com/mathworks/ci/PipelineIT.java b/src/integ-test/java/com/mathworks/ci/PipelineIT.java
@@ -13,7 +13,6 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.concurrent.TimeUnit;
 
 import static org.jvnet.hudson.test.JenkinsRule.getLog;
 

diff --git a/src/integ-test/java/com/mathworks/ci/RunMATLABCommandIT.java b/src/integ-test/java/com/mathworks/ci/RunMATLABCommandIT.java
@@ -2,6 +2,7 @@
 
 import com.gargoylesoftware.htmlunit.*;
 import com.gargoylesoftware.htmlunit.html.*;
+import com.mathworks.ci.freestyle.RunMatlabCommandBuilder;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
 import hudson.model.Result;
@@ -29,7 +30,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 
 public class RunMATLABCommandIT {
@@ -64,8 +64,8 @@ public void testTearDown() {
 
  @Test
  public void verifyBuildFailureWhenMatlabCommandFails() throws Exception {
- // this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), MatlabRootSetup.getMatlabRoot()));
- // project.getBuildWrappersList().add(this.buildWrapper);
+ this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), MatlabRootSetup.getMatlabRoot()));
+ project.getBuildWrappersList().add(this.buildWrapper);
  RunMatlabCommandBuilder tester =
  new RunMatlabCommandBuilder();
  tester.setMatlabCommand(TestData.getPropValues("pwd"));
@@ -79,8 +79,8 @@ public void verifyBuildFailureWhenMatlabCommandFails() throws Exception {
  */
  @Test
  public void verifyBuildPassesWhenMatlabCommandPasses() throws Exception {
- // this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), MatlabRootSetup.getMatlabRoot()));
- // project.getBuildWrappersList().add(this.buildWrapper);
+ this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), MatlabRootSetup.getMatlabRoot()));
+ project.getBuildWrappersList().add(this.buildWrapper);
  RunMatlabCommandBuilder tester =
  new RunMatlabCommandBuilder();
  tester.setMatlabCommand("version");

diff --git a/src/integ-test/java/com/mathworks/ci/RunMATLABTestsIT.java b/src/integ-test/java/com/mathworks/ci/RunMATLABTestsIT.java
@@ -2,6 +2,11 @@
 
 import com.gargoylesoftware.htmlunit.*;
 import com.gargoylesoftware.htmlunit.html.*;
+import com.mathworks.ci.freestyle.RunMatlabTestsBuilder;
+import com.mathworks.ci.freestyle.options.SelectByFolder;
+import com.mathworks.ci.freestyle.options.SourceFolder;
+import com.mathworks.ci.freestyle.options.SourceFolderPaths;
+import com.mathworks.ci.freestyle.options.TestFolders;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
 import hudson.model.Result;
@@ -26,7 +31,6 @@
 import java.net.URL;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
@@ -88,7 +92,7 @@ public void verifyInvalidMATLABRootError() throws Exception{
  HtmlPage configurePage = jenkins.createWebClient().goTo("job/test0/configure");
  HtmlCheckBoxInput matlabver=configurePage.getElementByName("com-mathworks-ci-UseMatlabVersionBuildWrapper");
  matlabver.setChecked(true);
- WebAssert.assertTextPresent(configurePage, TestMessage.getValue("Builder.invalid.matlab.root.warning"));
+ WebAssert.assertTextPresent(configurePage, com.mathworks.ci.TestMessage.getValue("Builder.invalid.matlab.root.warning"));
  }
 
  @Test
@@ -114,7 +118,7 @@ public void verifyBuilderFailsForInvalidMATLABPath() throws Exception {
  project.getBuildersList().add(this.testBuilder);
 
  FreeStyleBuild build = project.scheduleBuild2(0).get();
- jenkins.assertLogContains(TestMessage.getValue("matlab.not.found.error"), build);
+ jenkins.assertLogContains(com.mathworks.ci.TestMessage.getValue("matlab.not.found.error"), build);
  jenkins.assertBuildStatus(Result.FAILURE, build);
  }
 

diff --git a/src/integ-test/java/com/mathworks/ci/StageFailureExceptionIT.java b/src/integ-test/java/com/mathworks/ci/StageFailureExceptionIT.java
@@ -11,7 +11,6 @@
 import org.jvnet.hudson.test.JenkinsRule;
 
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 public class StageFailureExceptionIT {
  private WorkflowJob project;

diff --git a/src/integ-test/java/com/mathworks/ci/StartupOptionsIT.java b/src/integ-test/java/com/mathworks/ci/StartupOptionsIT.java
@@ -1,5 +1,9 @@
 package com.mathworks.ci;
 
+import com.mathworks.ci.freestyle.RunMatlabBuildBuilder;
+import com.mathworks.ci.freestyle.RunMatlabCommandBuilder;
+import com.mathworks.ci.freestyle.RunMatlabTestsBuilder;
+import com.mathworks.ci.freestyle.options.*;
 import hudson.FilePath;
 import hudson.matrix.MatrixBuild;
 import hudson.matrix.MatrixProject;