This is an automated email from the git hooks/post-receive script. sylvestre pushed a commit to branch master in repository jscover.
commit 70bce6804539c4568f4425524783f95d53debbd9 Author: tntim96 <[email protected]> Date: Sun Jun 22 17:59:51 2014 +1000 Allow merging if no 'original-src' directory exists (https://github.com/tntim96/JSCover/issues/142) --- History.md | 1 + .../jscover/report/ConfigurationForReport.java | 3 +- src/main/java/jscover/report/Main.java | 22 +- .../report/MainReportMergeAcceptanceTest.java} | 831 ++++++++++----------- .../jscover/report/ConfigurationForReportTest.java | 2 - src/test/java/jscover/report/MainTest.java | 28 +- 6 files changed, 430 insertions(+), 457 deletions(-) diff --git a/History.md b/History.md index 387c79b..9e6c671 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,6 @@ 1.0.12 / 2014-??-?? ================== + * Allow merging if no `original-src` directory exists (https://github.com/tntim96/JSCover/issues/142) * Internal: Fix tests failing with non-english locale (https://github.com/tntim96/JSCover/issues/141) 1.0.11 / 2014-06-05 diff --git a/src/main/java/jscover/report/ConfigurationForReport.java b/src/main/java/jscover/report/ConfigurationForReport.java index 6c7cc07..241c700 100644 --- a/src/main/java/jscover/report/ConfigurationForReport.java +++ b/src/main/java/jscover/report/ConfigurationForReport.java @@ -484,8 +484,7 @@ public class ConfigurationForReport extends Configuration { boolean isValidReportDirectory(File dir) { File jsonFile = new File(dir, "jscoverage.json"); - File srcDir = new File(dir, Main.reportSrcSubDir); - return isValidDirectory(dir) && isValidFile(jsonFile) && isValidDirectory(srcDir); + return isValidDirectory(dir) && isValidFile(jsonFile); } boolean isValidFile(File file) { diff --git a/src/main/java/jscover/report/Main.java b/src/main/java/jscover/report/Main.java index 2d0ed02..3c6cf6d 100644 --- a/src/main/java/jscover/report/Main.java +++ b/src/main/java/jscover/report/Main.java @@ -353,8 +353,11 @@ import java.io.File; import java.io.IOException; import java.util.Properties; import java.util.SortedMap; +import java.util.logging.Logger; public class Main { + private static final Logger logger = Logger.getLogger(Main.class.getName()); + public static void main(String[] args) throws IOException { new Main().runMain(args); } @@ -407,7 +410,22 @@ public class Main { private void mergeReports() { File firstReportDir = config.getMergeDirs().get(0); ioUtils.copyDir(firstReportDir, config.getMergeDestDir()); + mergeJSON(); + mergeOriginalSource(); + } + + private void mergeOriginalSource() { + File srcDir = new File(config.getMergeDestDir(), jscover.Main.reportSrcSubDir); + for (int i = 1; i < config.getMergeDirs().size(); i++) { + File jsOriginalSrc = new File(config.getMergeDirs().get(i), jscover.Main.reportSrcSubDir); + if (jsOriginalSrc.exists()) + ioUtils.copyDir(jsOriginalSrc, srcDir); + else + logger.info(String.format("Couldn't find directory '%s' to merge", jsOriginalSrc)); + } + } + private void mergeJSON() { 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"); @@ -417,10 +435,6 @@ public class Main { config.getMergeDestDir().mkdirs(); File mergedJson = new File(config.getMergeDestDir(), "jscoverage.json"); ioUtils.copy(jsonDataMerger.toJSON(mergedMap), mergedJson); - - File srcDir = new File(config.getMergeDestDir(), jscover.Main.reportSrcSubDir); - for (int i = 1; i < config.getMergeDirs().size(); i++) - ioUtils.copyDir(new File( config.getMergeDirs().get(i), jscover.Main.reportSrcSubDir), srcDir); } public void generateLCovDataFile() throws IOException { diff --git a/src/main/java/jscover/report/Main.java b/src/test-acceptance/java/jscover/report/MainReportMergeAcceptanceTest.java similarity index 79% copy from src/main/java/jscover/report/Main.java copy to src/test-acceptance/java/jscover/report/MainReportMergeAcceptanceTest.java index 2d0ed02..8e31390 100644 --- a/src/main/java/jscover/report/Main.java +++ b/src/test-acceptance/java/jscover/report/MainReportMergeAcceptanceTest.java @@ -1,444 +1,387 @@ -/** - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. - */ - -package jscover.report; - -import jscover.MainHelper; -import jscover.report.coberturaxml.CoberturaData; -import jscover.report.coberturaxml.CoberturaXmlGenerator; -import jscover.report.lcov.LCovGenerator; -import jscover.report.xml.XMLSummary; -import jscover.util.IoUtils; - -import java.io.File; -import java.io.IOException; -import java.util.Properties; -import java.util.SortedMap; - -public class Main { - public static void main(String[] args) throws IOException { - new Main().runMain(args); - } - - public static final Properties properties = new Properties(); - - public void initialize() throws IOException { - properties.load(jscover.Main.class.getResourceAsStream("/jscover/configuration.properties")); - } - - private MainHelper mainHelper = new MainHelper(); - private XMLSummary xmlSummary = new XMLSummary(); - private CoberturaXmlGenerator coberturaXmlGenerator = new CoberturaXmlGenerator(); - private LCovGenerator lCovGenerator = new LCovGenerator(); - private JSONDataMerger jsonDataMerger = new JSONDataMerger(); - private IoUtils ioUtils = IoUtils.getInstance(); - private ConfigurationForReport config = new ConfigurationForReport(); - - public void setConfig(ConfigurationForReport config) { - this.config = config; - } - - void runMain(String[] args) throws IOException { - initialize(); - config.setProperties(properties); - config.parse(args); - runReport(); - } - - private void runReport() throws IOException { - if (config.isInvalid()) { - System.out.println(config.getHelpText()); - mainHelper.exit(1); - } else if (config.showHelp()) { - System.out.println(config.getHelpText()); - } else if (config.getReportFormat() == ReportFormat.LCOV) { - generateLCovDataFile(); - } else if (config.getReportFormat() == ReportFormat.XMLSUMMARY) { - saveXmlSummary(); - } else if (config.getReportFormat() == ReportFormat.COBERTURAXML) { - saveCoberturaXml(); - } else if (config.isMerge()) { - mergeReports(); - } else { - System.out.println(config.getHelpText()); - mainHelper.exit(1); - } - } - - private void mergeReports() { - File firstReportDir = config.getMergeDirs().get(0); - ioUtils.copyDir(firstReportDir, config.getMergeDestDir()); - - 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"); - data[i] = ioUtils.loadFromFileSystem(dataFile); - } - SortedMap<String, FileData> mergedMap = jsonDataMerger.mergeJSONCoverageStrings(data); - config.getMergeDestDir().mkdirs(); - File mergedJson = new File(config.getMergeDestDir(), "jscoverage.json"); - ioUtils.copy(jsonDataMerger.toJSON(mergedMap), mergedJson); - - File srcDir = new File(config.getMergeDestDir(), jscover.Main.reportSrcSubDir); - for (int i = 1; i < config.getMergeDirs().size(); i++) - ioUtils.copyDir(new File( config.getMergeDirs().get(i), jscover.Main.reportSrcSubDir), srcDir); - } - - public void generateLCovDataFile() throws IOException { - String json = ioUtils.loadFromFileSystem(new File(config.getJsonDirectory(), "jscoverage.json")); - File lcovFile = new File(config.getJsonDirectory(), "jscover.lcov"); - lCovGenerator.saveData(jsonDataMerger.jsonToMap(json).values(), config.getSourceDirectory().getCanonicalPath(), lcovFile); - } - - public void saveXmlSummary() { - String json = ioUtils.loadFromFileSystem(new File(config.getJsonDirectory(), "jscoverage.json")); - SummaryData summaryData = new SummaryData(jsonDataMerger.jsonToMap(json).values()); - xmlSummary.saveSummary(summaryData, config.getJsonDirectory(), config.getVersion()); - } - - public void saveCoberturaXml() throws IOException { - String json = ioUtils.loadFromFileSystem(new File(config.getJsonDirectory(), "jscoverage.json")); - String xml = coberturaXmlGenerator.generateXml(new CoberturaData(jsonDataMerger.jsonToMap(json).values()), config.getSourceDirectory().getCanonicalPath(), config.getVersion()); - File dest = new File(config.getJsonDirectory(), "cobertura-coverage.xml"); - ioUtils.copy(xml, dest); - } -} +/** + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 2 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + */ + +package jscover.report; + +import jscover.util.IoUtils; +import org.apache.commons.io.FileUtils; +import org.junit.Before; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.*; + +public class MainReportMergeAcceptanceTest { + private IoUtils ioUtils = IoUtils.getInstance(); + private File reportDir1 = new File("target/report1"); + private File reportDir2 = new File("target/report2"); + private File reportDir12 = new File("target/report12"); + String data1 = ioUtils.loadFromClassPath("/jscover/report/jscoverage-select-1.json"); + String data2 = ioUtils.loadFromClassPath("/jscover/report/jscoverage-select-3.json"); + private String[] args = new String[]{ + "--merge", + "target/report1", + "target/report2", + "target/report12" + }; + + @Before + public void setUp() throws IOException { + FileUtils.deleteDirectory(reportDir1); + FileUtils.deleteDirectory(reportDir2); + FileUtils.deleteDirectory(reportDir12); + ioUtils.copy(data1, new File(reportDir1, "jscoverage.json")); + ioUtils.copy(data2, new File(reportDir2, "jscoverage.json")); + } + + @Test + public void shouldMergeDataWithoutSource() throws IOException { + String expected = ioUtils.loadFromClassPath("/jscover/report/jscoverage-select-1-3.json"); + Main.main(args); + String merged = ioUtils.loadFromFileSystem(new File(reportDir12, "jscoverage.json")); + assertThat(merged, equalTo(expected)); + } + +} diff --git a/src/test/java/jscover/report/ConfigurationForReportTest.java b/src/test/java/jscover/report/ConfigurationForReportTest.java index 23da30d..733865a 100644 --- a/src/test/java/jscover/report/ConfigurationForReportTest.java +++ b/src/test/java/jscover/report/ConfigurationForReportTest.java @@ -538,8 +538,6 @@ public class ConfigurationForReportTest { private File createValidReportDir(String dir) { File reportDir = new File(dir); - File srcDir = new File(reportDir, jscover.Main.reportSrcSubDir); - srcDir.mkdirs(); File jsonFile = new File(reportDir, "jscoverage.json"); ioUtils.copy("dummy", jsonFile); return reportDir; diff --git a/src/test/java/jscover/report/MainTest.java b/src/test/java/jscover/report/MainTest.java index 95c8164..1f5b584 100644 --- a/src/test/java/jscover/report/MainTest.java +++ b/src/test/java/jscover/report/MainTest.java @@ -349,6 +349,7 @@ import jscover.report.lcov.LCovGenerator; import jscover.report.xml.XMLSummary; import jscover.util.IoUtils; import jscover.util.ReflectionUtils; +import org.apache.commons.io.FileUtils; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.junit.Before; @@ -366,6 +367,7 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; +import static jscover.Main.reportSrcSubDir; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; @@ -408,7 +410,7 @@ public class MainTest { public void shouldSetConfig() { ConfigurationForReport configuration = mock(ConfigurationForReport.class); main.setConfig(configuration); - assertThat((ConfigurationForReport)ReflectionUtils.getField(main, "config"), sameInstance(configuration)); + assertThat((ConfigurationForReport) ReflectionUtils.getField(main, "config"), sameInstance(configuration)); } @Test @@ -525,18 +527,32 @@ public class MainTest { @Test public void shouldMergeReports() throws IOException { + testMergeLogic(true); + } + + @Test + public void shouldMergeReportsWithoutOriginalSrc() throws IOException { + testMergeLogic(false); + } + + private void testMergeLogic(boolean hasOriginalSrc) throws IOException { List<File> mergeDirs = new ArrayList<File>(); File dir1 = new File("target/dir1"); mergeDirs.add(dir1); File dir2 = new File("target/dir2"); mergeDirs.add(dir2); File destDir = new File("target/dest-dir"); + File origSrc = new File(dir2, reportSrcSubDir); + if (hasOriginalSrc) + origSrc.mkdirs(); + else + FileUtils.deleteDirectory(origSrc); given(config.isMerge()).willReturn(true); given(config.getMergeDestDir()).willReturn(destDir); given(config.getMergeDirs()).willReturn(mergeDirs); given(ioUtils.loadFromFileSystem(new File(dir1, "jscoverage.json"))).willReturn("json1"); - given(ioUtils.loadFromFileSystem(new File(dir2,"jscoverage.json"))).willReturn("json2"); + given(ioUtils.loadFromFileSystem(new File(dir2, "jscoverage.json"))).willReturn("json2"); SortedMap<String, FileData> mergedMap = new TreeMap<String, FileData>(); given(jsonDataMerger.mergeJSONCoverageStrings("json1","json2")).willReturn(mergedMap); given(jsonDataMerger.toJSON(mergedMap)).willReturn("mergedJSON"); @@ -554,9 +570,11 @@ public class MainTest { inOrder.verify(ioUtils).copy("mergedJSON", mergedJson); //Verify src copying - File src2 = new File(dir2, jscover.Main.reportSrcSubDir); - File srcDest = new File(destDir, jscover.Main.reportSrcSubDir); - verify(ioUtils).copyDir(src2, srcDest); + if (hasOriginalSrc) { + File src2 = new File(dir2, reportSrcSubDir); + File srcDest = new File(destDir, reportSrcSubDir); + verify(ioUtils).copyDir(src2, srcDest); + } verifyZeroInteractions(mainHelper); } } -- 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
