CVS: junit build.xml, 1.26, 1.27 README.html, 1.19, 1.20
David Saff <[email protected]> Thu, 26 Apr 2007 13:21:23 -0700
| Newsgroups | gmane.comp.java.junit.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/junit/junit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12631
Modified Files:
build.xml README.html
Log Message:
Merge build script with 4.3.1
Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- build.xml 22 Mar 2007 17:47:52 -0000 1.26
+++ build.xml 26 Apr 2007 20:21:21 -0000 1.27
@@ -8,13 +8,14 @@
<property name="dist" value="junit${version}" />
<property name="versionfile" value="${src}/junit/runner/Version.java" />
<property name="zipfile" value="${dist}.zip" />
- <property name="testfiles" value="junit/samples/**, junit/tests/**" />
+ <property name="testfiles" value="junit/samples/**, junit/tests/**, org/junit/samples/**, org/junit/tests/**" />
<property name="unjarred" value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
- <property name="jarfile" value="junit-${version}.jar" />
+ <property name="binjar" value="junit-${version}.jar" />
+ <property name="srcjar" value="junit-${version}-src.jar" />
<property name="javadocdir" value="${dist}/javadoc" />
<property name="javadoczip" value="${dist}-javadoc.zip" />
<property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners" />
-
+
<target name="init">
<tstamp/>
</target>
@@ -29,6 +30,16 @@
/>
</target>
+ <target name="clean">
+ <delete dir="${dist}" quiet="true" />
+ <delete file="${zipfile}" quiet="true"/>
+ <delete>
+ <fileset dir="${basedir}" includes="**/*.class" />
+ </delete>
+
+ <delete file="${javadoczip}" />
+ </target>
+
<target name="build" depends="versiontag">
<mkdir dir="${bin}"/>
<javac
@@ -39,57 +50,26 @@
<compilerarg value="-Xlint:unchecked" />
</javac>
</target>
-
- <target name="distributeTestsAndExamples">
- <copy todir="${dist}/${dir}">
- <fileset dir="${bin}/${dir}" includes="${testfiles}" />
- <fileset dir="${src}/${dir}" includes="${testfiles}" />
- </copy>
- </target>
-
- <target name="populate-dist" depends="clean, build">
- <delete dir="${dist}" />
+
+ <target name="jars">
<mkdir dir="${dist}" />
<jar
- jarfile="${dist}/junit-${version}-src.jar"
+ jarfile="${dist}/${srcjar}"
basedir="${src}"
excludes="${unjarred}, **/*.class"
/>
<jar
- jarfile="${dist}/${jarfile}"
+ jarfile="${dist}/${binjar}"
basedir="${bin}"
excludes="${unjarred}, **/*.java, build.xml"
/>
- <antcall target="distributeTestsAndExamples">
- <param name="dir" value="." />
- </antcall>
- <antcall target="distributeTestsAndExamples">
- <param name="dir" value="org" />
- </antcall>
-
- <antcall target="javadoc" />
-
- <copy todir="${dist}/doc">
- <fileset dir="doc"/>
- </copy>
- <copy file="README.html" tofile="${dist}/README.html" />
- <copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
- </target>
-
- <target name="dist" depends="populate-dist">
- <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
- <arg value="org.junit.tests.AllTests"/>
- <classpath>
- <pathelement location="${dist}" />
- <pathelement location="${dist}/${jarfile}" />
- </classpath>
- </java>
</target>
- <target name="javadoczip">
- <delete file="${javadoczip}" />
- <antcall target="javadoc" />
- <zip basedir="${javadocdir}" file="${javadoczip}" />
+ <target name="samples-and-tests">
+ <copy todir="${dist}">
+ <fileset dir="${bin}" includes="${testfiles}" />
+ <fileset dir="${src}" includes="${testfiles}" />
+ </copy>
</target>
<target name="javadoc">
@@ -105,18 +85,34 @@
/>
</target>
- <target name="zip" depends="dist">
- <zip zipfile="${zipfile}" basedir="." includes="${dist}/**" />
+ <target name="javadoczip">
+ <delete file="${javadoczip}" />
+ <antcall target="javadoc" />
+ <zip basedir="${javadocdir}" file="${javadoczip}" />
+ </target>
+
+ <target name="populate-dist"
+ depends="clean, build, jars, samples-and-tests, javadoc"
+ >
+ <copy todir="${dist}/doc">
+ <fileset dir="doc"/>
+ </copy>
+ <copy file="README.html" tofile="${dist}/README.html" />
+ <copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
</target>
- <target name="clean">
- <delete dir="${dist}" quiet="true" />
- <delete file="${zipfile}" quiet="true"/>
- <delete>
- <fileset dir="${basedir}" includes="**/*.class" />
- </delete>
+ <target name="dist" depends="populate-dist">
+ <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
+ <arg value="org.junit.tests.AllTests"/>
+ <classpath>
+ <pathelement location="${dist}" />
+ <pathelement location="${dist}/${binjar}" />
+ </classpath>
+ </java>
+ </target>
- <delete file="${javadoczip}" />
+ <target name="zip" depends="dist">
+ <zip zipfile="${zipfile}" basedir="." includes="${dist}/**" />
</target>
<target name="upload.to.sourceforge" depends="zip">
Index: README.html
===================================================================
RCS file: /cvsroot/junit/junit/README.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- README.html 7 Mar 2007 19:50:50 -0000 1.19
+++ README.html 26 Apr 2007 20:21:21 -0000 1.20
@@ -4,13 +4,13 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
<meta name="Author" content="Erich Gamma, Kent Beck, and David Saff">
- <title>JUnit 4.3</title>
+ <title>JUnit 4.3.1</title>
</head>
<body>
<h1>
<b><font color="#00CC00">J</font><font color="#FF0000">U</font><font color="#000000">nit
-4.2</b></h1>
+4.3.1</b></h1>
<br>Brought to you by <a href="http://www.threeriversinstitute.org">Kent Beck</a>, Erich
Gamma, and <a href="http://david.saff.net">David Saff</a>.
@@ -19,7 +19,7 @@
<br>(see also <a href="http://www.junit.org">JUnit.org</a>)
<hr WIDTH="100%">
-<br>7 March 2007
+<br>27 March 2007
<p>JUnit is a simple framework to write repeatable tests. It is an instance
of the xUnit architecture for unit testing frameworks.
<ul>
@@ -42,6 +42,21 @@
</ul>
<h2>
+<a NAME="Summary of"></a>Summary of Changes in version 4.3.1</h2>
+<p>
+<ul>
+<li>Bug fix: 4.3 introduced a
+<a href="https://sourceforge.net/tracker/?func=detail&atid=115278&aid=1684562&group_id=15278">bug</a>
+that caused a NullPointerException
+when comparing a null reference to a non-null reference in <tt>assertEquals</tt>.
+This has been fixed.
+<li>Bug fix: The binary jar for 4.3 <a href="https://sourceforge.net/tracker/?func=detail&atid=115278&aid=1686931&group_id=15278">accidentally</a> included the tests and sample code,
+which are now removed for a smaller download, but, as always, available from the
+full zip.
+</ul>
+</p>
+
+<h2>
<a NAME="Summary of"></a>Summary of Changes with version 4.3</h2>
<p>
<ul>
@@ -115,13 +130,13 @@
</tr>
<tr>
-<td><tt>junit-4.3.jar</tt></td>
+<td><tt>junit-4.3.1.jar</tt></td>
<td>a jar file with the JUnit framework</td>
</tr>
<tr>
-<td><tt>junit-4.3-src.jar</tt></td>
+<td><tt>junit-4.3.1-src.jar</tt></td>
<td>a jar file with the source code of the JUnit framework</td>
</tr>
@@ -162,20 +177,20 @@
Below are the installation steps for installing JUnit:
<ol>
<li>
-unzip the junit4.3.zip file</li>
+unzip the junit4.3.1.zip file</li>
<li>
-add<i> </i><b>junit-4.3.jar</b> to the CLASSPATH. For example:
+add<i> </i><b>junit-4.3.1.jar</b> to the CLASSPATH. For example:
<tt> set classpath=%classpath%;INSTALL_DIR\junit-4.2.jar;INSTALL_DIR</tt></li>
<li>
test the installation by running <tt>java org.junit.runner.JUnitCore org.junit.tests.AllTests.</tt></li>
<br><b><font color="#FF0000">Notice</font></b>: that the tests are not
-contained in the junit-4.3.jar but in the installation directory directly.
+contained in the junit-4.3.1.jar but in the installation directory directly.
Therefore make sure that the installation directory is on the class path
</ol>
-<b><font color="#FF0000">Important</font></b>: don't install junit-4.3.jar
+<b><font color="#FF0000">Important</font></b>: don't install junit-4.3.1.jar
into the extension directory of your JDK installation. If you do so the
test class on the files system will not be found.
<h2>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/