This is an automated email from the git hooks/post-receive script. sylvestre pushed a commit to branch master in repository jscover.
commit 542ce6adb5200ae201709bef7c3e49ba52ee9df6 Author: tntim96 <[email protected]> Date: Fri Aug 1 20:53:44 2014 +1000 Add logging to merge and report code --- History.md | 1 + JSCover.ipr | 4 ++-- src/main/java/jscover/Main.java | 2 +- src/main/java/jscover/report/JSONDataMerger.java | 18 +++++++++++++++--- src/main/java/jscover/report/Main.java | 12 ++++++++++-- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/History.md b/History.md index 93bcf0b..c662359 100644 --- a/History.md +++ b/History.md @@ -1,6 +1,7 @@ 1.0.14 / 2014-??-?? ================== * Decode URI in proxy mode + * Add logging to merge and report code * Internal: Upgrade to Jasmine 2.0.1 1.0.13 / 2014-07-08 diff --git a/JSCover.ipr b/JSCover.ipr index 93e7d3a..ac44fb5 100644 --- a/JSCover.ipr +++ b/JSCover.ipr @@ -284,8 +284,8 @@ <configuration default="false" name="Main - merge" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" runner="idea" /> <option name="MAIN_CLASS_NAME" value="jscover.report.Main" /> - <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value=" --merge target/0 target/2 target/4 target/dest" /> + <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=log.properties" /> + <option name="PROGRAM_PARAMETERS" value="--merge doc/example-report-yui3 doc/example-report-yui3 target/dest-yui3" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> diff --git a/src/main/java/jscover/Main.java b/src/main/java/jscover/Main.java index 81c8453..9200399 100644 --- a/src/main/java/jscover/Main.java +++ b/src/main/java/jscover/Main.java @@ -421,7 +421,7 @@ public class Main { exitHelper.exit(exitStatus); } - Object getArgsLogger(final String[] args) { + public Object getArgsLogger(final String[] args) { return new Object() { @Override public String toString() { diff --git a/src/main/java/jscover/report/JSONDataMerger.java b/src/main/java/jscover/report/JSONDataMerger.java index 533bbf3..d8c40b1 100644 --- a/src/main/java/jscover/report/JSONDataMerger.java +++ b/src/main/java/jscover/report/JSONDataMerger.java @@ -348,11 +348,15 @@ import org.mozilla.javascript.ScriptRuntime; import org.mozilla.javascript.json.JsonParser; import java.util.*; +import java.util.logging.Logger; import static java.lang.String.format; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; //Function Coverage added by Howard Abrams, CA Technologies (HA-CA) - May 20 2013, tntim96 public class JSONDataMerger { + private static final Logger logger = Logger.getLogger(FileData.class.getName()); public static final String NO_CONDITIONS_ARE_COVERED = "No conditions are covered"; private Context cx = Context.enter(); private JsonParser parser = new JsonParser(cx, cx.initStandardObjects()); @@ -368,26 +372,34 @@ public class JSONDataMerger { public SortedMap<String, FileData> mergeJSONCoverageMaps(SortedMap<String, FileData> map1, SortedMap<String, FileData> map2) { for (String scriptName : map1.keySet()) { + logger.log(FINE, "Processing {0}", scriptName); if (map2.containsKey(scriptName)) { FileData coverageData = map1.get(scriptName); for (int i = 0; i < coverageData.getLines().size(); i++) - if (coverageData.getLines().get(i) != null) + if (coverageData.getLines().get(i) != null) { + logger.log(FINEST, "Add line coverage from {0} line {1}", new Object[]{scriptName, i}); coverageData.addCoverage(map2.get(scriptName).getLines().get(i), i); + } // Function Coverage (HA-CA), tntim96 - for (int i = 0; i < coverageData.getFunctions().size(); i++) + for (int i = 0; i < coverageData.getFunctions().size(); i++) { + logger.log(FINEST, "Add function coverage from {0} function number {1}", new Object[]{scriptName, i+1}); coverageData.addFunctionCoverage(map2.get(scriptName).getFunctions().get(i), i); + } for (int i : coverageData.getBranchData().keySet()) { List<BranchData> conditions = coverageData.getBranchData().get(i); for (int j = 0; j < conditions.size(); j++) - if (conditions.get(j) != null) + if (conditions.get(j) != null) { + logger.log(FINEST, "Add branch coverage from {0} line {1} condition {2}", new Object[]{scriptName, i+1, j}); conditions.get(j).addCoverage(map2.get(scriptName).getBranchData().get(i).get(j)); + } } } } for (String scriptName : map2.keySet()) { if (!map1.containsKey(scriptName)) { + logger.log(FINE, "Add script {0}", scriptName); map1.put(scriptName, map2.get(scriptName)); } } diff --git a/src/main/java/jscover/report/Main.java b/src/main/java/jscover/report/Main.java index d89f50d..e69c3a2 100644 --- a/src/main/java/jscover/report/Main.java +++ b/src/main/java/jscover/report/Main.java @@ -354,8 +354,11 @@ import java.io.File; import java.io.IOException; import java.util.Properties; import java.util.SortedMap; +import java.util.logging.Level; import java.util.logging.Logger; +import static java.util.logging.Level.INFO; + public class Main { private static final Logger logger = Logger.getLogger(Main.class.getName()); @@ -383,10 +386,13 @@ public class Main { } void runMain(String[] args) throws IOException { + logger.log(INFO, "Args: {0}", new jscover.Main().getArgsLogger(args)); initialize(); config.setProperties(properties); + logger.log(INFO, "Starting JSCover {0} merge", config.getVersion()); config.parse(args); runReport(); + logger.log(INFO, "Finished"); } private void runReport() throws IOException { @@ -420,9 +426,10 @@ public class Main { File srcDir = new File(config.getMergeDestDir(), jscover.Main.reportSrcSubDir); for (int i = 0; i < config.getMergeDirs().size(); i++) { File jsOriginalSrc = new File(config.getMergeDirs().get(i), jscover.Main.reportSrcSubDir); - if (jsOriginalSrc.exists()) + if (jsOriginalSrc.exists()) { + logger.log(INFO, "Merging source from '%s'", jsOriginalSrc.getPath()); ioUtils.copyDir(jsOriginalSrc, srcDir); - else + } else logger.info(String.format("Couldn't find directory '%s' to merge", jsOriginalSrc)); } } @@ -431,6 +438,7 @@ public class Main { String[] data = new String[config.getMergeDirs().size()]; for (int i = 0; i < data.length; i++) { File dataFile = new File(config.getMergeDirs().get(i), "jscoverage.json"); + logger.log(INFO, "Merging JSON from '%s'", dataFile.getPath()); data[i] = ioUtils.loadFromFileSystem(dataFile); } SortedMap<String, FileData> mergedMap = jsonDataMerger.mergeJSONCoverageStrings(data); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jscover.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
