Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Add Ant tasks to measure the code coverage of the unit tests …

…using the Cobertura"

Reverting it since it pollutes the junit output
This reverts commit c6a9034.
  • Loading branch information...
commit 4ec9f6c4534b4dd48e7852697faa174e6f1b5d13 1 parent b9d885f
@rsumbaly rsumbaly authored
View
6 build.properties
@@ -14,12 +14,6 @@ testclasses.dir=dist/testclasses
testreport.dir=dist/junit-reports
testhtml.dir=dist/junit-reports/html
-## Measuring unit test coverage with Cobertura
-coverage.instrumented.dir=dist/coverage/instrumented
-coverage.xml.dir=dist/coverage/xml
-coverage.html.dir=dist/coverage/html
-coverage.datafile=dist/coverage/cobertura.ser
-
## Contrib
contrib.root.dir=contrib
contrib.classes.dir=dist/contrib-classes
View
32 build.xml
@@ -387,38 +387,6 @@
</junitreport>
</target>
- <taskdef name="cobertura-instrument" classname="net.sourceforge.cobertura.ant.InstrumentTask" classpathref="main-classpath" />
- <taskdef name="cobertura-report" classname="net.sourceforge.cobertura.ant.ReportTask" classpathref="main-classpath" />
-
- <target name="coverage-instrumentation" depends="build" description="Instrument the code to measure code coverage.">
- <cobertura-instrument todir="${coverage.instrumented.dir}" datafile="${coverage.datafile}">
- <fileset dir="${classes.dir}">
- <include name="**/*.class" />
- <exclude name="**/*Test.class" />
- </fileset>
- </cobertura-instrument>
- </target>
-
- <target name="coverage" depends="coverage-instrumentation, buildtest" description="Measure code coverage of unit tests.">
- <replace-dir dir="${testreport.dir}" />
- <junit fork="yes" printsummary="yes" showoutput="true" maxmemory="1024m">
- <jvmarg value="-Dnet.sourceforge.cobertura.datafile=${coverage.datafile}"/>
- <classpath>
- <pathelement location="${coverage.instrumented.dir}" />
- <path refid="test-classpath" />
- </classpath>
- <formatter type="xml" />
- <batchtest todir="${testreport.dir}">
- <fileset dir="${unittestsrc.dir}">
- <include name="**/*Test.java" />
- <exclude name="**/Abstract*.java" />
- </fileset>
- </batchtest>
- </junit>
- <cobertura-report format="html" destdir="${coverage.html.dir}" srcdir="${java.dir}" datafile="${coverage.datafile}" />
- <cobertura-report format="xml" destdir="${coverage.xml.dir}" srcdir="${java.dir}" datafile="${coverage.datafile}" />
- </target>
-
<target name="junit-all" depends="junit, contrib-junit" description="Run All junit tests including contrib.">
</target>
View
BIN  lib/asm-3.0.jar
Binary file not shown
View
BIN  lib/asm-tree-3.0.jar
Binary file not shown
View
BIN  lib/cobertura-1.9.4.1.jar
Binary file not shown
View
BIN  lib/jakarta-oro-2.0.8.jar
Binary file not shown
View
53 lib/jakarta-oro-license.txt
@@ -1,53 +0,0 @@
-/* ====================================================================
- * 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/>.
- */
Please sign in to comment.
Something went wrong with that request. Please try again.