Skip to content
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

Jump to bottom

fix: cobertura paths fix #748

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: cobertura paths fix #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da017c3
fix: cobertura paths fix
Aeolun Oct 10, 2023
7fde665
chore: update github action versions
Aeolun Oct 10, 2023
6f307b4
Merge branch 'main' into master
bcoe Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
matrix:
node: [10, 12, 14, 16]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- run: node --version
Expand All @@ -30,8 +30,8 @@ jobs:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 12
- run: npm install
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"description": "monorepo containing the various nuts and bolts that facilitate istanbul.js test instrumentation",
"scripts": {
"test": "cross-env NODE_ENV=test nyc mocha --timeout 30000 packages/*/test{,/*}.js",
"test": "cross-env NODE_ENV=test FORCE_COLOR=1 nyc mocha --timeout 30000 packages/{istanbul-reports/test/*/*,*/test/*}.js",
"posttest": "eslint .",
"fix": "eslint . --fix",
"postinstall": "bash scripts/install.sh"
Expand Down
1 change: 0 additions & 1 deletion packages/istanbul-lib-hook/test/data/bar.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
module.exports = {
bar: function () { return 'bar'; }
};

5 changes: 3 additions & 2 deletions packages/istanbul-lib-hook/test/hook.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ const hook = require('../lib/hook');

let currentHook;
const matcher = function(file) {
return file.indexOf('foo.js') > 0;
return file.indexOf('foo.js') > -1;
};
const matcher2 = function(file) {
return file.indexOf('bar.es6') > 0;
return file.indexOf('bar.es6') > -1;
};
const transformer = function() {
return 'module.exports.bar = function () { return "bar"; };';
Expand Down Expand Up @@ -42,6 +42,7 @@ describe('hooks', () => {

it('transforms foo', () => {
const foo = require('./data/foo');
console.log('foo', foo);
assert.ok(foo.bar);
assert.equal(foo.bar(), 'bar');
});
Expand Down
114 changes: 114 additions & 0 deletions packages/istanbul-reports/lcov.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
TN:
SF:test-exclude/index.js
FN:12,TestExclude
FN:50,(anonymous_1)
FN:52,(anonymous_2)
FN:61,(anonymous_3)
FN:71,(anonymous_4)
FN:84,prepGlobPatterns
FN:85,(anonymous_6)
FN:100,(anonymous_7)
FNF:8
FNH:8
FNDA:21,TestExclude
FNDA:21,(anonymous_1)
FNDA:95,(anonymous_2)
FNDA:56,(anonymous_3)
FNDA:7,(anonymous_4)
FNDA:26,prepGlobPatterns
FNDA:105,(anonymous_6)
FNDA:21,(anonymous_7)
DA:1,1
DA:2,1
DA:3,1
DA:4,1
DA:5,1
DA:13,21
DA:21,21
DA:22,21
DA:24,21
DA:25,7
DA:28,21
DA:29,15
DA:32,21
DA:33,5
DA:35,16
DA:38,21
DA:39,5
DA:42,21
DA:50,1
DA:51,21
DA:52,21
DA:53,95
DA:55,95
DA:56,95
DA:58,21
DA:61,1
DA:62,56
DA:65,56
DA:67,55
DA:68,55
DA:71,1
DA:72,7
DA:76,7
DA:77,6
DA:78,6
DA:80,1
DA:85,26
DA:87,105
DA:88,39
DA:92,105
DA:93,50
DA:96,105
DA:100,1
DA:101,21
DA:104,1
DA:113,1
LF:46
LH:46
BRDA:21,0,0,1
BRDA:21,0,1,20
BRDA:21,1,0,1
BRDA:21,1,1,0
BRDA:22,2,0,1
BRDA:22,2,1,20
BRDA:24,3,0,7
BRDA:24,3,1,14
BRDA:24,4,0,21
BRDA:24,4,1,18
BRDA:24,4,2,15
BRDA:28,5,0,15
BRDA:28,5,1,6
BRDA:28,6,0,21
BRDA:28,6,1,8
BRDA:29,7,0,15
BRDA:29,7,1,0
BRDA:32,8,0,5
BRDA:32,8,1,16
BRDA:32,9,0,21
BRDA:32,9,1,5
BRDA:38,10,0,5
BRDA:38,10,1,16
BRDA:38,11,0,21
BRDA:38,11,1,20
BRDA:55,12,0,1
BRDA:55,12,1,94
BRDA:62,13,0,56
BRDA:62,13,1,56
BRDA:65,14,0,1
BRDA:65,14,1,55
BRDA:68,15,0,55
BRDA:68,15,1,15
BRDA:68,15,2,50
BRDA:76,16,0,6
BRDA:76,16,1,1
BRDA:76,17,0,7
BRDA:76,17,1,7
BRDA:76,17,2,6
BRDA:87,18,0,39
BRDA:87,18,1,66
BRDA:92,19,0,50
BRDA:92,19,1,55
BRF:43
BRH:41
end_of_record
14 changes: 9 additions & 5 deletions packages/istanbul-reports/lib/cobertura/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ class CoberturaReport extends ReportBase {
return;
}
this.xml.openTag('package', {
name: node.isRoot() ? 'main' : escape(asJavaPackage(node)),
name: node.isRoot()
? 'main'
: escape(asJavaPackage(node, this.projectRoot)),
'line-rate': metrics.lines.pct / 100.0,
'branch-rate': metrics.branches.pct / 100.0
});
Expand Down Expand Up @@ -90,7 +92,8 @@ class CoberturaReport extends ReportBase {

this.xml.openTag('methods');
const fnMap = fileCoverage.fnMap;
Object.entries(fnMap).forEach(([k, { name, decl }]) => {
Object.entries(fnMap).forEach(([k, item]) => {
const { name, decl } = item;
const hits = fileCoverage.f[k];
this.xml.openTag('method', {
name: escape(name),
Expand Down Expand Up @@ -136,9 +139,10 @@ class CoberturaReport extends ReportBase {
}
}

function asJavaPackage(node) {
return node
.getRelativeName()
function asJavaPackage(node, projectRoot) {
return node.path
.toString()
.replace(projectRoot, '')
.replace(/\//g, '.')
.replace(/\\/g, '.')
.replace(/\.$/, '');
Expand Down
40 changes: 22 additions & 18 deletions packages/istanbul-reports/test/cobertura/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,29 @@ describe('CoberturaReport', () => {
__dirname,
'../fixtures/specs/' + file
));
it(fixture.title, function() {
if (isWindows()) {
// appveyor does not render console color.
return this.skip();
}
const context = istanbulLibReport.createContext({
dir: './',
coverageMap: istanbulLibCoverage.createCoverageMap(fixture.map)
});
const tree = context.getTree('pkg');
const report = new CoberturaReport({
file: '-',
timestamp: '123456789',
...fixture.opts
if (fixture.coberturaCoverageData) {
it(fixture.title, function() {
if (isWindows()) {
// appveyor does not render console color.
return this.skip();
}
const context = istanbulLibReport.createContext({
dir: './',
coverageMap: istanbulLibCoverage.createCoverageMap(
fixture.map
)
});
const tree = context.getTree('pkg');
const report = new CoberturaReport({
file: '-',
timestamp: '123456789',
...fixture.opts
});
tree.visit(report, context);
const output = FileWriter.getOutput();
output.should.equal(fixture.coberturaCoverageData);
});
tree.visit(report, context);
const output = FileWriter.getOutput();
output.should.equal(fixture.coberturaCoverageData);
});
}
}

fs.readdirSync(path.resolve(__dirname, '../fixtures/specs')).forEach(
Expand Down
2 changes: 1 addition & 1 deletion packages/istanbul-reports/test/fixtures/specs/100-line-missing-branch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
}
]
},
"coberturaCoverageData": "<?xml version=\"1.0\" ?>\n<!DOCTYPE coverage SYSTEM \"http://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n<coverage lines-valid=\"46\" lines-covered=\"46\" line-rate=\"1\" branches-valid=\"43\" branches-covered=\"41\" branch-rate=\"0.9534999999999999\" timestamp=\"123456789\" complexity=\"0\" version=\"0.1\">\n <sources>\n <source>/Users/benjamincoe/oss/</source>\n </sources>\n <packages>\n <package name=\"main\" line-rate=\"1\" branch-rate=\"0.9534999999999999\">\n <classes>\n <class name=\"index.js\" filename=\"test-exclude/index.js\" line-rate=\"1\" branch-rate=\"0.9534999999999999\">\n <methods>\n <method name=\"TestExclude\" hits=\"21\" signature=\"()V\">\n <lines>\n <line number=\"12\" hits=\"21\"/>\n </lines>\n </method>\n <method name=\"(anonymous_1)\" hits=\"21\" signature=\"()V\">\n <lines>\n <line number=\"50\" hits=\"21\"/>\n </lines>\n </method>\n <method name=\"(anonymous_2)\" hits=\"95\" signature=\"()V\">\n <lines>\n <line number=\"52\" hits=\"95\"/>\n </lines>\n </method>\n <method name=\"(anonymous_3)\" hits=\"56\" signature=\"()V\">\n <lines>\n <line number=\"61\" hits=\"56\"/>\n </lines>\n </method>\n <method name=\"(anonymous_4)\" hits=\"7\" signature=\"()V\">\n <lines>\n <line number=\"71\" hits=\"7\"/>\n </lines>\n </method>\n <method name=\"prepGlobPatterns\" hits=\"26\" signature=\"()V\">\n <lines>\n <line number=\"84\" hits=\"26\"/>\n </lines>\n </method>\n <method name=\"(anonymous_6)\" hits=\"105\" signature=\"()V\">\n <lines>\n <line number=\"85\" hits=\"105\"/>\n </lines>\n </method>\n <method name=\"(anonymous_7)\" hits=\"21\" signature=\"()V\">\n <lines>\n <line number=\"100\" hits=\"21\"/>\n </lines>\n </method>\n </methods>\n <lines>\n <line number=\"1\" hits=\"1\" branch=\"false\"/>\n <line number=\"2\" hits=\"1\" branch=\"false\"/>\n <line number=\"3\" hits=\"1\" branch=\"false\"/>\n <line number=\"4\" hits=\"1\" branch=\"false\"/>\n <line number=\"5\" hits=\"1\" branch=\"false\"/>\n <line number=\"13\" hits=\"21\" branch=\"false\"/>\n <line number=\"21\" hits=\"21\" branch=\"true\" condition-coverage=\"75% (3/4)\"/>\n <line number=\"22\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"24\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (5/5)\"/>\n <line number=\"25\" hits=\"7\" branch=\"false\"/>\n <line number=\"28\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (4/4)\"/>\n <line number=\"29\" hits=\"15\" branch=\"true\" condition-coverage=\"50% (1/2)\"/>\n <line number=\"32\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (4/4)\"/>\n <line number=\"33\" hits=\"5\" branch=\"false\"/>\n <line number=\"35\" hits=\"16\" branch=\"false\"/>\n <line number=\"38\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (4/4)\"/>\n <line number=\"39\" hits=\"5\" branch=\"false\"/>\n <line number=\"42\" hits=\"21\" branch=\"false\"/>\n <line number=\"50\" hits=\"1\" branch=\"false\"/>\n <line number=\"51\" hits=\"21\" branch=\"false\"/>\n <line number=\"52\" hits=\"21\" branch=\"false\"/>\n <line number=\"53\" hits=\"95\" branch=\"false\"/>\n <line number=\"55\" hits=\"95\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"56\" hits=\"95\" branch=\"false\"/>\n <line number=\"58\" hits=\"21\" branch=\"false\"/>\n <line number=\"61\" hits=\"1\" branch=\"false\"/>\n <line number=\"62\" hits=\"56\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"65\" hits=\"56\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"67\" hits=\"55\" branch=\"false\"/>\n <line number=\"68\" hits=\"55\" branch=\"true\" condition-coverage=\"100% (3/3)\"/>\n <line number=\"71\" hits=\"1\" branch=\"false\"/>\n <line number=\"72\" hits=\"7\" branch=\"false\"/>\n <line number=\"76\" hits=\"7\" branch=\"true\" condition-coverage=\"100% (5/5)\"/>\n <line number=\"77\" hits=\"6\" branch=\"false\"/>\n <line number=\"78\" hits=\"6\" branch=\"false\"/>\n <line number=\"80\" hits=\"1\" branch=\"false\"/>\n <line number=\"85\" hits=\"26\" branch=\"false\"/>\n <line number=\"87\" hits=\"105\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"88\" hits=\"39\" branch=\"false\"/>\n <line number=\"92\" hits=\"105\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"93\" hits=\"50\" branch=\"false\"/>\n <line number=\"96\" hits=\"105\" branch=\"false\"/>\n <line number=\"100\" hits=\"1\" branch=\"false\"/>\n <line number=\"101\" hits=\"21\" branch=\"false\"/>\n <line number=\"104\" hits=\"1\" branch=\"false\"/>\n <line number=\"113\" hits=\"1\" branch=\"false\"/>\n </lines>\n </class>\n </classes>\n </package>\n </packages>\n</coverage>\n",
"coberturaCoverageData": "<?xml version=\"1.0\" ?>\n<!DOCTYPE coverage SYSTEM \"http://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n<coverage lines-valid=\"46\" lines-covered=\"46\" line-rate=\"1\" branches-valid=\"43\" branches-covered=\"41\" branch-rate=\"0.9534\" timestamp=\"123456789\" complexity=\"0\" version=\"0.1\">\n <sources>\n <source>/Users/benjamincoe/oss/</source>\n </sources>\n <packages>\n <package name=\"main\" line-rate=\"1\" branch-rate=\"0.9534\">\n <classes>\n <class name=\"index.js\" filename=\"test-exclude/index.js\" line-rate=\"1\" branch-rate=\"0.9534\">\n <methods>\n <method name=\"TestExclude\" hits=\"21\" signature=\"()V\">\n <lines>\n <line number=\"12\" hits=\"21\"/>\n </lines>\n </method>\n <method name=\"(anonymous_1)\" hits=\"21\" signature=\"()V\">\n <lines>\n <line number=\"50\" hits=\"21\"/>\n </lines>\n </method>\n <method name=\"(anonymous_2)\" hits=\"95\" signature=\"()V\">\n <lines>\n <line number=\"52\" hits=\"95\"/>\n </lines>\n </method>\n <method name=\"(anonymous_3)\" hits=\"56\" signature=\"()V\">\n <lines>\n <line number=\"61\" hits=\"56\"/>\n </lines>\n </method>\n <method name=\"(anonymous_4)\" hits=\"7\" signature=\"()V\">\n <lines>\n <line number=\"71\" hits=\"7\"/>\n </lines>\n </method>\n <method name=\"prepGlobPatterns\" hits=\"26\" signature=\"()V\">\n <lines>\n <line number=\"84\" hits=\"26\"/>\n </lines>\n </method>\n <method name=\"(anonymous_6)\" hits=\"105\" signature=\"()V\">\n <lines>\n <line number=\"85\" hits=\"105\"/>\n </lines>\n </method>\n <method name=\"(anonymous_7)\" hits=\"21\" signature=\"()V\">\n <lines>\n <line number=\"100\" hits=\"21\"/>\n </lines>\n </method>\n </methods>\n <lines>\n <line number=\"1\" hits=\"1\" branch=\"false\"/>\n <line number=\"2\" hits=\"1\" branch=\"false\"/>\n <line number=\"3\" hits=\"1\" branch=\"false\"/>\n <line number=\"4\" hits=\"1\" branch=\"false\"/>\n <line number=\"5\" hits=\"1\" branch=\"false\"/>\n <line number=\"13\" hits=\"21\" branch=\"false\"/>\n <line number=\"21\" hits=\"21\" branch=\"true\" condition-coverage=\"75% (3/4)\"/>\n <line number=\"22\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"24\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (5/5)\"/>\n <line number=\"25\" hits=\"7\" branch=\"false\"/>\n <line number=\"28\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (4/4)\"/>\n <line number=\"29\" hits=\"15\" branch=\"true\" condition-coverage=\"50% (1/2)\"/>\n <line number=\"32\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (4/4)\"/>\n <line number=\"33\" hits=\"5\" branch=\"false\"/>\n <line number=\"35\" hits=\"16\" branch=\"false\"/>\n <line number=\"38\" hits=\"21\" branch=\"true\" condition-coverage=\"100% (4/4)\"/>\n <line number=\"39\" hits=\"5\" branch=\"false\"/>\n <line number=\"42\" hits=\"21\" branch=\"false\"/>\n <line number=\"50\" hits=\"1\" branch=\"false\"/>\n <line number=\"51\" hits=\"21\" branch=\"false\"/>\n <line number=\"52\" hits=\"21\" branch=\"false\"/>\n <line number=\"53\" hits=\"95\" branch=\"false\"/>\n <line number=\"55\" hits=\"95\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"56\" hits=\"95\" branch=\"false\"/>\n <line number=\"58\" hits=\"21\" branch=\"false\"/>\n <line number=\"61\" hits=\"1\" branch=\"false\"/>\n <line number=\"62\" hits=\"56\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"65\" hits=\"56\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"67\" hits=\"55\" branch=\"false\"/>\n <line number=\"68\" hits=\"55\" branch=\"true\" condition-coverage=\"100% (3/3)\"/>\n <line number=\"71\" hits=\"1\" branch=\"false\"/>\n <line number=\"72\" hits=\"7\" branch=\"false\"/>\n <line number=\"76\" hits=\"7\" branch=\"true\" condition-coverage=\"100% (5/5)\"/>\n <line number=\"77\" hits=\"6\" branch=\"false\"/>\n <line number=\"78\" hits=\"6\" branch=\"false\"/>\n <line number=\"80\" hits=\"1\" branch=\"false\"/>\n <line number=\"85\" hits=\"26\" branch=\"false\"/>\n <line number=\"87\" hits=\"105\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"88\" hits=\"39\" branch=\"false\"/>\n <line number=\"92\" hits=\"105\" branch=\"true\" condition-coverage=\"100% (2/2)\"/>\n <line number=\"93\" hits=\"50\" branch=\"false\"/>\n <line number=\"96\" hits=\"105\" branch=\"false\"/>\n <line number=\"100\" hits=\"1\" branch=\"false\"/>\n <line number=\"101\" hits=\"21\" branch=\"false\"/>\n <line number=\"104\" hits=\"1\" branch=\"false\"/>\n <line number=\"113\" hits=\"1\" branch=\"false\"/>\n </lines>\n </class>\n </classes>\n </package>\n </packages>\n</coverage>\n",
"map": {
"/Users/benjamincoe/oss/test-exclude/index.js": {
"path": "/Users/benjamincoe/oss/test-exclude/index.js",
Expand Down