Skip to content
This repository has been archived by the owner on Mar 18, 2024. It is now read-only.

Filter class coverage by package #112

Merged
merged 11 commits into from
Aug 3, 2020
Merged

Filter class coverage by package #112

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d25b7f0
Add package filtering to Trigger Apex Test core impl
aly76 Jul 31, 2020
f39e71a
Add packagetovalidate flag to Trigger Apex Test task in the CLI
aly76 Jul 31, 2020
1396052
Refactor Trigger Apex Test core implementation
aly76 Jul 31, 2020
965b480
Add package to validate & project directory parameters to Azp Trigger…
aly76 Jul 31, 2020
1f96f6f
Wrap xml2js parsestring with function that returns promise
aly76 Aug 1, 2020
985a4fc
Refactor getPackageDirectory & getClassesFromPackageManifest
aly76 Aug 2, 2020
3668dfd
Update Trigger Apex Test examples
aly76 Aug 2, 2020
4bcce28
Return mdapi directory in getPackageManifest function
aly76 Aug 2, 2020
66b6f11
Rename getPackageManifest function to getMdapiPackage
aly76 Aug 2, 2020
da46bf4
Move code coverage filter to separate function
aly76 Aug 3, 2020
06eb555
Move validate class code coverage into function
aly76 Aug 3, 2020
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
92 changes: 53 additions & 39 deletions packages/core/src/sfdxwrappers/TriggerApexTestImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,42 +100,7 @@ export default class TriggerApexTestImpl {
if (this.test_options["isValidateCoverage"]) {
console.log(`Validating individual classes for code coverage greater than ${this.test_options["coverageThreshold"]} percent`);

let projectConfig: string;
if (!isNullOrUndefined(this.project_directory)) {
projectConfig = path.join(
this.project_directory,
"sfdx-project.json"
);
} else {
projectConfig = "sfdx-project.json";
}

let projectJson = JSON.parse(
fs.readFileSync(projectConfig, "utf8")
);

let packageDirectory: string;
projectJson["packageDirectories"].forEach( (pkg) => {
if (this.test_options["packageToValidate"] == pkg["package"])
packageDirectory = pkg["path"];
});

let packageClasses: string[];
if (isNullOrUndefined(packageDirectory)) {
throw new Error("Package or package directory to validate does not exist");
} else {
let packageJson = await getPackageManifest(
this.project_directory,
packageDirectory
);

for (let type of packageJson["Package"]["types"]) {
if (type["name"] == "ApexClass") {
packageClasses = type["members"];
break;
}
}
}
let packageClasses: string[] = await this.getClassesFromPackageManifest();

let code_coverage = fs.readFileSync(
path.join(
Expand All @@ -147,6 +112,7 @@ export default class TriggerApexTestImpl {
let code_coverage_json = JSON.parse(code_coverage);

if (!isNullOrUndefined(packageClasses)) {
// only include package classes in code coverage report
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you move this logic to another function block?

code_coverage_json = code_coverage_json.filter( (classCoverage) => {
for (let packageClass of packageClasses) {
if (packageClass == classCoverage["name"])
Expand All @@ -156,9 +122,9 @@ export default class TriggerApexTestImpl {
});
}

for (let testClass of code_coverage_json) {
if (testClass["coveredPercent"] < this.test_options["coverageThreshold"]) {
classesWithInvalidCoverage.push(testClass["name"]);
for (let classCoverage of code_coverage_json) {
if (classCoverage["coveredPercent"] < this.test_options["coverageThreshold"]) {
classesWithInvalidCoverage.push(classCoverage["name"]);
}
}
}
Expand Down Expand Up @@ -202,4 +168,52 @@ export default class TriggerApexTestImpl {
console.log(`Generated Command: ${command}`);
return command;
}


private async getClassesFromPackageManifest(): Promise<string[]> {
let packageClasses: string[];

let packageDirectory: string = this.getPackageDirectory();

let packageManifest = await getPackageManifest(
this.project_directory,
packageDirectory
);

for (let type of packageManifest["Package"]["types"]) {
if (type["name"] == "ApexClass") {
packageClasses = type["members"];
break;
}
}
return packageClasses;
}

private getPackageDirectory(): string {
let packageDirectory: string;

let projectConfig: string;
if (!isNullOrUndefined(this.project_directory)) {
projectConfig = path.join(
this.project_directory,
"sfdx-project.json"
);
} else {
projectConfig = "sfdx-project.json";
}

let projectJson = JSON.parse(
fs.readFileSync(projectConfig, "utf8")
);

projectJson["packageDirectories"].forEach( (pkg) => {
if (this.test_options["packageToValidate"] == pkg["package"])
packageDirectory = pkg["path"];
});

if (isNullOrUndefined(packageDirectory))
throw new Error("Package or package directory to validate does not exist");
else
return packageDirectory;
}
}