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

Commit c47198a

Browse files
authored
Simplify logic for ignoring empty classes when validating code coverage (#121)
* Simplify logic for ignoring empty classes in code coverage validation * Bump Core & CLI patch versions
1 parent 9d5f1a6 commit c47198a

File tree

23 files changed

+28
-32
lines changed

23 files changed

+28
-32
lines changed

packages/azpipelines/BuildTasks/AnalyzeWithPMDTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-devops-node-api": "^10.1.1",
1818
"azure-pipelines-task-lib": "^2.9.5",
1919
"xml2js": "^0.4.23"

packages/azpipelines/BuildTasks/CreateDeltaPackageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"applicationinsights": "^1.6.0",
1818
"azure-pipelines-task-lib": "^2.8.0"
1919
}

packages/azpipelines/BuildTasks/CreateSourcePackageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"applicationinsights": "^1.6.0",
1818
"azure-pipelines-task-lib": "^2.8.0",
1919
"fs-extra": "^8.1.0"

packages/azpipelines/BuildTasks/CreateUnlockedPackageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/azpipelines/BuildTasks/DeployDestructiveManifestToOrgTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0",
1818
"rimraf": "^3.0.0"
1919
}

packages/azpipelines/BuildTasks/DeploySourceToOrgTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0",
1818
"rimraf": "^3.0.0"
1919
}

packages/azpipelines/BuildTasks/ExportSourceFromAnOrgTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"applicationinsights": "^1.6.0",
1818
"azure-pipelines-task-lib": "^2.8.0"
1919
}

packages/azpipelines/BuildTasks/IncrementProjectBuildNumberTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0",
1818
"simple-git": "^1.126.0"
1919
}

packages/azpipelines/BuildTasks/InstallPackageDependenciesTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/azpipelines/BuildTasks/InstallUnlockedPackageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/azpipelines/BuildTasks/ManageScratchOrgTaskCurrent/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/azpipelines/BuildTasks/PromoteUnlockedPackageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/azpipelines/BuildTasks/TriggerApexTestTask/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/azpipelines/BuildTasks/TriggerApexTestTask/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sfpowerscripts-triggerapextest-task",
33
"description": "sfpowerscripts-triggerapextest-task",
4-
"version": "8.0.1",
4+
"version": "8.0.2",
55
"private": true,
66
"repository": {
77
"type": "git",
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0",
1818
"fs-extra": "^8.1.0"
1919
}

packages/azpipelines/BuildTasks/TriggerApexTestTask/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"version": {
1010
"Major": 8,
1111
"Minor": 0,
12-
"Patch": 1
12+
"Patch": 2
1313
},
1414
"runsOn": [
1515
"Agent"

packages/azpipelines/BuildTasks/ValidateApexCoverageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/azpipelines/BuildTasks/ValidateDXUnlockedPackageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/azpipelines/BuildTasks/ValidateTestCoveragePackageTask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
16+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1717
"azure-pipelines-task-lib": "^2.8.0"
1818
}
1919
}

packages/core/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dxatscale/sfpowerscripts.core",
3-
"version": "1.2.2",
3+
"version": "1.2.3",
44
"description": "Core Module used by sfpowerscripts",
55
"main": "lib/index",
66
"types": "lib/index",

packages/core/src/sfdxwrappers/TriggerApexTestImpl.ts

+4-8
Original file line numberDiff line numberDiff line change
@@ -154,23 +154,19 @@ export default class TriggerApexTestImpl {
154154
);
155155

156156
let code_coverage_json = JSON.parse(code_coverage);
157-
code_coverage_json = this.filterEmptyClassesFromCodeCoverage(code_coverage_json);
158157
code_coverage_json = this.filterCodeCoverageToPackageClasses(code_coverage_json, packageClasses);
159158

160159
for (let classCoverage of code_coverage_json) {
161-
if (classCoverage["coveredPercent"] < this.test_options["coverageThreshold"]) {
160+
if (
161+
classCoverage["coveredPercent"] !== null &&
162+
classCoverage["coveredPercent"] < this.test_options["coverageThreshold"]
163+
) {
162164
classesWithInvalidCoverage.push(classCoverage["name"]);
163165
}
164166
}
165167
return classesWithInvalidCoverage;
166168
}
167169

168-
private filterEmptyClassesFromCodeCoverage(codeCoverage): string[] {
169-
return codeCoverage.filter( (classCoverage) => {
170-
return classCoverage["totalLines"] != 0;
171-
});
172-
}
173-
174170
private filterCodeCoverageToPackageClasses(codeCoverage, packageClasses: string[]) {
175171
let filteredCodeCoverage = codeCoverage;
176172
if (!isNullOrUndefined(packageClasses)) {

packages/sfpowerscripts-cli/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/sfpowerscripts-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@dxatscale/sfpowerscripts",
33
"description": "Simple wrappers around sfdx commands to help set up CI/CD quickly",
4-
"version": "0.9.2",
4+
"version": "0.9.3",
55
"author": "dxatscale",
66
"bin": {
77
"readVars": "./scripts/readVars.sh"
88
},
99
"bugs": "https://github.com/Accenture/sfpowerscripts/issues",
1010
"dependencies": {
11-
"@dxatscale/sfpowerscripts.core": "^1.2.2",
11+
"@dxatscale/sfpowerscripts.core": "^1.2.3",
1212
"@oclif/command": "^1",
1313
"@oclif/config": "^1",
1414
"@oclif/errors": "^1",

0 commit comments

Comments
 (0)