Menu
▾
▴
[Junit-devel] CVS: junit build.xml, 1.28, 1.29 to-do.txt, 1.5, 1.6 .classpath, 1.10, 1.11
|
From: David S. <ds...@us...> - 2007-07-02 18:11:32
|
Update of /cvsroot/junit/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27902 Modified Files: build.xml to-do.txt .classpath Log Message: - The hamcrest-core-1.1 library is now included in the JUnit distribution. For more hamcrest matchers, see the hamcrest-library jar from http://code.google.com/p/hamcrest - The Popper Theory runner (http://popper.tigris.org) has been absorbed into the JUnit project, under the package name org.junit.experimental.theories - Several additional libraries used in the theories tests have been added in a new testlib directory - New "assertThat" statement to work with hamcrest matchers: // same as assertEquals(3, x) assertThat(x, is(3)); // same as assertNull(y) assertThat(y, nullValue()); - New feature: assumeThat. A failed assumption will cause the test to pass, without further execution. (The behavior of assumeThat may change in the future to allow richer reporting of tests that are skipped because of failed assumptions) // pass on any non-Windows system @Test public void getRootDrive() { assumeThat(getOsString(), is("Windows")); getFile("C:\"); // ... } - Convenience assumption functions: // none of these are null assumeNotNull(a, b, c); assumeTrue(everythingOk()); try { getDatabaseConnection(); } catch (Exception e) { assumeNoException(e); } - Documentation fixed for many assertEquals array methods - Two bugs in numeric equality fixed: 1718905: assertEquals does not compare float correctly 1715326: assertEquals does not compare java.math.BigDecimal properly - The protocol for overriding JUnit4ClassRunner has changed again. Please see the source for details. - Extenders can now extend TestMethod to describe the behavior of running methods that do not have a @Test annotation. - Adding Annotations to Description caused a binary compatibility problem with clients compiled on previous JUnit versions. This has been fixed. Index: build.xml =================================================================== RCS file: /cvsroot/junit/junit/build.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- build.xml 8 May 2007 14:45:18 -0000 1.28 +++ build.xml 2 Jul 2007 18:10:57 -0000 1.29 @@ -1,6 +1,6 @@ <project name="junit" default="dist" basedir="."> <tstamp /> - + <property file="${user.home}/.junit.properties" /> <property name="src" value="src" /> <property name="bin" value="bin" /> @@ -14,8 +14,10 @@ <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" /> - + <property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners, org.hamcrest.core" /> + <property name="hamcrestlib" value="lib/hamcrest-core-SNAPSHOT.jar" /> + <property name="hamcrestsrc" value="${dist}/temp.hamcrest.source" /> + <target name="init"> <tstamp/> </target> @@ -46,11 +48,15 @@ srcdir="${src}" destdir="${bin}" debug="on" + classpath="${hamcrestlib}" > <compilerarg value="-Xlint:unchecked" /> + <classpath /> </javac> + + <unjar src="${hamcrestlib}" dest="${bin}" /> </target> - + <target name="jars"> <mkdir dir="${dist}" /> <jar @@ -72,17 +78,22 @@ </copy> </target> - <target name="javadoc"> - <mkdir dir="${javadocdir}" /> - <javadoc sourcepath="${src}" - packagenames="${javadocpackages}" + <target name="unjar.hamcrest"> + <unjar src="${hamcrestlib}" dest="${hamcrestsrc}" /> + </target> + + <target name="javadoc" depends="unjar.hamcrest"> + <javadoc packagenames="${javadocpackages}" destdir="${javadocdir}" author="false" version="false" use="false" windowtitle="JUnit API" stylesheetfile="stylesheet.css" - /> + > + <sourcepath location="${src}" /> + <sourcepath location="${hamcrestsrc}" /> + </javadoc> </target> <target name="javadoczip"> @@ -90,7 +101,7 @@ <antcall target="javadoc" /> <zip basedir="${javadocdir}" file="${javadoczip}" /> </target> - + <target name="populate-dist" depends="clean, build, jars, samples-and-tests, javadoc" > Index: to-do.txt =================================================================== RCS file: /cvsroot/junit/junit/to-do.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- to-do.txt 24 Jan 2007 16:32:59 -0000 1.5 +++ to-do.txt 2 Jul 2007 18:10:58 -0000 1.6 @@ -1,4 +1,3 @@ -* What happened to CustomRunnerTest? * assertArrayEquals(double[], double[], double) and assertArrayEquals(float[], float[], float) * update documentation @@ -17,4 +16,12 @@ * Automatically add failing tests to the Known Defects section of the README.html * Create test target in ant -* Organize org.junit.tests \ No newline at end of file +* Organize org.junit.tests +* Create assume(that()) and assert(that()) + (what is a better name for the second one?) + +* Simplify implementation of equality, and organize AssertionTest + +* Theories class validation should be much better + +* assumePasses doesn't have desired effect within a Theory \ No newline at end of file Index: .classpath =================================================================== RCS file: /cvsroot/junit/junit/.classpath,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- .classpath 22 Nov 2006 06:29:43 -0000 1.10 +++ .classpath 2 Jul 2007 18:10:58 -0000 1.11 @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_01"/> + <classpathentry kind="lib" path="lib/hamcrest-core-1.1.jar"/> + <classpathentry kind="lib" path="testlib/hamcrest-library-SNAPSHOT.jar"/> + <classpathentry kind="lib" path="testlib/jmock-2.2.0-RC1.jar"/> + <classpathentry kind="lib" path="testlib/cglib-nodep-2.2_beta1.jar"/> + <classpathentry kind="lib" path="testlib/objenesis-1.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |
