Skip to content

Feature/ Add test_prefix support under configured runner #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Edoardo-en wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature/ Add test_prefix support under configured runner #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 19 additions & 13 deletions src/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,16 +720,30 @@ export class CeedlingAdapter implements TestAdapter {
}
}

private setFunctionRegex(projectKey: string, ymlProjectData: any = undefined) {
private getTestPrefix(ymlProjectData: any = undefined): string {
let testPrefix = 'test|spec|should';
if (ymlProjectData) {
try {
const ymlProjectTestPrefix = ymlProjectData[':unity'][':test_prefix'];
if (ymlProjectTestPrefix != undefined) {
testPrefix = ymlProjectTestPrefix;
const ymlProjectUnityDefines = ymlProjectData[':unity'][':defines'];
if (ymlProjectUnityDefines != undefined && (ymlProjectUnityDefines.includes('-UNITY_SKIP_DEFAULT_RUNNER') || ymlProjectUnityDefines.includes('-RUN_TEST'))) {
const ymlProjectTestRunnerTestPrefix = ymlProjectData[':test_runner'][':test_prefix'];
if (ymlProjectTestRunnerTestPrefix != undefined){
testPrefix = ymlProjectTestRunnerTestPrefix;
}
}
else {
const ymlProjectTestPrefix = ymlProjectData[':unity'][':test_prefix'];
if (ymlProjectTestPrefix != undefined) {
testPrefix = ymlProjectTestPrefix;
}
}
} catch (e) { }
}
return testPrefix;
}

private setFunctionRegex(projectKey: string, ymlProjectData: any = undefined) {
let testPrefix = this.getTestPrefix(ymlProjectData);
const macroAliases = [...this.getTestCaseMacroAliases(), ...this.getTestRangeMacroAliases()].join('|');
this.functionRegexps[projectKey] = new RegExp(
`^((?:\\s*(?:${macroAliases})\\s*\\(.*?\\)\\s*)*)\\s*void\\s+((?:${testPrefix})(?:.*\\\\\\s+)*.*)\\s*\\(\\s*(.*)\\s*\\)`,
Expand Down Expand Up @@ -793,15 +807,7 @@ export class CeedlingAdapter implements TestAdapter {
}

private setTestLabelRegex(projectKey: string, ymlProjectData: any = undefined) {
let testPrefix = 'test|spec|should';
if (ymlProjectData) {
try {
const ymlProjectTestPrefix = ymlProjectData[':unity'][':test_prefix'];
if (ymlProjectTestPrefix != undefined) {
testPrefix = ymlProjectTestPrefix;
}
} catch (e) { }
}
let testPrefix = this.getTestPrefix(ymlProjectData);
this.testLabelRegexps[projectKey] = new RegExp(`(?:${testPrefix})_*(.*)`);
}

Expand Down