Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ public void verifyTestResultsSummary() throws Exception {

// Verify MATLAB Test Result summary
String[] testResultSummaries = getTestResultSummaryFromBuildStatusPage(build);
assertEquals(testResultSummaries.length, 2);
List.of(testResultSummaries).forEach(summary -> {
assertTrue(summary.contains("Tests run: 4"));
assertTrue(summary.contains("Total tests: 4"));
assertTrue(summary.contains("Passed: 1"));
assertTrue(summary.contains("Failed: 3"));
assertTrue(summary.contains("Incomplete: 0"));
Expand Down Expand Up @@ -187,8 +188,9 @@ public void verifyTestResultsSummaryInMatrixProject() throws Exception {
Combination c = new Combination(new AxisList(new MatlabInstallationAxis(Arrays.asList("MATLAB_PATH_1"))), "MATLAB_PATH_1");
MatrixRun run = build.getRun(c);
String[] firstTestResultSummaries = getTestResultSummaryFromBuildStatusPage(run);
assertEquals(firstTestResultSummaries.length, 1);
List.of(firstTestResultSummaries).forEach(summary -> {
assertTrue(summary.contains("Tests run: 4"));
assertTrue(summary.contains("Total tests: 4"));
assertTrue(summary.contains("Passed: 1"));
assertTrue(summary.contains("Failed: 3"));
assertTrue(summary.contains("Incomplete: 0"));
Expand All @@ -215,17 +217,18 @@ public void verifySummaryInDeclarativePipeline() throws Exception {
" steps\n" +
" {\n" +
addTestData() + "\n" +
" runMATLABBuild('test')"+
" runMATLABBuild()"+
" }\n" +
" }\n" +
" }\n" +
"}";
WorkflowRun build = getPipelineBuild(script);

// Verify MATLAB Test Result summary
String[] buildResultSummaries = getTestResultSummaryFromBuildStatusPage(build);
List.of(buildResultSummaries).forEach(summary -> {
assertTrue(summary.contains("Tests run: 4"));
String[] testResultSummaries = getTestResultSummaryFromBuildStatusPage(build);
assertEquals(testResultSummaries.length,1);
List.of(testResultSummaries).forEach(summary -> {
assertTrue(summary.contains("Total tests: 4"));
assertTrue(summary.contains("Passed: 1"));
assertTrue(summary.contains("Failed: 3"));
assertTrue(summary.contains("Incomplete: 0"));
Expand All @@ -247,7 +250,7 @@ public void verifyPipelineOnSlave() throws Exception {
// Verify MATLAB Test Result summary
String[] BuildResultSummary= getTestResultSummaryFromBuildStatusPage(build);
List.of(BuildResultSummary).forEach(summary -> {
assertTrue(summary.contains("Tests run: 4"));
assertTrue(summary.contains("Total tests: 4"));
assertTrue(summary.contains("Passed: 1"));
assertTrue(summary.contains("Failed: 3"));
assertTrue(summary.contains("Incomplete: 0"));
Expand All @@ -257,6 +260,43 @@ public void verifyPipelineOnSlave() throws Exception {
jenkins.assertLogNotContains("Running on Jenkins", build);
}

@Test
public void verifyMultipleTestResultBuild() throws Exception{
String script = "pipeline {\n" +
" agent any\n" +
Utilities.getEnvironmentDSL() + "\n" +
" stages{\n" +
" stage('Run MATLAB Command') {\n" +
" steps\n" +
" {\n" +
addTestData() + "\n" +
" runMATLABBuild(tasks: 'passingTest')\n"+
" runMATLABCommand(command: 'runtests(\"IncludeSubfolder\", true)') "+
" }\n" +
" }\n" +
" }\n" +
"}";
WorkflowRun build = getPipelineBuild(script);

// Verify MATLAB Test Result summary
String[] testResultSummaries = getTestResultSummaryFromBuildStatusPage(build);
assertEquals(testResultSummaries.length, 2);

String testResultSummaryFromBuildStep = testResultSummaries[0];
assertTrue(testResultSummaryFromBuildStep.contains("Total tests: 4"));
assertTrue(testResultSummaryFromBuildStep.contains("Passed: 4"));
assertTrue(testResultSummaryFromBuildStep.contains("Failed: 0"));
assertTrue(testResultSummaryFromBuildStep.contains("Incomplete: 0"));
assertTrue(testResultSummaryFromBuildStep.contains("Not Run: 0"));

String testResultSummaryFromCommandStep = testResultSummaries[1];
assertTrue(testResultSummaryFromCommandStep.contains("Total tests: 4"));
assertTrue(testResultSummaryFromCommandStep.contains("Passed: 1"));
assertTrue(testResultSummaryFromCommandStep.contains("Failed: 3"));
assertTrue(testResultSummaryFromCommandStep.contains("Incomplete: 0"));
assertTrue(testResultSummaryFromCommandStep.contains("Not Run: 0"));
}


private String[] getTestResultSummaryFromBuildStatusPage(Run<?, ?> build) throws IOException, SAXException {
HtmlPage buildPage = jenkinsWebClient.getPage(build);
Expand Down
Binary file modified src/test/resources/TestData/FilterTestData.zip
Binary file not shown.
Loading