Skip to content
Merged
Show file tree
Hide file tree
Changes from 31 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
30 changes: 29 additions & 1 deletion integ-test-promote-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,24 @@ jobs:
testResultsJUnit: test-results/matlab/selectbyfolder.xml
selectByFolder: tests/filteredTest
- task: MathWorks.matlab-azure-devops-extension-dev.RunMATLABTests.RunMATLABTests@${{ version }}
displayName: Run MATLAB tests filter by folder
displayName: Run MATLAB tests filter by tag
inputs:
testResultsJUnit: test-results/matlab/selectbytag.xml
selectByTag: FILTERED
- task: MathWorks.matlab-azure-devops-extension-dev.RunMATLABTests.RunMATLABTests@${{ version }}
displayName: Run MATLAB tests filter by name
inputs:
testResultsJUnit: test-results/matlab/selectbyname.xml
selectByName: "filtertest/* mytest/StartupTest"
sourceFolder: src
condition: not(eq(${{ version }}, '0'))
- task: MathWorks.matlab-azure-devops-extension-dev.RunMATLABTests.RunMATLABTests@${{ version }}
displayName: Run MATLAB tests filter by name with multiple spaces
inputs:
testResultsJUnit: test-results/matlab/selectbynamewithmultiplespaces.xml
selectByName: "filtertest/* mytest/StartupTest"
sourceFolder: src
condition: not(eq(${{ version }}, '0'))
- bash: |
set -e
grep -q FirstTest test-results/matlab/results.xml
Expand Down Expand Up @@ -254,6 +268,20 @@ jobs:
grep -v FirstTest test-results/matlab/selectbytag.xml
grep -v simpleTest test-results/matlab/selectbytag.xml
displayName: Verify test filtered by tag name
- bash: |
set -e
grep -q StartupTest test-results/matlab/selectbyname.xml
grep -q simpleTest test-results/matlab/selectbyname.xml
! grep -q FirstTest test-results/matlab/selectbyname.xml
displayName: Verify test filtered by name
condition: not(eq(${{ version }}, '0'))
- bash: |
set -e
grep -q StartupTest test-results/matlab/selectbynamewithmultiplespaces.xml
grep -q simpleTest test-results/matlab/selectbynamewithmultiplespaces.xml
! grep -q FirstTest test-results/matlab/selectbynamewithmultiplespaces.xml
displayName: Verify test filtered by name with multiple spaces
condition: not(eq(${{ version }}, '0'))
- bash: |
echo 'diary console.log' >> startup.m
displayName: Set up diary for logging
Expand Down
1 change: 1 addition & 0 deletions tasks/run-matlab-tests/v1/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ async function run() {
SourceFolder: taskLib.getInput("sourceFolder"),
SelectByFolder: taskLib.getInput("selectByFolder"),
SelectByTag: taskLib.getInput("selectByTag"),
SelectByName: taskLib.getInput("selectByName"),
CoberturaModelCoverage: taskLib.getInput("modelCoverageCobertura"),
HTMLModelCoverage: taskLib.getInput("modelCoverageHTML"),
SimulinkTestResults: taskLib.getInput("testResultsSimulinkTest"),
Expand Down
11 changes: 11 additions & 0 deletions tasks/run-matlab-tests/v1/scriptgen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,22 @@ export interface IRunTestsOptions {
HTMLModelCoverage?: string;
SelectByTag?: string;
SelectByFolder?: string;
SelectByName?: string;
Strict?: boolean;
UseParallel?: boolean;
OutputDetail?: string;
LoggingLevel?: string;
}

// Function to convert space separated names to cell array of character vectors
export function getSelectByNameAsCellArray(input?: string): string {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully this is just temporary until scriptgen gets updated to properly accept SelectByName as a space separated string?

While unlikely, single-quotes in the strings need to be escaped or it may result in a malformed cell array.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I created an issue in scritgen repo and added a note to update this once that issue is resolved.

if (!input || !input.trim()) {
return "{}";
}
const items = input.split(/\s+/).filter(Boolean).map((s) => `\'${s}\'`);
return `\{${items.join(", ")}\}`;
}

export function generateCommand(options: IRunTestsOptions): string {
return `addpath('${path.join(__dirname, "scriptgen")}');` +
`testScript = genscript('Test',` +
Expand All @@ -34,6 +44,7 @@ export function generateCommand(options: IRunTestsOptions): string {
`'HTMLModelCoverage','${options.HTMLModelCoverage || ""}',` +
`'SelectByTag','${options.SelectByTag || ""}',` +
`'SelectByFolder','${options.SelectByFolder || ""}',` +
`'SelectByName',${getSelectByNameAsCellArray(options.SelectByName)},` +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a plan to go back and fix scriptgen so this can be:

'SelectByName','${options.SelectByName || ""}', ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, created an issue under scriptgen repo.

`'Strict',${options.Strict || false},` +
`'UseParallel',${options.UseParallel || false},` +
`'OutputDetail','${options.OutputDetail || ""}',` +
Expand Down
9 changes: 9 additions & 0 deletions tasks/run-matlab-tests/v1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@
"required": false,
"helpMarkDown": "Test tag used to select test suite elements. To create a test suite, the task uses only the test elements with the specified tag."
},
{
"name": "selectByName",
"type": "string",
"label": "By name",
"defaultValue": "",
"groupName": "filterTests",
"required": false,
"helpMarkDown": "Test name used to select test suite elements. To create a test suite, the task uses only the test elements that match the specified name."
},
{
"name": "strict",
"type": "boolean",
Expand Down
8 changes: 6 additions & 2 deletions tasks/run-matlab-tests/v1/test/scriptgen.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default function suite() {
HTMLModelCoverage: "",
SelectByTag: "",
SelectByFolder: "",
SelectByName: "",
Strict: false,
UseParallel: false,
OutputDetail: "",
Expand All @@ -38,14 +39,15 @@ export default function suite() {
assert(actual.includes("'HTMLModelCoverage',''"));
assert(actual.includes("'SelectByTag',''"));
assert(actual.includes("'SelectByFolder',''"));
assert(actual.includes("'SelectByName',{}"));
assert(actual.includes("'Strict',false"));
assert(actual.includes("'UseParallel',false"));
assert(actual.includes("'OutputDetail',''"));
assert(actual.includes("'LoggingLevel',''"));

const expected = `genscript('Test', 'JUnitTestResults','', 'CoberturaCodeCoverage','','HTMLCodeCoverage','',
'SourceFolder','', 'PDFTestReport','', 'HTMLTestReport','', 'SimulinkTestResults','',
'CoberturaModelCoverage','', 'HTMLModelCoverage','', 'SelectByTag','', 'SelectByFolder','',
'CoberturaModelCoverage','', 'HTMLModelCoverage','', 'SelectByTag','', 'SelectByFolder','', 'SelectByName',{},
'Strict',false, 'UseParallel',false, 'OutputDetail','', 'LoggingLevel','')`
.replace(/\s+/g, "");
assert(actual.replace(/\s+/g, "").includes(expected));
Expand All @@ -64,6 +66,7 @@ export default function suite() {
HTMLModelCoverage: "test-results/modelcoverageHTML",
SelectByTag: "FeatureA",
SelectByFolder: "test/tools;test/toolbox",
SelectByName: "tTestA/* tTestB/*",
Strict: true,
UseParallel: true,
OutputDetail: "Detailed",
Expand All @@ -84,6 +87,7 @@ export default function suite() {
assert(actual.includes("'HTMLModelCoverage','test-results/modelcoverageHTML'"));
assert(actual.includes("'SelectByTag','FeatureA'"));
assert(actual.includes("'SelectByFolder','test/tools;test/toolbox'"));
assert(actual.includes("'SelectByName',{'tTestA/*', 'tTestB/*'}"));
assert(actual.includes("'Strict',true"));
assert(actual.includes("'UseParallel',true"));
assert(actual.includes("'OutputDetail','Detailed'"));
Expand All @@ -93,7 +97,7 @@ export default function suite() {
'CoberturaCodeCoverage','code-coverage/coverage.xml','HTMLCodeCoverage','code-coverage/coverageHTML', 'SourceFolder','source',
'PDFTestReport','test-results/pdf-results.pdf', 'HTMLTestReport','test-results/html-resultsHTML', 'SimulinkTestResults','test-results/simulinkTest.mldatx',
'CoberturaModelCoverage','test-results/modelcoverage.xml', 'HTMLModelCoverage','test-results/modelcoverageHTML', 'SelectByTag','FeatureA',
'SelectByFolder','test/tools;test/toolbox', 'Strict',true, 'UseParallel',true, 'OutputDetail','Detailed',
'SelectByFolder','test/tools;test/toolbox', 'SelectByName',{'tTestA/*', 'tTestB/*'}, 'Strict',true, 'UseParallel',true, 'OutputDetail','Detailed',
'LoggingLevel','Detailed' )`
.replace(/\s+/g, "");
assert(actual.replace(/\s+/g, "").includes(expected));
Expand Down