From 9bc43545d438e71a18399ba5d1a5bde57e0ba21f Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 11 Oct 2018 00:02:59 +0200
Subject: Implement source coverage inspection
---
package.json | 2 ++
src/App.css | 14 ++++++++
src/App.js | 55 ++++++++---------------------
src/Blocks.js | 36 +++++++++++++++++++
src/CoverageListing.js | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/Report.js | 59 ++++++++++++++++++++++++++++++++
yarn.lock | 59 +++++++++++++++++++++++++++++++-
7 files changed, 277 insertions(+), 41 deletions(-)
create mode 100644 src/CoverageListing.js
create mode 100644 src/Report.js
diff --git a/package.json b/package.json
index 1cb608c..05c7fd6 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
+ "jszip": "^3.1.5",
"react": "^16.5.2",
"react-dom": "^16.5.2",
"react-scripts": "2.0.4",
@@ -24,6 +25,7 @@
"not op_mini all"
],
"devDependencies": {
+ "@types/jszip": "^3.1.4",
"@types/xml2js": "^0.4.3"
}
}
diff --git a/src/App.css b/src/App.css
index d0870a2..fc9d5ec 100644
--- a/src/App.css
+++ b/src/App.css
@@ -51,3 +51,17 @@
.App li[well-covered="false"] {
color: red;
}
+
+.App .listing {
+ overflow-x: auto;
+ padding: 0.5rem 0;
+ background-color: #FAFAFA;
+}
+
+.App .listing li[well-covered] {
+ font-weight: bold;
+}
+
+.App pre {
+ margin: 0.1rem;
+}
diff --git a/src/App.js b/src/App.js
index 347d243..fb77d93 100644
--- a/src/App.js
+++ b/src/App.js
@@ -18,9 +18,10 @@
*/
import React, { Component } from 'react';
-import {Parser} from 'xml2js';
+import { Parser } from 'xml2js';
+import JSZip from 'jszip';
-import {Counters, SessionInfo, PackagesCoverage} from './Blocks.js';
+import { Report } from './Report.js';
import './App.css';
class App extends Component {
@@ -28,24 +29,31 @@ class App extends Component {
super(props);
this.state = {
report: null,
+ sourceSet: null,
hasError: false
};
}
componentDidCatch(error, info) {
this.setState({ hasError: true });
- console.err(error, info);
+ console.error(error, info);
}
_useReportFile(file) {
const fileReader = new FileReader();
- fileReader.onloadend = (readEvent) => this._useReport(readEvent.target.result);
+ fileReader.onloadend = readEvent => this._useReport(readEvent.target.result);
fileReader.readAsText(file);
}
_useReport(xmlString) {
+ this.setState({ hasError: false });
const xmlParser = new Parser();
- xmlParser.parseString(xmlString, (err, result) => this.setState({ report: result.report }));
+ xmlParser.parseString(xmlString, (_, result) => this.setState({ report: result.report }));
+ }
+
+ _useSourceArchive(file) {
+ this.setState({ hasError: false });
+ JSZip.loadAsync(file).then(zip => this.setState({ sourceSet: zip.files }));
}
_renderError() {
@@ -58,7 +66,7 @@ class App extends Component {
}
_renderReport() {
- return this.state.hasError ? this._renderError(): (
Source JAR:
-
Please provide a JaCoCo XML report file to visualise. );
- }
-
- _renderReport() {
- return (
-
-
Viewing report: "{this.props.report.$.name}"
-
-
-
-
-
-
-
None. );
@@ -97,3 +98,38 @@ class MethodsCoverage extends Component {
return renderRows(this._renderRow, this.props.methods, false);
}
}
+
+export class PackagesSourceCoverage extends Component {
+ _renderRow(row) {
+ return (
+
+ {row.$.name}
+
+ )
+ }
+
+ render() {
+ return renderRows(row => this._renderRow(row), this.props.packages, false);
+ }
+}
+
+class SourcesCoverage extends Component {
+ _renderRow(row) {
+ const fileName = this.props.package + '/' + row.$.name;
+ return (
+
+ {fileName}
+
+ )
+ }
+
+ render() {
+ return renderRows(row => this._renderRow(row), this.props.packageSourceFiles, false);
+ }
+}
diff --git a/src/CoverageListing.js b/src/CoverageListing.js
new file mode 100644
index 0000000..8b7830c
--- /dev/null
+++ b/src/CoverageListing.js
@@ -0,0 +1,93 @@
+/*
+ * JaCoCo Report Viewer, a web-based coverage report viewer
+ * Copyright (C) 2018 Pacien TRAN-GIRARD
+ * Adam NAILI
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see No source file provided.
);
+ }
+
+ _nonEmptyString(str) {
+ return str ? str : ' '; // workaround for empty collapsing
+ }
+
+ _renderLine(lineContent, lineNumber) {
+ if (!(lineNumber in this.state.coverageMap))
+ return ( {lineContent} {lineContent} Please provide a JaCoCo XML report file to visualise. );
+ }
+
+ _renderReport() {
+ return (
+
+
Viewing report: "{this.props.report.$.name}"
+
+
+
+
+
+
+
+
+