# HG changeset patch
# User Thomas W. Wheeler <tomwheeler@netbeans.org>
# Date 1225849845 21600
# Node ID 01eff9e1186c3c6274ede88a24369c211855cec0
# Parent  6fec3ee8ecd0834a199f980479c6c85bd541e8ba
Issue 145107: Add code coverage support to platform projects

diff --git a/apisupport.harness/build.xml b/apisupport.harness/build.xml
--- a/apisupport.harness/build.xml
+++ b/apisupport.harness/build.xml
@@ -59,6 +59,17 @@
         <copy file="${nb_all}/nbbuild/templates/common.xml" tofile="${cluster}/common.xml"/>
         <copy file="${nb_all}/nbbuild/jdk.xml" tofile="${cluster}/jdk.xml"/>
         <copy file="external/jsearch-2.0_05.jar" todir="${cluster}"/>
+      
+        <property name="cobertura.dir" value="${cluster}/cobertura"/>
+        <mkdir dir="${cobertura.dir}" />
+        <copy file="external/cobertura-1.9.jar" todir="${cobertura.dir}"/>
+
+        <property name="cobertura.lib.dir" value="${cobertura.dir}/lib" />
+        <mkdir dir="${cobertura.lib.dir}" />
+        <copy file="external/asm-2.2.1.jar" todir="${cobertura.lib.dir}"/>
+        <copy file="external/asm-tree-2.2.1.jar" todir="${cobertura.lib.dir}"/>
+        <copy file="external/jakarta-oro-2.0.8.jar" todir="${cobertura.lib.dir}"/>
+        <copy file="external/log4j-1.2.9.jar" todir="${cobertura.lib.dir}"/>
     </target>
  
     <target name="compile-jnlp-launcher" depends="init,compile">
diff --git a/apisupport.harness/external/asm-2.2.1-license.txt b/apisupport.harness/external/asm-2.2.1-license.txt
new file mode 100644
--- /dev/null
+++ b/apisupport.harness/external/asm-2.2.1-license.txt
@@ -0,0 +1,42 @@
+Name: ASM
+Version: 2.2.1
+Description: Library for bytecode manipulation
+License: BSD style, attributed to INRIA, France Telecom
+OSR: 
+Origin: http://download.forge.objectweb.org/asm/asm-2.2.1-bin.zip
+Files: asm-2.2.1.jar, asm-tree-2.2.1.jar
+Comment: See issue 145107
+
+Use of is ASM 2.2.1 is governed by the terms of the license below:
+
+[TEXT OF THE LICENSE]
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list
--- a/apisupport.harness/external/binaries-list
+++ b/apisupport.harness/external/binaries-list
@@ -1,1 +1,6 @@
 D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar
+FE3DD9EF4BC8CE13A6C69C22F9D92ACA1CEC33A8 cobertura-1.9.jar
+0EA933BFBA70A570081B6B3E43A25DAB873248A0 asm-2.2.1.jar
+387A9808C2F4EE35497D1E7C73D5BC121DAC8EC0 asm-tree-2.2.1.jar
+5592374F834645C4AE250F4C9FBB314C9369D698 jakarta-oro-2.0.8.jar
+55856D711AB8B88F8C7B04FD85FF1643FFBFDE7C log4j-1.2.9.jar
diff --git a/apisupport.harness/external/cobertura-1.9-license.txt b/apisupport.harness/external/cobertura-1.9-license.txt
new file mode 100644
--- /dev/null
+++ b/apisupport.harness/external/cobertura-1.9-license.txt
@@ -0,0 +1,34 @@
+Name: Cobertura
+Version: 1.9
+Description: Library for measuring and reporting code coverage of tests.
+License: Mostly GPL 2.0/Ant Tasks are ASL 1.1 (see http://cobertura.sourceforge.net/license.html)
+OSR: No idea what to put here, or even what an OSR is
+Origin: http://prdownloads.sourceforge.net/cobertura/cobertura-1.9-bin.zip?download
+Files: cobertura-1.9.jar
+Source: http://prdownloads.sourceforge.net/cobertura/cobertura-1.9-src.zip?download
+Comment: See issue 145107
+
+Use of Cobertura 1.9 is governed by the terms of the license below:
+
+[TEXT OF THE LICENSE]
+
+LICENSE
+
+Cobertura is free software.  Most of it is licensed under the GNU
+GPL, and 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.  Please review the file COPYING included in this
+distribution for further details.
+
+Parts of Cobertura are licensed under the Apache Software License,
+Version 1.1.
+
+WARRANTY
+
+Cobertura 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.
+
+
diff --git a/apisupport.harness/external/jakarta-oro-2.0.8-license.txt b/apisupport.harness/external/jakarta-oro-2.0.8-license.txt
new file mode 100644
--- /dev/null
+++ b/apisupport.harness/external/jakarta-oro-2.0.8-license.txt
@@ -0,0 +1,67 @@
+Name: Jakarta Oro
+Version: 2.0.8
+Description: Library for handling regular expressions
+License: Apache_V11
+OSR: 
+Origin: http://jakarta.apache.org/site/downloads/downloads_oro.cgi
+Files: jakarta-oro-2.0.8.jar
+Source: http://mirrors.isc.org/pub/apache/jakarta/oro/source/jakarta-oro-2.0.8.zip
+Comment: See Issue #145107
+
+Use of Jakarta Oro version 2.0.8 is governed by the terms of the license below:
+
+[TEXT OF THE LICENSE]
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro" 
+ *    must not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache" 
+ *    or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their 
+ *    name, without prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
diff --git a/apisupport.harness/external/log4j-1.2.9-license.txt b/apisupport.harness/external/log4j-1.2.9-license.txt
new file mode 100644
--- /dev/null
+++ b/apisupport.harness/external/log4j-1.2.9-license.txt
@@ -0,0 +1,61 @@
+Name: Log4J
+Version: 1.2.9
+Description: Library for logging in Java
+License: Apache_V11
+OSR: 
+Origin: http://archive.apache.org/dist/logging/log4j/1.2.9/logging-log4j-1.2.9.zip
+Files: log4j-1.2.9.jar
+Comment: See issue #145107
+
+Use of Log4J version 1.2.9 is governed by the terms of the license below:
+
+[TEXT OF THE LICENSE]
+
+/*
+ * ============================================================================
+ *                   The Apache Software License, Version 1.1
+ * ============================================================================
+ * 
+ *    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of  source code must  retain the above copyright  notice,
+ *    this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include  the following  acknowledgment:  "This product includes  software
+ *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
+ *    Alternately, this  acknowledgment may  appear in the software itself,  if
+ *    and wherever such third-party acknowledgments normally appear.
+ * 
+ * 4. The names "log4j" and  "Apache Software Foundation"  must not be used to
+ *    endorse  or promote  products derived  from this  software without  prior
+ *    written permission. For written permission, please contact
+ *    apache@apache.org.
+ * 
+ * 5. Products  derived from this software may not  be called "Apache", nor may
+ *    "Apache" appear  in their name,  without prior written permission  of the
+ *    Apache Software Foundation.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
+ * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
+ * ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
+ * (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * This software  consists of voluntary contributions made  by many individuals
+ * on  behalf of the Apache Software  Foundation.  For more  information on the 
+ * Apache Software Foundation, please see <http://www.apache.org/>.
+ *
+ */
diff --git a/apisupport.harness/release/build.xml b/apisupport.harness/release/build.xml
--- a/apisupport.harness/release/build.xml
+++ b/apisupport.harness/release/build.xml
@@ -44,6 +44,7 @@
 
     <import file="common.xml"/>
     <import file="jdk.xml"/>
+    <import file="cobertura.xml"/>
 
     <target name="taskdefs" unless="harness.taskdefs.done">
         <dirname property="harness.dir" file="${harness.file}"/>
diff --git a/apisupport.harness/release/cobertura-suite.xml b/apisupport.harness/release/cobertura-suite.xml
new file mode 100644
--- /dev/null
+++ b/apisupport.harness/release/cobertura-suite.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="cobertura-suite">
+
+    <property name="cobertura.dir" value="${harness.dir}/cobertura"/>
+
+    <path id="cobertura.classpath">
+        <fileset dir="${cobertura.dir}">
+            <include name="cobertura-1.9.jar" />
+            <include name="lib/**/*.jar" />
+        </fileset>
+    </path>
+
+    <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
+
+    <target name="cobertura-init">
+        <property name="cobertura.datafiles.merge.dir" value="${basedir}/build/test/cobertura-datafiles"/>
+        <property name="cobertura.report.sources.dir" value="${basedir}/build/test/sources-for-report"/>
+        <property name="cobertura.report.dir" value="build/test/cobertura-report"/>
+        <property name="cobertura.datafile" value="build/test/global-cobertura.ser"/>        
+    </target>
+
+    <target name="merge-coverage-reports" depends="-init,cobertura-init"
+        description="Creates a report by merging data collected from tests previously run on modules">
+
+        <mkdir dir="build/test"/>
+        <delete file="${cobertura.datafile}" failonerror="false"/>
+        <delete dir="${cobertura.report.dir}" failonerror="false"/>
+
+        <delete dir="${cobertura.datafiles.merge.dir}" quiet="true" />
+        <mkdir dir="${cobertura.datafiles.merge.dir}" />
+
+        <delete dir="${cobertura.report.sources.dir}" quiet="true" />
+        <mkdir dir="${cobertura.report.sources.dir}" />
+
+        <!-- have each module copy its .ser file to the suite for merging -->
+        <subant target="-copy-cobertura-datafile" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false">
+            <property name="suite.merge.dir" value="${cobertura.datafiles.merge.dir}"/>
+        </subant>
+
+        <cobertura-merge datafile="${cobertura.datafile}">
+            <fileset dir="${cobertura.datafiles.merge.dir}">
+                <include name="**/*" />
+            </fileset>
+        </cobertura-merge>
+
+        <!-- have each module copy its sources to the suite for reporting -->
+        <subant target="-copy-source-folder" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false">
+            <property name="suite.sources.dir" value="${cobertura.report.sources.dir}"/>
+        </subant>
+
+        <cobertura-report datafile="${cobertura.datafile}" destdir="${cobertura.report.dir}" format="html">
+            <fileset dir="${cobertura.report.sources.dir}">
+                <include name="**/*.java" />
+            </fileset>
+        </cobertura-report> 
+        <cobertura-report datafile="${cobertura.datafile}" destdir="${cobertura.report.dir}" format="xml">
+            <fileset dir="${cobertura.report.sources.dir}">
+                <include name="**/*.java" />
+            </fileset>
+        </cobertura-report> 
+    </target>
+
+    <target name="generate-all-coverage-reports" depends="-init">
+        <subant target="coverage-report" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/>
+    </target>
+    
+    <target name="coverage-report" depends="generate-all-coverage-reports,merge-coverage-reports"
+        description="Generates test coverage report for entire suite">
+    </target>
+    
+    <target name="display-coverage-report" depends="coverage-report"
+        description="Generates and displays test coverage report for entire suite">
+        <nbbrowse file="${cobertura.report.dir}/index.html"/>
+    </target>
+    
+</project>
diff --git a/apisupport.harness/release/cobertura.xml b/apisupport.harness/release/cobertura.xml
new file mode 100644
--- /dev/null
+++ b/apisupport.harness/release/cobertura.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="cobertura">
+
+<!--
+  NOTE: At present, this only measure coverage for unit tests.  Functional
+  tests, performance tests and other types of tests are not considered.
+-->
+    <property name="cobertura.dir" value="${harness.dir}/cobertura"/>
+    <path id="cobertura.classpath">
+        <fileset dir="${cobertura.dir}">
+            <include name="cobertura-1.9.jar" />
+            <include name="lib/**/*.jar" />
+        </fileset>
+    </path>
+
+    <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
+
+    <target name="cobertura-init" depends="build-init,init,test-init">
+        <property name="build.test.cobertura.classes.dir" value="build/cobertura-instrumented-classes"/>
+        <property name="cobertura.report.dir" value="${basedir}/build/test/cobertura-report"/>
+        <property name="cobertura.datafile" value="${basedir}/build/test/cobertura.ser"/>
+        <property name="continue.after.failing.tests" value="true" />
+
+        <path id="cobertura.test.cp"> 
+            <pathelement location="${build.test.cobertura.classes.dir}" />
+            <pathelement location="${cobertura.dir}/cobertura-1.9.jar" />
+            <pathelement location="${test.unit.lib.cp}"/>
+            <path refid="test.unit.run.cp"/>
+            <pathelement location="build/classes" />
+        </path>
+    </target>
+
+    <target name="-copy-cobertura-datafile" depends="cobertura-init">
+        <!-- rename using code-name-base so the files will be unique in the suite -->
+        <copy file="${cobertura.datafile}" tofile="${suite.merge.dir}/${code.name.base.dashes}.ser" failonerror="false" />
+    </target>
+
+
+    <target name="-copy-source-folder" depends="cobertura-init">
+        <!--
+            note that this does not inherently handle if there are multiple source 
+            folders; it might be possible to handle this by overriding in the
+            module's build.xml.
+        -->
+        <property name="cobertura.src.dir" value="${suite.sources.dir}" />
+        <mkdir dir="${cobertura.src.dir}" />
+        <copy todir="${cobertura.src.dir}/">
+            <fileset dir="${src.dir}" includes="**/*.java"/>
+        </copy>
+    </target>
+
+    <target name="cobertura-instrument" depends="cobertura-init, test-build">
+        <delete dir="${build.test.cobertura.classes.dir}" failonerror="false"/>
+        <delete file="${cobertura.datafile}" failonerror="false"/>
+        <cobertura-instrument todir="${build.test.cobertura.classes.dir}" datafile="${cobertura.datafile}">
+            <fileset dir="${build.classes.dir}" includes="**/*.class" excludes="${test.coverage.exclude.files}"/>
+        </cobertura-instrument>
+    </target>
+
+    <target name="test-with-cobertura" depends="cobertura-init,init,test-init,netbeans,test-build">
+        <pathconvert pathsep="${line.separator} " property="echo.cobertura.test.cp" refid="cobertura.test.cp"/>
+        <mkdir dir="${build.test.unit.results.dir}"/>
+
+        <junit showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed" filtertrace="${test.filter.trace}" tempdir="${build.test.unit.results.dir}" timeout="${test.timeout}">
+            <batchtest todir="${build.test.unit.results.dir}">
+                <fileset dir="${build.test.unit.classes.dir}">
+                    <include name="**/*Test.class"/>
+                </fileset>
+
+            </batchtest>
+            <!-- 
+               This somewhat duplicates the normal JUnit testing target, but the 
+               cobertura.test.cp  must come first in the testing classpath for 
+               coverage to work properly and there is no other good way to inject it.
+            -->
+            <classpath refid="cobertura.test.cp"/>
+            <syspropertyset refid="test.unit.properties"/>
+            <jvmarg line="${test.run.args}"/>
+            <sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}" />
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+        <fail if="tests.failed" unless="continue.after.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+
+    <target name="test-coverage" depends="cobertura-init, cobertura-instrument, test-with-cobertura"/>
+
+    <target name="coverage-report" depends="netbeans, test-coverage" description="creates test coverage report for this module">
+            <delete dir="${cobertura.report.dir}" failonerror="false"/>
+        <cobertura-report datafile="${cobertura.datafile}" srcdir="${src.dir}" destdir="${cobertura.report.dir}"/>
+    </target>
+    
+    <target name="display-coverage-report" depends="coverage-report" description="creates and displays test coverage report for this module">
+        <nbbrowse file="${cobertura.report.dir}/index.html"/>
+    </target>
+
+</project>
diff --git a/apisupport.harness/release/suite.xml b/apisupport.harness/release/suite.xml
--- a/apisupport.harness/release/suite.xml
+++ b/apisupport.harness/release/suite.xml
@@ -43,7 +43,7 @@
 <project name="suite" basedir=".">
 
     <import file="jdk.xml"/>
-
+    <import file="cobertura-suite.xml"/>
 
     <target name="-taskdefs" unless="harness.taskdefs.done">
         <dirname property="harness.dir" file="${suite.file}"/>