junit-devel — junit developers

[Junit-devel] CVS: junit build.xml,1.21,1.22

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv851

Modified Files:
	build.xml 
Log Message:
Added javadoczip target to build.xml, and some better separation in build.xml while I'm at it.

Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- build.xml	21 Feb 2007 18:25:21 -0000	1.21
+++ build.xml	27 Feb 2007 17:51:30 -0000	1.22
@@ -10,7 +10,8 @@
 	<property name="unjarred" value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
 	<property name="jarfile" value="junit-${version}.jar" />
 	<property name="javadocdir" value="${dist}/javadoc" />
-	
+	<property name="javadoczip" value="${dist}-javadoc.zip" />
+
 	<target name="init">
 		<tstamp/>
 	</target>
@@ -31,19 +32,19 @@
 			srcdir="${src}"
 			destdir="${bin}"
 			debug="on"
-  		>	
-                  <compilerarg value="-Xlint:unchecked" />
-                </javac>
+  		>
+			<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="distributeTestsAndExamples">
+		<copy todir="${dist}/${dir}">
+			<fileset dir="${bin}/${dir}" includes="${testfiles}" />
+			<fileset dir="${src}/${dir}" includes="${testfiles}" />
+		</copy>
+	</target>
 
-	<target name="dist" depends="clean, build">
+	<target name="populate-dist" depends="clean, build">
 		<delete dir="${dist}" />
 		<mkdir dir="${dist}" />
 		<jar 
@@ -56,30 +57,23 @@
 			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="distributeTestsAndExamples">
+			<param name="dir" value="." />
+		</antcall>
+		<antcall target="distributeTestsAndExamples">
+			<param name="dir" value="org" />
+		</antcall>
 
-		<mkdir dir="${javadocdir}" />
-		<javadoc 
-			sourcepath="${src}"
-			packagenames="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners"
-			destdir="${javadocdir}"
-			author="false"
-			version="false"
-			use="false"
-			windowtitle="JUnit API"
-			stylesheetfile="stylesheet.css"
-		/>
+		<antcall target="javadoc" />
+			
 		<copy todir="${dist}/doc">
 			<fileset dir="doc"/>
-		</copy>		
+		</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>
@@ -88,20 +82,37 @@
 			</classpath>
 		</java>
 	</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="javadoc">	
+		<mkdir dir="${javadocdir}" />
+		<javadoc sourcepath="${src}"
+		         packagenames="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners"
+		         destdir="${javadocdir}"
+		         author="false"
+		         version="false"
+		         use="false"
+		         windowtitle="JUnit API"
+		         stylesheetfile="stylesheet.css"
 		/>
 	</target>
-	
+
+	<target name="zip" depends="dist">
+		<zip zipfile="${zipfile}" basedir="." includes="${dist}/**" />
+	</target>
+
 	<target name="clean">
-		<delete dir="${dist}" quiet="true"/>			
-		<delete file="${zipfile}" quiet="true"/> 
+		<delete dir="${dist}" quiet="true" />
+		<delete file="${zipfile}" quiet="true"/>
 		<delete>
-			<fileset dir="${basedir}" includes="**/*.class" /> 
+			<fileset dir="${basedir}" includes="**/*.class" />
 		</delete>
+
+		<delete file="${javadoczip}" />
 	</target>
 </project>

[Junit-devel] CVS: junit/experimental-use-of-antunit junit.ant, 1.1, 1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/experimental-use-of-antunit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv851/experimental-use-of-antunit

Modified Files:
	junit.ant 
Log Message:
Added javadoczip target to build.xml, and some better separation in build.xml while I'm at it.

Index: junit.ant
===================================================================
RCS file: /cvsroot/junit/junit/experimental-use-of-antunit/junit.ant,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- junit.ant	21 Feb 2007 18:25:21 -0000	1.1
+++ junit.ant	27 Feb 2007 17:51:30 -0000	1.2
@@ -1,8 +1,11 @@
 <project xmlns:au="antlib:org.apache.ant.antunit">
 	<property name="junitdir" value=".." />
-	<property name="antdist" value="temp-dist-directory-for-ant-unit"></property>
-	<property name="antdistdir" value="${junitdir}/${antdist}"/>
-
+	<property name="antdist" value="temp-dist-directory-for-ant-unit">
+	</property>
+	<property name="antdistdir" value="${junitdir}/${antdist}" />
+	<property name="testjavadoczip" value="new-england-javadoc.zip" />
+	<property name="exttestjavadoczip" value="${junitdir}/${testjavadoczip}" />
+	<property name="tempdir" value="tempdir" />
 	
 	<!-- is called prior to the test -->
 	<target name="setUp">
@@ -11,20 +14,51 @@
 	<!-- is called after the test, even if that caused an error -->
 	<target name="tearDown">
 		<delete dir="${antdistdir}" />
+		<delete dir="${tempdir}" />
+		<delete file="${exttestjavadoczip}" />
 	</target>
 
+	<macrodef name="junitbuild">
+		<attribute name="target" />
+		<sequential>
+			<ant antfile="build.xml" target="@{target}" dir="${junitdir}">
+				<property name="dist" value="${antdist}" />
+				<property name="javadocdir"
+				          value="${antdist}/ant-unit-java-docs"
+				/>
+				<property name="javadoczip" value="${testjavadoczip}" />
+			</ant>
+		</sequential>
+	</macrodef>
+
 	<target name="testTearDown">
-		<mkdir dir="${antdistdir}"/>
+		<mkdir dir="${antdistdir}" />
+		<mkdir dir="${tempdir}" />
+		<touch file="${exttestjavadoczip}" />
+		
 		<antcall target="tearDown" />
+		
 		<au:assertFileDoesntExist file="${antdistdir}" />
+		<au:assertFileDoesntExist file="${tempdir}" />
+		<au:assertFileDoesntExist file="${exttestjavadoczip}" />
 	</target>
 
-	<target name="testCharacterize_DistGeneratesJavadoc">
-		<ant antfile="build.xml" target="dist" dir="${junitdir}">
-			<property name="dist" value="${antdist}" />
-			<property name="javadocdir" value="${antdist}/ant-unit-java-docs" />
-		</ant>
-
+	<target name="testCharacterize_PopulateDistGeneratesJavadoc">
+		<junitbuild target="populate-dist" />
 		<au:assertFileExists file="${antdistdir}/ant-unit-java-docs" />
 	</target>
+
+	<target name="testJavaDocZip">
+		<junitbuild target="javadoczip" />
+		<au:assertFileExists file="${exttestjavadoczip}" />
+
+		<unzip dest="tempjavadoc" src="${exttestjavadoczip}" />
+		<au:assertFileExists file="tempjavadoc/org" />
+	</target>
+
+	<target name="testJavaDocZipDeletedOnClean">
+		<touch file="${exttestjavadoczip}" />
+		<junitbuild target="clean" />
+		<au:assertFileDoesntExist file="${exttestjavadoczip}" />
+	</target>
 </project>
\ No newline at end of file

[Junit-devel] CVS: junit/experimental-use-of-antunit junit-slow.ant, NONE, 1.1 build.xml, 1.1, 1.2 junit-old.ant, 1.1, NONE

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/experimental-use-of-antunit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23383/experimental-use-of-antunit

Modified Files:
	build.xml 
Added Files:
	junit-slow.ant 
Removed Files:
	junit-old.ant 
Log Message:
Refactored AntUnit tests into fast and slow tests

--- NEW FILE: junit-slow.ant ---
<project xmlns:au="antlib:org.apache.ant.antunit">
	<property name="junitdir" value=".." />
	<property name="antdist" value="temp-dist-directory-for-ant-unit"></property>
	<property name="antdistdir" value="${junitdir}/${antdist}"/>

	<!-- is called prior to the test -->
	<target name="setUp">
	</target>

	<!-- is called after the test, even if that caused an error -->
	<target name="tearDown">
		<delete dir="${antdistdir}" />
	</target>

	<target name="testTearDown">
		<mkdir dir="${antdistdir}"/>
		<antcall target="tearDown" />
		<au:assertFileDoesntExist file="${antdistdir}" />
	</target>

	<target name="testCharacterize_DistGeneratesJavadoc">
		<ant antfile="build.xml" target="dist" dir="${junitdir}">
			<property name="dist" value="${antdist}" />
			<property name="javadocdir" value="${antdist}/ant-unit-java-docs" />
		</ant>

		<au:assertFileExists file="${antdistdir}/ant-unit-java-docs" />
	</target>
	
	<target name="testCharacterize_DistRunsTests">
		<ant antfile="build.xml" target="dist" dir="${junitdir}">
			<property name="dist" value="${antdist}" />
		</ant>

		<au:assertLogContains text="Time:" />
	</target>
</project>
Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/experimental-use-of-antunit/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- build.xml	21 Feb 2007 18:25:21 -0000	1.1
+++ build.xml	27 Feb 2007 16:19:30 -0000	1.2
@@ -1,10 +1,18 @@
-<project xmlns:au="antlib:org.apache.ant.antunit">
+<project xmlns:au="antlib:org.apache.ant.antunit" default="fast">
 	<taskdef uri="antlib:org.apache.ant.antunit"
 	         resource="org/apache/ant/antunit/antlib.xml"
 	         classpath="lib/ant-antunit-1.0.jar"
 	/>
-	<au:antunit>
-		<fileset dir="." includes="touch.ant,junit.ant" />
-		<au:plainlistener />
-	</au:antunit>
+	<target name="fast">
+		<au:antunit>
+			<fileset dir="." includes="touch.ant,junit.ant" />
+			<au:plainlistener />
+		</au:antunit>
+	</target>
+	<target name="all">
+		<au:antunit>
+			<fileset dir="." includes="touch.ant,junit.ant,junit-slow.ant" />
+			<au:plainlistener />
+		</au:antunit>
+	</target>
 </project>
\ No newline at end of file

--- junit-old.ant DELETED ---

[Junit-devel] CVS: junit/src/org/junit/runner Request.java, 1.3, 1.4

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/runner
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22480/src/org/junit/runner

Modified Files:
	Request.java 
Log Message:
Removed untrue TODO

Index: Request.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/runner/Request.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Request.java	21 Feb 2007 20:26:29 -0000	1.3
+++ Request.java	27 Feb 2007 16:17:47 -0000	1.4
@@ -102,7 +102,6 @@
 		});
 	}
 
-	//TODO add an example
 	/**
 	 * Returns a Request whose Tests can be run in a certain order, defined by 
 	 * <code>comparator</code>

[Junit-devel] CVS: junit/src/org/junit/internal/requests ErrorReportingRequest.java, 1.1, 1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/internal/requests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22209/src/org/junit/internal/requests

Modified Files:
	ErrorReportingRequest.java 
Log Message:
Removed untrue TODO

Index: ErrorReportingRequest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/requests/ErrorReportingRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ErrorReportingRequest.java	21 Nov 2006 18:53:34 -0000	1.1
+++ ErrorReportingRequest.java	27 Feb 2007 16:17:07 -0000	1.2
@@ -38,7 +38,6 @@
 			return getCauses(cause.getCause());
 		if (cause instanceof InitializationError)
 			return ((InitializationError) cause).getCauses();
-		// TODO: untested
 		return Arrays.asList(cause);	
 	}
 }

[Junit-devel] CVS: junit/src/org/junit/internal/runners OldTestClassRunner.java, 1.3, 1.4

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/internal/runners
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22370/src/org/junit/internal/runners

Modified Files:
	OldTestClassRunner.java 
Log Message:
Removed untrue TODO

Index: OldTestClassRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/runners/OldTestClassRunner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OldTestClassRunner.java	21 Feb 2007 15:19:39 -0000	1.3
+++ OldTestClassRunner.java	27 Feb 2007 16:17:26 -0000	1.4
@@ -24,7 +24,6 @@
 		}
 
 		public void endTest(Test test) {
-			// TODO: uncovered
 			fNotifier.fireTestFinished(asDescription(test));
 		}
 

[Junit-devel] CVS: junit/src/org/junit Before.java,1.1,1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2290/src/org/junit

Modified Files:
	Before.java 
Log Message:
Fixing exception handling and documentation

Index: Before.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/Before.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Before.java	21 Nov 2006 18:53:34 -0000	1.1
+++ Before.java	21 Feb 2007 20:26:29 -0000	1.2
@@ -15,7 +15,7 @@
  * <pre>
  * public class Example {
  *    List empty;
- *    &#064;Before public static void initialize() {
+ *    &#064;Before public void initialize() {
  *       empty= new ArrayList();
  *    }
  *    &#064;Test public void size() {

[Junit-devel] CVS: junit/src/org/junit/runner/manipulation Sorter.java, 1.1, 1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/runner/manipulation
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2290/src/org/junit/runner/manipulation

Modified Files:
	Sorter.java 
Log Message:
Fixing exception handling and documentation

Index: Sorter.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/runner/manipulation/Sorter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Sorter.java	21 Nov 2006 18:53:40 -0000	1.1
+++ Sorter.java	21 Feb 2007 20:26:29 -0000	1.2
@@ -5,10 +5,11 @@
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 
-//TODO add an example
 /**
  * A <code>Sorter</code> orders tests. In general you will not need
  * to use a <code>Sorter</code> directly. Instead, use {@link org.junit.runner.Request#sortWith(Comparator)}.
+ * 
+ * 
  */
 public class Sorter implements Comparator<Description> {
 	private final Comparator<Description> fComparator;

[Junit-devel] CVS: junit/src/org/junit/internal/requests ClassRequest.java, 1.5, 1.6

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/internal/requests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2290/src/org/junit/internal/requests

Modified Files:
	ClassRequest.java 
Log Message:
Fixing exception handling and documentation

Index: ClassRequest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/requests/ClassRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ClassRequest.java	21 Feb 2007 18:24:11 -0000	1.5
+++ ClassRequest.java	21 Feb 2007 20:26:29 -0000	1.6
@@ -60,9 +60,6 @@
 		// TODO: check all attributes
 		try {
 			fTestClass.getMethod("suite");
-		} catch (SecurityException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
 		} catch (NoSuchMethodException e) {
 			return false;
 		}

[Junit-devel] CVS: junit/src/org/junit/runner Request.java, 1.2, 1.3 RunWith.java, 1.1, 1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/runner
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2290/src/org/junit/runner

Modified Files:
	Request.java RunWith.java 
Log Message:
Fixing exception handling and documentation

Index: Request.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/runner/Request.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Request.java	13 Dec 2006 02:10:50 -0000	1.2
+++ Request.java	21 Feb 2007 20:26:29 -0000	1.3
@@ -102,9 +102,27 @@
 		});
 	}
 
+	//TODO add an example
 	/**
 	 * Returns a Request whose Tests can be run in a certain order, defined by 
 	 * <code>comparator</code>
+	 * 
+	 * For example, here is code to run a test suite in alphabetical order:
+	 * 
+	 * <pre>
+	private static Comparator<Description> forward() {
+		return new Comparator<Description>() {
+			public int compare(Description o1, Description o2) {
+				return o1.getDisplayName().compareTo(o2.getDisplayName());
+			}
+		};
+	}
+	
+	public static main() {
+		new JUnitCore().run(Request.aClass(AllTests.class).sortWith(forward()));
+	}
+	 * </pre>
+	 * 
 	 * @param comparator definition of the order of the tests in this Request
 	 * @return a Request with ordered Tests
 	 */

Index: RunWith.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/runner/RunWith.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- RunWith.java	21 Nov 2006 18:53:39 -0000	1.1
+++ RunWith.java	21 Feb 2007 20:26:29 -0000	1.2
@@ -6,7 +6,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-//TODO add simple example
 /**
  * When a class is annotated with <code>&#064;RunWith</code> or extends a class annotated 
  * with <code>&#064;RunWith</code>, JUnit will invoke the class it references to run the 
@@ -14,6 +13,15 @@
  * in development. While it seems powerful we expect the runner API to change as we learn 
  * how people really use it. Some of the classes that are currently internal will likely 
  * be refined and become public.
+ * 
+ * For example, suites in JUnit 4 are built using RunWith, and a custom runner named Suite:
+ * 
+ * <pre>
+ * &#064;RunWith(Suite.class)
+ * &#064;SuiteClasses(ATest.class, BTest.class, CTest.class)
+ * public class ABCSuite {
+ * }
+ * </pre>
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

[Junit-devel] CVS: junit/src/org/junit/runners Suite.java,1.2,1.3

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/runners
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2290/src/org/junit/runners

Modified Files:
	Suite.java 
Log Message:
Fixing exception handling and documentation

Index: Suite.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/runners/Suite.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Suite.java	21 Nov 2006 19:52:30 -0000	1.2
+++ Suite.java	21 Feb 2007 20:26:29 -0000	1.3
@@ -16,7 +16,7 @@
  * Using <code>Suite</code> as a runner allows you to manually
  * build a suite containing tests from many classes. It is the JUnit 4 equivalent of the JUnit 3.8.x
  * static {@link junit.framework.Test} <code>suite()</code> method. To use it, annotate a class
- * with <code>@RunWith(Suite.class)</code> and <code>SuiteClasses(TestClass1.class, ...)</code>.
+ * with <code>@RunWith(Suite.class)</code> and <code>@SuiteClasses(TestClass1.class, ...)</code>.
  * When you run this class, it will run all the tests in all the suite classes.
  */
 public class Suite extends TestClassRunner {

[Junit-devel] CVS: junit/experimental-use-of-antunit junit.ant, NONE, 1.1 junit-old.ant, NONE, 1.1 build.xml, NONE, 1.1 touch.ant, NONE, 1.1

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/experimental-use-of-antunit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10549/experimental-use-of-antunit

Added Files:
	junit.ant junit-old.ant build.xml touch.ant 
Log Message:
With ant-1.7, this directory contains files for testing build.xml, which is useful for forward migration

--- NEW FILE: junit.ant ---
<project xmlns:au="antlib:org.apache.ant.antunit">
	<property name="junitdir" value=".." />
	<property name="antdist" value="temp-dist-directory-for-ant-unit"></property>
	<property name="antdistdir" value="${junitdir}/${antdist}"/>

	
	<!-- is called prior to the test -->
	<target name="setUp">
	</target>

	<!-- is called after the test, even if that caused an error -->
	<target name="tearDown">
		<delete dir="${antdistdir}" />
	</target>

	<target name="testTearDown">
		<mkdir dir="${antdistdir}"/>
		<antcall target="tearDown" />
		<au:assertFileDoesntExist file="${antdistdir}" />
	</target>

	<target name="testCharacterize_DistGeneratesJavadoc">
		<ant antfile="build.xml" target="dist" dir="${junitdir}">
			<property name="dist" value="${antdist}" />
			<property name="javadocdir" value="${antdist}/ant-unit-java-docs" />
		</ant>

		<au:assertFileExists file="${antdistdir}/ant-unit-java-docs" />
	</target>
</project>
--- NEW FILE: junit-old.ant ---
<project xmlns:au="antlib:org.apache.ant.antunit">
	<!-- is called prior to the test -->
	<target name="setUp">
	</target>

	<!-- is called after the test, even if that caused an error -->
	<target name="tearDown">
	</target>

	<target name="testCharacterize_DistGeneratesJavadoc">
		<!-- TODO: delete dist afterward -->
		<!-- TODO: DUP -->
		<ant antfile="../junit-head/build.xml" target="dist" dir="../junit-head">
			<property name="dist" value="saff5" />
		</ant>
		
		<!-- TODO: DUP -->
		<au:assertFileExists file="../junit-head/saff5/javadoc/org" />
	</target>
	
	<!-- TODO: takes a long time -->
	
	<target name="testJavaDocZipCreatesZip">
		<!-- TODO: DUP -->
		<ant antfile="../junit-head/build.xml" target="javadoczip" dir="../junit-head">
			<property name="dist" value="saff5" />
		</ant>

		<!-- TODO: dist name is DUP -->
		<!-- TODO: javadocs name is DUP -->
		<!-- TODO: delete this file on teardown -->
		<au:assertFileExists file="../junit-head/saff5-javadocs.zip" />
		
		<!-- TODO: DUP -->
		<unzip dest="javadoctemp" src="../junit-head/saff5-javadocs.zip"></unzip>
		<au:assertFileExists file="javadoctemp/org" />
	</target>

	<!-- TODO: delete dist on tearDown -->
</project>
--- NEW FILE: build.xml ---
<project xmlns:au="antlib:org.apache.ant.antunit">
	<taskdef uri="antlib:org.apache.ant.antunit"
	         resource="org/apache/ant/antunit/antlib.xml"
	         classpath="lib/ant-antunit-1.0.jar"
	/>
	<au:antunit>
		<fileset dir="." includes="touch.ant,junit.ant" />
		<au:plainlistener />
	</au:antunit>
</project>
--- NEW FILE: touch.ant ---
<project xmlns:au="antlib:org.apache.ant.antunit">
  <!-- is called prior to the test -->
  <target name="setUp">
    <property name="foo" value="foo"/>
  </target>

  <!-- is called after the test, even if that caused an error -->
  <target name="tearDown">
    <delete file="${foo}" quiet="true"/>
  </target>

  <!-- the actual test case -->
  <target name="testTouchCreatesFile">
    <au:assertFileDoesntExist file="${foo}"/>
    <touch file="${foo}"/>
    <au:assertFileExists file="${foo}"/>
  </target>
</project>

[Junit-devel] CVS: junit build.xml,1.20,1.21

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10549

Modified Files:
	build.xml 
Log Message:
With ant-1.7, this directory contains files for testing build.xml, which is useful for forward migration

Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- build.xml	30 Nov 2006 15:07:16 -0000	1.20
+++ build.xml	21 Feb 2007 18:25:21 -0000	1.21
@@ -9,6 +9,7 @@
 	<property name="testfiles" value="junit/samples/**, 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="javadocdir" value="${dist}/javadoc" />
 	
 	<target name="init">
 		<tstamp/>
@@ -62,11 +63,11 @@
                   <param name="dir" value="org" />
                 </antcall>
 
-		<mkdir dir="${dist}/javadoc" />
+		<mkdir dir="${javadocdir}" />
 		<javadoc 
 			sourcepath="${src}"
 			packagenames="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners"
-			destdir="${dist}/javadoc"
+			destdir="${javadocdir}"
 			author="false"
 			version="false"
 			use="false"

[Junit-devel] CVS: junit/experimental-use-of-antunit/lib ant-antunit-1.0.jar, NONE, 1.1

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/experimental-use-of-antunit/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10549/experimental-use-of-antunit/lib

Added Files:
	ant-antunit-1.0.jar 
Log Message:
With ant-1.7, this directory contains files for testing build.xml, which is useful for forward migration

--- NEW FILE: ant-antunit-1.0.jar ---
PK








Á[EÉtú1$<Î6”{b‰fÎš´9Æp×Kldu”›
oàC`ܞ§\·dM‹ÏTæx%oÌÕ²·Fù–Q1庾é0t_.åí„ú¤EóxÙpN¸‘ô­ÍC^èª9aTŸgèûÇaÛeGñ©ó¹%T2-\>2ìñD3´×+m™NIJ´“V‘W²EÌ”r¤¶ß

“Bú\+"«UvÕîv[»ØªÛZ­ZW«®eçÞ;„$Àó½îwÎùós¾ó͙N>KD5|ØM:§Ð/ܔCçFP˜ÞæMi~)ͯ¤ùµ4ÿ#Í[
½í¦:'Ío„èê¤ß*ô;•ÞuS	ýލmæ*½ç¦fú“Bÿë¦1tN¥?KÿiÞWé¯*Véo*ý]¥ÿ“µÐt^e°þ€¹€s8W—ÂynšÁùÒ(à̪Ê#@Àn•d®©\(} r1dr‰J½\Ê•ž’ùH™Œ*à2f…G«<ÆMWóXi¼
—»i¡h´ÞQxœ›®åñB3AXN”Ñ$…}2™yŠŒ¦Êò4…¯~:ŒÈ3dT!£™2ò˨Rš*iª®[œ“oµÒ\)Í,ifK3Gš«`P
8×M›xž›?DÿPùÃ*_-è²c¾›ðB-׸ùZ^¬ð…—º©‹—É—:œ×Ks4ËnPøz¦ÑKÁP{KdqØ\š+‚qÓ1&­!Œ~iHÇ8“§nõê¦Õ[[êš[š·Ö/nXQ·‹+¶ë»õڐî¬m6cÁpç|¦Â¥‘pÜÔÃæZ=”0˜ŠlÊÆ&›˜©8µÐ¸µ|°’×\ײf“Kv0©-u‹W/kZ×ÈänxõÁ`¨Z‰uÖêQ½­Ë¨5#‘P¼bjÍ}Q#^3â‘D¬
#è	ˆ;lìY‹l7ÚL¦‰ƒÓ:ß±{DÈQ‚Êl½f0T»8Ó÷‰Y°G‹Æ"Q#fîk6LlS;ô`(hÜÀ”oÄb!/õ¦pLñilb}ZåPcë‚ Œ½ˆ)·bæZè½4ÒK¯†ÆÄÎV#Ö¢·†1p¤M­ÕcA™;‹.³+)¾lDüàZë%ðæêííL³+†³ÛjÇnK#¡,!¦H9±6¦ÚË$dª¬¸ª”ƒÙBôÓ%SÀ• ÏªÌ7aÖV[\4>@ÜpL%qìëpeº¼°fp.Âöúì“wUloŠ±×hK˜8¹Qí‘­bìsi¾-‘b
„Ó,gm0˜nFÄVùíÙÌTê@F,j.Ög
iwD|L‰2F{ÝÞ6#ê¯+v2]18X+•doÏï°8@ž™*Ër-]±ÈñfÑaw:‘X:¬…Y,
rBpÁiC¡\é\ªGM„Ÿìu…õASrwà4úkc0õX§·ÅYÒVêQ|ËÃÑ­‰"¢MC-‹ìÁ¡ä·é‰Î.àÖºôp{ÈhJ˜Ñ¦EkÐYn-#Úíï
aë³R±qICÃLI­‰ŽA“³q	f‘ŽŽ¸¸l~Èwš]HOiKž!ͧ>”ˆw	ڈ3*µ×-ŸJidf$%Y;bO¿Î⨶˜¡›†“ûê±Ùr”šŽr±”™»Ã@Häí¶ó|öeÐÔêlqa,žk©ž'é³<˜Ð:&X¼X7MX‘I¾µ`B¼yDú’€±ƒ¦$æ`Ìïeª$`/ÛñEˆÛvŸFËÏrt4#DŠêþÁÄæïªÀ"··q€u7[ÑlÃל¤W#´}‚â°¹Œ4º•nÓèvi>Fû5ºCšÓ
î¤¸F¥›
å,ÇøâÁp›áš¾öˆÏ0}Æ^9Wdf$¯ñ«á°l7-ÃYvõit†þU£›é;¹Ká ÆÛåàvÐAC¼SaMÉ@»ŠÙ
‘á¨Æ»xEjOVÖešrñt‹ãdX8ÎðŸã`9A‡¶—Týý§†ä¿G£Wé5÷ò¾”¯÷?Ê7itRDÝLÏhô4¾EÖ^¿:%ÍiÁ0~¸T¡ñ­|›Æ·óÇ4Þ/–ºƒ?®ñ
¾SãOÈ
<ýÒêò'þRt«7ڃ U±³FÎFãOóg4þ,Na8û]¼Nã»yµF?¡Ÿ*|Æ÷ò}ý%
Sð0Í~ã´Ákw9Ÿû5~€¿ ñƒbãn1ï!1ÐÄá2y5B‹ߑ:¤å†¦¬Я"ròþL)y‘òW!¸Â¦M=qˆÂK¾Ú	Ù5]®û*.zûH¹ÕhUøNm6cøœU­åëѨFV
VÎ]°dg$ˆWÑ0ÌWՌ¤"mTŅû°£ú²ÊiÄg0n=}¬œ%9Ìz0À¸jÐ)ô?S¢€žWá³]z¼ÑØkJÅduý‘¦ïm5¯“|„ûXÁ¹Ø—SIjo¦¨ªìô‡6Qn(Ò)/4NCÊZRUژ~Š-×ã]¦S1ö+ßpŸ¶E¦Çoz¤DnW+2šqe›R~æ£
±Þ¥ýxÚU~a¿€ˆY|]PŠ´Aëý
òÖەÐC@9y·Î®OŠœ@Zµ×ìzW6öۈS@»TOč,k\P?—¦õ­Ç£2Þ%
­ºøh7v&ö¦
ÉÁŽÂz´¸­mNQkOœê± –z"dZŸAeè;³J†È|
û¨d½§´—<Ïùe¥—F¢ËȲƒò0íF7â•ø“4J†ž²$Æ@í¦BÚGcpÒc=Þ$•a’ÆyÆ;c×R=z(Ï3+žIö²"[|θÿ–$M §ÃäDOÀWžÄ¡}‘wŒfÐqª¡$ͧ§ph'`ð²Üó°£|Ž¼N•—ŸÛVy‚¦0l¥§Š,,McZYu‚®Ó»ƒéLÏӌÆê$Ut×ÑÏì%ùü)eáåX®òTÛ ¡uMÏùg3¸k¨
xÐYº†þ6ÑOi+ýÌÂïÆj„×áâÂÛÒǸ͉„rª‡Ó<j9^¡¶v®‘Ø]‚x|/
¯¨
È`ì¿¿²—®<N³`ðYIš½²Ê3ç]•C‹ª<s­Á<—ýiò`€1Ìúa¦@¾7߶o–‘e˜«ŠWñ`ÿn^fâ@-„ìE
uB7xUϜ$]³Î«zéûèÚõ"¡—FÈÀ«&i‰ß«ôÒÒ2W7i²æ™›¤e)ôVu½pc¯¾Y?,Íñ,šÇn¯;P;Oóº“t] Ð[x
r_ ’nš)}]7rÍӄsáóTæ=T"ÃkÏù—i‡¨À‘¼|XÉó³$׊†Ý«¥÷z‹žëùàˆe¼$5HZ}µ˜=7pyt ¸ÿ’·â¦„Ç+T'=Á¤?§y…Þ”ž‹x‹ÕÄWÖ빗OÓõVÿ:ÖOóKVÿ:Ÿ“Þv`
Ž„güXzã/p¼A³éM8î¯i)½Gü
5Ó;´™~KAú®±w‘ÎÚ? 羇ûüXFR’˨_ä±ô{ée.º¿€ûûÀ8’ÞÆ÷wñý}Ë9ìå.‡&åú¢¿ó$°‰Ì\‰¯s8—籋s/c…YåÙÍkAµ…Gr;—qGãù?–o¯àuëwaý~¬?Œõ¯aýIÇÇxl0™Ÿç)ü]ž
KLä3<	ö˜Ì/cíU¬½ŽñÛ¿‹ñyš¨ÀʯâÎü*4táõô5äàC×! 'ÒµôÏt”
¡C#ö=†sº“kèqúèz¸¾‰SAA¾
‰-ŽôÖÌíô-„v>ŸAø*hó%¤S)
&i{ÏùW2Sn¥šÏÃwQ)ßMãù”ü÷Ó,~ÀÒæ*HJ]Jf‰ÎÙil³Q¹³¢s¶ƒME¿lé#ÿ;(Â\PÎñ¯—ªp›<Fà-ÏÂëuU¢ّK=çßÈÀœS?ŒŒ{éâ‹4Ž¿ŠG¨–E.ürª”Œ)¨sÒPçàƉ[PçÐ!oç@¡Éi¨¯ÒkƒAUªrq¨¡A¡ÔÇ
õ€úMP<
¨Oê·.ª\"ý¡þ<$
åt`º†“ªa;«QÞîÌ
º_
<ï8ï“8ï> {ÞÿhŸMçàq–ßÞgùâô4²é2¾ìÔ¡vÉðßðgyŽ0uᥜÿPK


E	Ë]ÁÀ^Åò‘Å„í¹¤šÚðBßâ+¶tÒv!5*‰5t¡›¡ý|™
ô]“€E
tj˜ÄC²]çZxžDÞCÛ)ÖtF¶½P/‡Ð]OèÁ
·ìÝwzÙó¹.öLW÷\®[ž[´%\Ã#LIíi†þZaµÈ¬>ƌŠY
O@¬¡A»)òÝÀ¨•KóxÊ`üóËn%ÚvÝ~.=+†Éÿ¶³hò¢³ª-QWѹ¥K\Èþ©8È
T!Ô,
úã’"Ù>-$T/ßKRO(lÇXvÃ2÷«Ý
_Y—‰e‡—¹l»®*CädmgŸ[‚ŠNmï
èvНeˆÉî¢(N1õ=”MÓ:£9;Ëeb_ÿLiWhLÑŒCÁ®R¤Cыkeú+4s„”ئ\¾
Ãýæ#†žsT…AF×É] Ü K±ˆëéIÔzî”Ù>å:N‘ØÎ4Q®#yÖ§|¬,5W—hN ÍðÚ	ZÞ£ó­Û¹/ˆŸcÚÎ.\
"Iã"¹Z"‡ÏÈÙsòñy¼"Ÿ¬aµÎízÅm‚ÞބN^(ShNÐ3±ý
PK

Hée°ÿùI›?:9‰¤;º•Öî

ëˆÓÏ1†$e‹ºÆé1íˆâ$MÊÔÇ('‹{}°g³3E1e¦¤ÝÄ4U…Ï-Ì 
˜*c¨š•°.èfœ²UÜÛï#ö¶E‚m[û\¬
LW9Ì‹sFÿ

?BB¨ê<Ö\	Ľìµþ›z2
‡ÎÒ<c«Ë|Ë冣kyšwöÔ}¶DûÎ{?+ctóº‘æÅg™^–'t«Z¡À4ÃÀy	gB¥9R³ c–"è¢O°™¾Kýè®=¯Í[`â {•v*­ŒÖªØ>Ø®—vlµìBY¹”€ë¸A+ÃMt–‹<eÇú¿ÁwRò¢1ªé÷ÚJYeá)DE4î:Ë_‰5LX#ÿÁê>ÅId€Îvüq’ø‚7‹øÀª—b_á;ċÁCÔ
Òg̒çÿõ


q¬aeL6Yå]
[Šnè[ù•üV~=—¿·º,(ì‡F¶nXµlÑuL«6/0š³­¦kXnɨ·¤À tsÇT—Z»»Ò!@äSñh1­][@;”NÙn0Z•åVM@4¦
¶SË
£²'³®mכYòÝtì}YqÉHlÁ´LwQàBòdÕÙ¹ÊÙUr0V0-¹Þ:(Kç¶Q®KNÈ®õ’á˜Ìw„wÏl
\îµËék‘ÏlÁ®åŒ†ÛrT6Ã5é懄g’³AŠ“Ê6å¬t˜Y¥Ì3JLÉË_ñ#Ä/s§—[f½Zt
ǕU
è2]b­ü¡´¼d£’·T˜PmòO¶É¥ïâ”ǯPm›{,qæ'þ±Î\÷pTÅ×ÃÈfÓ¨q*5æãE»åTäŠÉU=ÝS¶IÇ%¼'0Ü':žÁy“L¦˜L3™ar
5”tlãÝ)å”éÜL¦n×tìà} ­áCwñ‘Ž{¸£ãcÊ:*¨êØÕQCZÇL‹á7M	tÝ(ský×Wá‚Ùt¥Å¸Á$ßÊù“š”ŒÕjîêI×}¤¦n\'𖤢I«"ðXúƒWÀ!×öΦCšÅk\?Þêô	wä}(û²âŽ÷c¥){òhdZ®YÏÞ2š{.O!ãÄ4÷žU+ɀœŽ‹¼™ÚtLÛ1Ýê6V½\Ö¼f%“F£!-ê×ç
w| ;ïµáYzˆ)hx
çèxš^è
ŒÐGÝ«ö“uª³Nw֙ÎJÍLë(a/á2Ñg‰û	ƒt¬¥C¤~ÇÀÎc>B¤»v·±îVën‡RéGN§Úˆ§#´è•»+DSˆC„¸1\¥ “äv×èdž~07‘Ež¸ž§SP’*ҚԎƒ¦wšôӝ_P<È﯈´1ú‹ï-¦ä7”%ÝÓéX¢‚â£
øÅ@ü\ >€Ïâ3x-


Ó:zUâšו¸¡DNÃM}ã–Òy%f”˜Õ1‡Ûæ5ÜÑ° òä–'П_77ÍtÕ´+éϵìʸ@¸êTòrSVDN {²-oR ‹/32㔤À¡¼eËÙƃ‚tÍBUª\NѬ.›®¥ÆmcÈ[³êÃyÇ­¤ÍšY\“iÓöÔÓ`ÖtÞ©dÛ3-»ÎÊZ]z‹>°c±ÿ#SÕçÂôòñiXˆd‹kN®‘³méfªf½.Yu4¶»¬ç8Õº_Ü3ë%Y®§UèðN¼_ "ÿK—z»p®VnšUŸ¨{„Z<`ÝfÍk¸Òe\Œ3Ày}Cæ
ë²èqZ_pnQ^³£‡wQ–RÎ>DÔÀ8i`',ã®ÀéŽÐ§Vµ”Ý*ʚg9¶ÀIoMFU+DM$žŒZõ¨+6,W–Tê³¾Ä
7œñ©6üñj¸gà+Ü8uð
|Uß(ñ­¦¬
ìÝç©F¹,]R±doØÎwvôU;^â*‹()!
”±ª¡b`
ÖþÚ\	œéHÉm×Q4gœ5ǖ6ûktÿ]/:vÉRô¥3¯Þ4¬Œ¼M³°‹+í.öû…çL§¡
F ‹wn¾¶»âÄ~ó<LwG’IiÙ6u:Pš-¸¬ëæUGÅ;]
é]Óµ}5ÈÙeÇôr°,݂S—þ¸‡ãiYhTüQ·Y«I»Dª
)?Ã@Ë«A½ÅˆW	âôjåºÚÎI$›u
VœÏ(Ÿ1q¤	cö‰¯{©Ç¨ß¡¥>D§>L=¤Š½DßÊ6úû4qT%oâX
À9©‰w …ž ||º³ÖYñ·GcÅ>Œs'h¿Lʯ O’æùq]Ä4VÅ}\ç
u%܄…[¨b™Á£×OXÀ#,ù|%ü­üŸàSV™çÌyÒTì´9ďäö¹àsËEŒøÌF/"‰È¿PK



—•X²SdDÓ,?Ba§Ý^vzÝÞ!|îöÿººéÃçÎõuç²ß=ëÁÕ5|¸º<íö»W—tuË/ÁßÝËÓC@â†@ð.՜;%(™7–*¥@çR`)LŠ‘Ɉ¦¤Æ™#Œ*gŕ¢žJÃÒÊmHÚO¥uåb‚'óiGGTùBÙX€ºB™c‘„ùÀ11]N#ü›)iÃv
à¦Ô¹Ô…!P‘Åö$Ì+’×O®:òœ+Æî9°‚FfaÞõ‘$_˕_ØZËÈ^Š¸íi‰ìxÙ"à±OÂ÷÷þëCØ^ˆ×¢º]’²µ@l–Œš%«Vs%¾O£¹šG«YÐö‰gß2"­:‹y—–¸zl "K7ގ=hU£ý¶¬Å
Ÿ›¤ó³_8ùdààý}‘ØÃ
'̄áÑ<›‡ƒÚ¤BÇ=þM¨!½å!¹Ò›E‹–'϶+a³~}?é„6vÞC[]dþûr1RÉü³KìÓ3퀭À>‰Û¶AžåîVÄϔù~z㩼­šˆ[—»/åÎùíÞW¯Tfk5ôÉ>Õk!çy½sÑe<š§ºì®¼ÝNÂeÆaÕ>Û©.O½Ÿ¥2?UKÄo~¨*©²H[à#€/ãÉË1_H/_:
ÏIÀ¸aÊ׫¨5k’ïü½2?’07
ËÒìªGµÓÂ΂ìú`p;&Ü¢CòöFvS@­¶~ӑcnò2c,Uu—)ÙÈí<ªì«ÝìK»6ðæ›þëî¹_ZÓ\–Ò+€<V


”fÛ«ÇâiÓp§‚†i&MwP”²tSäÖÐËHYθxEŒŠ\­ º@ÍÏg¥z£_S²ÇP0©%–0²£zWÜ“Ýz|£nÆdìNú¬þÝ´ô¨B>*zŒ^=·ÖƒI“š}Mô³:~-U÷¬?•]»(ú+"91Õx¡L	îEÄ\—ãèKBxÚV„–”ÚNŒŠ÷Ò1‹|-ɳk™Üjt[y|R"þwExòÄ—®t,Þ#Œ0ŒºãÉûªQªÚÓÖ`šádú€
_˜L¶Ò[€pY#L
ykXl¹¾ê==«¨V°ÚC:Ÿ+V2áM‹ù*»žU;ºAÚð:Ñÿß[,Tg•d•‚°—2£3Ñ~3¹]‚Ú>pªç
í¤‘í–Zu>#‹ÈÅæö1öRç6}@’©×v™'ç	©pñØÍ/ÌÔؒæëÒÅÕ%ÔQrÕ²‹ß²·‘ÞAtnÑ
â—+˜ý?Åü+ºãnE*	uÁŽdÚì6œð›î‘Xõ¢†6Ü®¡	×jX‰F
×à-VaµŠ/kø
NiX‹
kp†fiÞ*MNkø*N«8£Á@¯†V‘z/ñxj¦âk¾ŽoI«_A§þ“”¥'ECúr}%Z}“©0žÜÆto¯Á*Š®êˆÖiø¾­áfÜBgÕkø^Rñ²†ïâ{*^Ñð}œe
Ê­L‚»Uš’Ü…ñ‡w²&zĉ‚ùžv4J¢g¥à‡
ª=EÓV,‰çø#
?Æ&ú1Í$ªï‰™~‚[4ü?ÓðsüBÃ/ñ+
¿Æo4ü¿Óð{üAÃñ'ÖðìÒpþªâoþŽW5\F’7PoYìGioïrjÝÂ|)?~ïUTáǜݱ“˼]ºÓ¦]ïcFk,—‹Ž!¾&7—×1:Fó¼x>WÙü‹Ë7ð#å\rõxšI2%ä™ÎeãçX~Œ›ÒºìS‡²–Wof¾Nt+5ەZ¤Ù
j_WYq"_òÜJžÓ¢*ïÌ~š•½©æ„ò”™Ñ»jÖDë¬e¦‘JÆ·¹ÕdބE×}Ì÷(ð¾°¦ç)‹\Šä¹*ó_ b´Ä—ý()q䕴“e€£¯/ÊÇÈØð “Mc ¹Íh1ôê¼N—bv™§iÙ׏WǍDŸìeäòÅYÜݯ›+I¬/Ô\Ýd¿jøzÕ->;¹ÀrÖ$÷}º+åºz*ż`UÓŒëÝôIe¨©ÉSäâ	o†÷†¶µmí›Ú¶´´7­Œ6··)˜›œû¦Òû¿€Ã{s‚o•„¨5ã\Nÿ¯Á7—A®„‚7#ˆYR°øG¬@. »çmd÷¼šìžw{ŸÜ?vßìökܞהݷÚ})¿ÚÐNôuur!ûIáa(áš!„k‡PxÈ~ÛrŠKØ^
ÞNݜÍWSº@¤E?ߨjA{v½½G*©¬JÅØLÆIxÞé…U0ë]Äڒ«É6OÁõ”òÀ*ÕC,#ÖzL°n€îb]Oi!tZø(Š‡ †ÃáÂÍCðóBp¼Ô»	*L§r|1-{À4t¡Û¦sÕp|Á§ˆ{T»«vEÍa”ìC);mԚ£¸hü1ÛØogì̱£"{L;ý¶1luÁÛ¸O¤Ê;JÝGôÝàa­4á6LÆ»s°Ë³Ø帑Šv.v+÷ÉÎ

h`<é»Ø¿7‡“’,`‰(_	$)­`<z@ûÚ?úöw¾hÓ¦;ˁV0þT®½¦t¶µ2ü2˜T^–ÁäÇI’;,çp7"BÅ*:å³hSZ÷C¥›Æl܍¢Úƒç&¦z!Ý;‚ÊÎaL+ŸžAU¸&ƒìËgÊà
Ùe0«Á'¹xœS¡(ƒ‹«|\²³F0»³Ê7Œ9ûQ&ß",ã¹
E#˜×YEåæ·íǤ†â,è¬*ÆÂã¹:Qɺƒ#XÔY[7ŒÐA’q/ã\꒺†.î&9÷`îC5îgey€%ïA¼‡Xªf0=B÷?ʯǸ{÷?I„'p{ùæ{
¯âiüÏØN¹Ž$Ÿ¥‹ÒÚbîèbà6ýÂØÁ2P$.Ⱥì5;/¤4ü‹ÁÝoÁ³\ô³Ÿ"ïf7.¸i©;$•¹$ePMӅ‰ó²Ôzµµ2!ƒêZHzýL©!ۑøl/5dvqKMY}ٖ./k°;.•Õ³­‰•¶ª0‡±GXw2¬èÏåDžž5Cw͘KoåO"ï6f”£üvÛ@`æa,i­9‰»1¹ædpE[Ý)ú§µvôØd
8Æ
ÇÆ'˜Ü'Y=^@ÿêÈÑa®TPæ=Ì1QbfV‰™,g¦}Ô4r¹‹x~æàí®³íÄ
;×4ðö[ŽÀ
PK

$X´ˆUÔVK½¯z[ï£úøñû{3lXèA>ŸÌ{ï÷~ïw|Ç{ûøÿyÀ<üWÇÍnIBÃ^·&±·Õ¡·ËlŸ|ÞªãŽ$ê°_Èwê¸+	wËâmI~ÞnàI¼÷è¸×À»’Ha¯|Þ-Ÿû’xޛÄûð~ù|@Ç
4ð¡$¦âÃrì#"è£>&ãÇåÌý>!‹Oø”ŒŸ6ð&–ß³ò—ÄxÐÀgŐωi÷‰!Ÿc¿ öø¢/ÉöCrò‡eqX8Ž8*ì#²5pL_Nâ7ð¿jàQa?aàkIœÄ×
<¦ã:¾©¡Ö+&wn·wÚÍ9¯¹«JAwà;öÐb
ñœë:~%·rîàf?8>j‡ýœ†IåíõÜ
Ê»‰ksn.XJ¶ôìMbm^¿£a\gÎu֕†ú¿Çî˓’êô²v~“íçdcÁ¶\QÃÂNÏl¶vv›Ól»ü—(µ9Ÿ+­k^Ÿ·sî
7ØHjgD¤r³èݎÛßé
öxê*æf‡¸Õ–·‹E‡*ZÓÏ«£Õ.:稘Q¸Xœ‹çCÙË.Q–†úb`ûASºKRÃü³ì</_T’×ûÞv',ÑÏÛî`eP³«22]«veBó\êP|t^ô‹Ë'x}¥\¾¿=ë<ut×–°Rm±OÔóxZKaXèi…o±œ'vê~ÉíÉ
‘ ]GueèAºº{	²:dÐ#œ¬çö3¢ÚJ
I»¿¿ÝÎåK>¥¶W‘r¡@­`Vø‚“œvúŸƒM¡jSÚU/ú¨ƒæ¬ò}Õ”©fÌs”žm¾7,5 NªºÃxþD"cÁG´¼†Ë«TÊ,2'Ùí•ü¬†´±Z	ͽ–\R:³ôyÀÄ:ìà4Ø¥¦§L¬A‡‰¸Áļ^ÃÄjíEX»L\‡ë5L¨Ò`dÿ[&:±ÖÄ·ñNž8¯èlß<_Çã&žÀwÙ¾ªg#“±UòÚZ,ßÓ&Nã)ß7ñüPǏLü?1ñStUQQK®¨
µ\Á5y£+³Ïë-OuZñ¡dâgø¹‰_€­tŒ¤rÑb9ˆA¿ÄÓbÕ¯hi“%sQ6~§Ã&K…_Q~#”†&KªÈròv¡èôý·øŽß›øþÈ4±X"&ž\ŸÁŸLl—¸=ª”Z,&Oü;LüEŒ‰ÓŸ¤üU(ÜȳÚWtt®ZibXìP¢R+k—¨Í²]kՆ
]Lü
×ñÿÄ¿XÍuv`Ih(éߊÐde½|iÈU¢	l²n­S,ڃ‚ŽgMüOє:
^JïgÃ|	9«¡çR¯êjBºÜƒ£‹Qµ/Þ%woµf0ûB÷qCënêbÂPu}g·†Y–vvÃN؅
×Ðô‚N”Û·x!…E›®*¹á\ÑÆÖ݁ܵ±ôì-­_é NÕÇô–Vu©äKÅmÆgK¾ï¸$÷Ú\>/¾)xUÄÕUA¬˜6¯äJìÐ05Ýq'́°”¢IGª(ZÔ¸åû+pvÍáK¥]uÛÅgzÉy;Dt šLJ¯¬
L<›÷ŠÒmÓÕë.Hc‰Èýܺ¦+ZÞ
c}¦‡óe”®~i<oï¿ì¢ƊšòM!MHǑڦÊö}BõD“|Q9c:ߢ«ù­E´|Îj¤Ÿ«‘}›cêlóü®çj5bœ
“2Ç¡õ¦jFQ›Š"žÑŽ"qH{-¿õ\q¸1¸2ÃèFGM.—HèRžªá˜ÈÌ…þœ”¤¢^ƒ8Z”„É!W$Af½xehrG…²4ƒ&¸WÈÌi…A3ëzG‘<Š1œš½™#3Š±GQŸÉ4`­N5ÃøuǑêMMÅĖXcŒ;“67ÆæÊÀ‰ÆØ&àe#˜"Ë4Äø–øqLíM½¢1>ŠËN¢þ5Ø
/¬o!
ÀZ³ã±–c6V ­Ükãl%O´c3AÝJÐm®²Gø7(T\›xwãâQÙïވ7)4<ÕG}͔–嬖’¢Ž
Ó@•)«Žü§a=¸ÜiU^‹tÛ·	îLÁ+77&RW(„2#¢Ì,SfE”+CÊÃHO¿{"f{#˜RR!~‰Æø
Ub2‚ygá›	Ç惘֢G8ë‚s‹qf«Ñ èµØÃßf‡	ºŒ'éâa<¦Æ0}˜Âï::߅B1•Ô™„w.Á\D8—1
;°‰ÔÍðì`J™N{û]þ^B}?Á~€ >DXð£”z’ë'¸~ƒ*Xk “nrµ•3]Öér°NGÁªÃ)lCŽ¶7à„
[œvQaK“W~T¶ªK`¦Æ«2‰×(®J]MdíÔ|~¨έ¾í»3¯¨™e³f’Þ§jg¨¬nOÄ8.³äՎ
kG¥Þ…Tǀ§ÃX«@+í‹ÎÕîq,°òoTÚ-E[PÖ¾ Ò^YpÉ[Ã9Ÿ/‘=äþzUïɤ®áÐr®†€`•0;+4ԗ5ÔGdæ3¤¢¡ªgR×VÓ°‹vSÞ a§êaÃe
ϒ[°Ü'è«EÒn–¬cKYz
™U’‹å`Uò¬y–—yÂòi­äi#u¬,‡D6S«Îʌ{*pÜL«oa7ÞË.}+{ìm,‚}Lú;èí~܎;•Ï™Ð‡²ÏûˆIèó>"#>×ó»oV‰ú¥ç&–’ônɭՔZ÷PK


ëxďàQq	ËãrËGuì•q_	öã	?àI
#FýX†1ãrÍS"ùi?âc²ü¸8¤ã°ŸÑñ	?©ãS~|Ÿ‘ųÅënZù'‡>+üωìÏɽϋMŸ×ñáü¢|¾$”/ëøŠlU/èøš,¾îNj8¢ã2~SÇ·üø6¾#B¿«ãj×øñ=|ߏà‡~ð#?~ŒŸÈç§~¦ãç~¡á—
ÅmÍ-=
öKÂÛáX81궓ÑÄ@£ÂŒ&+‘²Ã	{s8–6
­´­0'õB]i{(m“ÝÇÉ^8œŒ*ÌÊmoIFm3ɍâ~+¾EöêÚ­ä@(<Žš!Û²b©¥‡Òv4jîêh‰™q3açÎö[¹O
Ÿ	QL¨ÙŠ¤…‰Û¾¤eQŸÊ£ö]Ü.¤“IN{̹ŠÏŽ&¢ö
­Y±™g›¬~ZTÖM˜éxŸ™ì	÷ÅL
Š„c›Ãɨ¬]¢ÏŒ¦Vå«/Šó/M©¡X4e›	3º £}}Âî%­Ý%Q‘™Ä0é¨Ñ¦e
§×xãpnҺČ؍ÇúBT.±£qÊLJ
Ìbx鶮–sȎZ	1Ü&›+KaáôwQn_:ëßC
3џ§¨â_IN{ÞXã­Z1YL2hîy¸¿c8K')c£Ç¹©°\ŸJ™I±DN›ý†ÉEaJ;õUUЩNK2i%‚^ÊLPz“Ö°¸Ý¹°Òs‡o³’ñ°íŠT1…EÞ8K8¹:ht_*<àÄÓÎ!—8•·V+e'ÂqR*jVx%â¢1aÚ¡ÞÄ¥	k8!Gòíów[édÄÌxqî±a¸R(¬~¥
[4U`¨BA§Ü#mNòÄhƒäfŽ‹ú(ŸB‘c’¡ŠT±¡4¥kªÄP~Uj(CÍà%j&uږI>²•))jJ¨r5KV>©%ššm¨€*7T…ª
s5/jLCU©ùÒ¢¯.×E"è3Ô	äÆN\ƈv/1ð\aàr\A國u¢Z ©…†Z¤ªž1ÖلSg
µX(FĊ¥ã‰MSKu¡SKUµ¦N6Ô2µ\S5†Z!Ä ªÕT¡êÕJC…pÂ‚ióNI·(œöê‹6KôkH…žšW|!¦M°)*¿¯æB§Ê²TtÉìUÁVLõ*×Öxïx_µdÚLíåÈT/M˜ÃÙwXakÖ/t…}E„ئ›÷
+<íñ~ÕKRxcÑ˘—˦ÆáèúYî!‹!˜2íõ6yúÒòØ-Ÿþ]ÈÉ;UsUÃE©8óD(œá
Î1x‰õT{X*óٌÄÂÉp&¶Ëk&wX¢S©5d&r¦]ã	ßäƒmÇÞêDÚÉS˜asMÔÛÛ:[.în97[9s¢Yå%<¦|\™8h”—U}ÍtªO„èÉt¢ÉJ‹,ÕÆ~tòA–­íÒÏvm“†¦ÍyxhÈievdÒí85¢M¯y9m¸ÕÕßïÔRw‘oÈNVŽ¸Âìl‹ËjލŤIe»‰è;]Ø$F6{iDbVj"‹¶ÅÒ©AŽY¡jŠÂ‘éE¥IÌ\!L¶Ë™öÉî~ÅîhÁ´,rM®[wì¤wËHmr^’,½Üãz"I¾ŽlûU3öàQvõeÚe]JO#‰–›C¤že“H'étÚ7ё¨D.íI†#æ¤Â–†‡7*rOZ?ëûûùvS¸á¢ku³yY&16Nt’¢
óGb/gj˜ÍØÂÓpU@z´dΜ½’3²×rF¶KÎÈîÈ#ÎX³ì‚øÝÆÕø8Bm
Œ¡0àCQP ˜4m+WúJö;"ø
ðЀ2œ†
¬B51HŠ‘„(.ᨤÛË\¢6¡Ø9³/X[70X7ŠÒŒ|ckðIfŒaæʂã˜5‚ÙAÒfO¡¼
EämBœû…Ü)AgÄÉÅPfCx«£Å>$ÉWÀy*‡ëÍÔ£ˆ{GckƱ¢³žS¢X;Ž:±S–e¾ÀâQÔ;<+³<¡©yNÉòœ:5ÏiÏ8Nçj•yC^gãõžÌ“°>3ㅳÄÇÅ£h؃ù€7ø²ä*Ñ,àїñ9~áygÌxc3*ù½~†x%ƒ{)C|%ƒû,†w+:Ÿ\ëñÜNDo ÂwÑLjå
Rb˜S8›R·ã®_Ϝwüx„;}ÔãpžwŽä¼s$ç#9ï°ÃvSk/½#ümÁÚ14ÜÎ&n#XÍùê@em~d®vA;&;º‰plĚ\8.£ZÀÛ©êåLË+±}û©¸Š<אëÔ«	ĵŽAÕTf­kF¨•3£fKEQ4=«üÓ®òŽªâŒ»×Lv·|ʊòݝg˙¬cÐg-Xßë	õÔþ&Ôãfîï"Ç-hÆ­èÀmŽöA?ÓLÜQÀ	;:svtæìà׎Z!vÌtJÏÚ``‡õÅl¦³{;­½3Y¤d'+w¦+Wfo#Úâfþ4ò¼aC0ÐäuÃ]¼ánÞpÏqÜp%OÈ/07ÍWÓ¿ÅÜÛ%ÐÖJæI-lnðUà–;Q^ØèL™¯NHÉâ
½Õ™fé<ÕÖPTUô,æVbÓ½(«œ#Tg»>ÐÎyÇ(:3K:¼+?¥3>ö¨×âÝ9‡nÀ,~vsv?æá
Ô`NÁÃt죬’±6>άÝKîcÀíçù')á	†Á
º|ā¨•O]	ÁÎäß,æÕUhÏKPo!$×çåä®”»ú(wQnJþˆwÕÅQ‚¦tçŽâ¼}íî}s1¯;ÿ("å0£óG9ÜÓI·©¨ð—ºP
ùހ÷:ÿ,Ñ׋÷ äÿPK

ö‘åý=ýÌuã0ïGcVd¸þ
¼ªx
Ö?…Ÿ)~¿Pü~¥ø5¾½)æoÿPK

c0»°’^¾[Iâö¸[YøïíSÔ(©´Å.,3

‡
NÚÃ÷7w?mÙjsÍ^ßn®×÷ëÛ͖½¹½cۛ‚Ýݼ»»½~xzëz½½¿[÷€O‘/–ìZÔ²“°i–á9ü,œ„f¼iX+xǐ|º5Œw+UWٓ¬VšFL‹^«j,ñqˆáە4ƒ–»ÿ¸a^,*¶;±­(-™/à­Æý}ÃT
¿HxO•c+ºaŽ;¥ÏØ+UÒr˜:vB3`ËáÄø8”–ÿ¦;¥¹3Á®ÞkG»=½äô1aCìyÃnè‚3VÆE%9ã%Qò¼€BàÝ@HÁ+ŽQ)Œe
„ì+…ϵ܏šÞ
×C:´Zƒ×%©˜Ö'ҕç8¹
6U£Ó"z¹³$]ઍ-—I‹žkòÔ	Ó
-šDH÷¸ÿAÏéx+.½HHYºæ%—™zÏC-	Uç^ð‹€Ã³0ŽÔÙ­A™. }=Ü ¹ÌBäەC6‘–²z¢sðÆDŽ(’p°^(¸¼‰Éތ;È0.ÅxCGü‹.Hè*Êþg%Z
æ³u&>˜Ç‰
Œ‚
’wöØñ†<ë¨ñdG@fìœÆF®~†úL"²„)ž-aI†Kïÿ"_9eƒÇ€«@/)v
X™“Dkò”U{XvJª°îëX5-ò	è-U‘¥™Ì'½£þ
B‘)êçU]#r„²!HÖö!ï(=X3…\á@¸Ã™”Œ¢|¨
k13ïû[]Ձ¾1Ç9öʆKм}7ôIdR=‡ÛAtõ¤Ø­5ä(ß?	kfš.Ì%4⪮’B¢\ú:8=Ų¶«Ô „9ƒî’#Å×È%[×è
Içe £¡¯
roÙà{Ž¦dèƱÌ%¸]+c^êP˜RˆÅìïàœ5ühF9 ÀØÛ²
šó¤˜b’?ŸK„TE,óÆ5û)¥2êä…ó¶i	ý!êrߌÐË7Â.‚|3cϕJÎl5ÁàEKFßáƃ¿
{wzz؝V1U|µdw"[-‰–Ÿbœæ*ȗÒc¤IÖz5’ˆÂu#$Cò,DFðÿ*©èyãnAÀG2^›.RMên­Öîµj ÿ²Ág¸Wi¾à—Væ<p|#›¶¯
SK“[
ª“žÎDæTS¦ýÊ·®ǛwÉÍv¬¡:öm8I°#'®mŠìÐl×j2&0‡Gª8Bؓj„¥t~™Ü¯Å
vêpŽ-;BÁ¡
¾?ØÞ3ݜÂë±Í|GB¿[gD;S–\ÜQf;e»†PnxUá¿5vX©ft¼
}Ѥã83Ï×Ô^¹í†í•#Â4KöÐA6dBñו[p¢š,’™ËiŠQ“q[2fûèh-í)ðÖéˆÉÂÈ]:=ÿïBވÕą,«¸yµ6jÀca?E5i§l+ˆa½§¶±gF(FTÂ.»0@2¹Ë,F±C]ÐghÂöÐKR@œ\äP(žD™•JÓA1Z칶۳i§“l6þ‰ÓCƒI4Á땢<;XhŸl½ÐnhP\Îðç{
álNèGÜO¸_3çÛöeï̞ïè;±MÖâ·Qº
BH@&è Z\Ù#G qÀ.%ê̒498a>›+ûHóVtd¦hDýuÉ®¥¡–
W×5{Ø4t
áޝlM
¢J÷
fxÛGq¢PKÑT†AY”`Å·³|vñ˯‹$MҜÄÕʓw2Ê®ßLºù%»¸VݟÂ7YûþpÉhj@m²
˜þ
DàÅu!IáÏvÓKæ5à),i¸`™€lGƒk8û¶›ðÆÌOo[ÿC4l[=°½/æ~±¼ñÓÚGn]



























‡

[Junit-devel] CVS: junit/experimental-use-of-antunit/lib - New directory

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/experimental-use-of-antunit/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10494/experimental-use-of-antunit/lib

Log Message:
Directory /cvsroot/junit/junit/experimental-use-of-antunit/lib added to the repository

[Junit-devel] CVS: junit/experimental-use-of-antunit - New directory

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/experimental-use-of-antunit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10494/experimental-use-of-antunit

Log Message:
Directory /cvsroot/junit/junit/experimental-use-of-antunit added to the repository

[Junit-devel] CVS: junit/src/org/junit/tests ClassRequestTest.java, NONE, 1.1 AllTests.java, 1.9, 1.10

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10311/src/org/junit/tests

Modified Files:
	AllTests.java 
Added Files:
	ClassRequestTest.java 
Log Message:
Test handling of private suite() methods

--- NEW FILE: ClassRequestTest.java ---
package org.junit.tests;

import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.internal.requests.ClassRequest;

public class ClassRequestTest {
	public static class PrivateSuiteMethod {
		static junit.framework.Test suite() {
			return null;
		}
	}
	
	@Test public void noSuiteMethodIfMethodPrivate() {
		assertFalse(new ClassRequest(PrivateSuiteMethod.class).hasSuiteMethod());
	}
}

Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/AllTests.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- AllTests.java	21 Feb 2007 17:12:37 -0000	1.9
+++ AllTests.java	21 Feb 2007 18:24:10 -0000	1.10
@@ -11,6 +11,7 @@
 
 @RunWith(Suite.class)
 @SuiteClasses({
+	ClassRequestTest.class,
 	ListenerTest.class,
 	FailedConstructionTest.class,
 	// TODO: What did CVS do with this?  CustomRunnerTest.class,

[Junit-devel] CVS: junit/src/org/junit/internal/requests ClassRequest.java, 1.4, 1.5

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/internal/requests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10311/src/org/junit/internal/requests

Modified Files:
	ClassRequest.java 
Log Message:
Test handling of private suite() methods

Index: ClassRequest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/requests/ClassRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ClassRequest.java	21 Feb 2007 17:12:37 -0000	1.4
+++ ClassRequest.java	21 Feb 2007 18:24:11 -0000	1.5
@@ -56,7 +56,7 @@
 		}
 	}
 	
-	private boolean hasSuiteMethod() {
+	public boolean hasSuiteMethod() {
 		// TODO: check all attributes
 		try {
 			fTestClass.getMethod("suite");

[Junit-devel] CVS: junit/src/org/junit/tests RunWithTest.java, 1.2, 1.3 AllTests.java, 1.8, 1.9

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11377/src/org/junit/tests

Modified Files:
	RunWithTest.java AllTests.java 
Log Message:
Better error message when a custom runner has a wrongly-signatured constructor

Index: RunWithTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/RunWithTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RunWithTest.java	6 Dec 2006 01:22:48 -0000	1.2
+++ RunWithTest.java	21 Feb 2007 17:12:37 -0000	1.3
@@ -1,6 +1,6 @@
 package org.junit.tests;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
@@ -57,4 +57,28 @@
 		JUnitCore.runClasses(SubExampleTest.class);
 		assertTrue(log.contains("run"));
 	}
+	
+	public static class BadRunner extends Runner {
+		@Override
+		public Description getDescription() {
+			return null;
+		}
+
+		@Override
+		public void run(RunNotifier notifier) {
+			// do nothing
+		}
+	}
+	
+	@RunWith(BadRunner.class)
+	public static class Empty {		
+	}
+	
+	@Test
+	public void characterizeErrorMessageFromBadRunner() {
+		assertEquals(
+				"Custom runner class BadRunner should have a public constructor with signature BadRunner(Class testClass)",
+				JUnitCore.runClasses(Empty.class).getFailures().get(0)
+						.getMessage());
+	}
 }

Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/AllTests.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- AllTests.java	21 Feb 2007 15:19:39 -0000	1.8
+++ AllTests.java	21 Feb 2007 17:12:37 -0000	1.9
@@ -6,7 +6,8 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-// TODO (Feb 21, 2007 10:05:41 AM):  organize these tests
+// These test files need to be cleaned.  See
+// https://sourceforge.net/pm/task.php?func=detailtask&project_task_id=136507&group_id=15278&group_project_id=51407
 
 @RunWith(Suite.class)
 @SuiteClasses({

[Junit-devel] CVS: junit/src/org/junit/internal/requests ClassRequest.java, 1.3, 1.4

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/internal/requests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11377/src/org/junit/internal/requests

Modified Files:
	ClassRequest.java 
Log Message:
Better error message when a custom runner has a wrongly-signatured constructor

Index: ClassRequest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/requests/ClassRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ClassRequest.java	24 Jan 2007 16:32:59 -0000	1.3
+++ ClassRequest.java	21 Feb 2007 17:12:37 -0000	1.4
@@ -1,8 +1,7 @@
 package org.junit.internal.requests;
 
-import java.lang.reflect.Constructor;
-
 import org.junit.Ignore;
+import org.junit.internal.runners.InitializationError;
 import org.junit.internal.runners.OldTestClassRunner;
 import org.junit.internal.runners.TestClassRunner;
 import org.junit.runner.Request;
@@ -11,6 +10,7 @@
 import org.junit.runners.AllTests;
 
 public class ClassRequest extends Request {
+	private static final String CONSTRUCTOR_ERROR_FORMAT= "Custom runner class %s should have a public constructor with signature %s(Class testClass)";
 	private final Class<?> fTestClass;
 	private boolean fCanUseSuiteMethod;
 
@@ -25,15 +25,20 @@
 	
 	@Override
 	public Runner getRunner() {
-		Class<? extends Runner> runnerClass= getRunnerClass(fTestClass);
+		return buildRunner(getRunnerClass(fTestClass)); 
+	}
+
+	public Runner buildRunner(Class<? extends Runner> runnerClass) {
 		try {
-			Constructor<? extends Runner> constructor= runnerClass.getConstructor(Class.class); // TODO good error message if no such constructor
-			return constructor.newInstance(new Object[] { fTestClass });
-		} catch (StackOverflowError e) {
-			throw new RuntimeException();
+			return runnerClass.getConstructor(Class.class).newInstance(new Object[] { fTestClass });
+		} catch (NoSuchMethodException e) {
+			String simpleName= runnerClass.getSimpleName();
+			InitializationError error= new InitializationError(String.format(
+					CONSTRUCTOR_ERROR_FORMAT, simpleName, simpleName));
+			return Request.errorReport(fTestClass, error).getRunner();
 		} catch (Exception e) {
 			return Request.errorReport(fTestClass, e).getRunner();
-		} 
+		}
 	}
 
 	Class<? extends Runner> getRunnerClass(final Class<?> testClass) {

[Junit-devel] CVS: junit/src/org/junit/runners AllTests.java, 1.2, 1.3

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/runners
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26251/src/org/junit/runners

Modified Files:
	AllTests.java 
Log Message:
Improving test coverage on OldTestClassRunner and AllTestsRunner

Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/runners/AllTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AllTests.java	8 Feb 2007 03:29:22 -0000	1.2
+++ AllTests.java	21 Feb 2007 15:19:39 -0000	1.3
@@ -22,10 +22,10 @@
 public class AllTests extends OldTestClassRunner {
 	@SuppressWarnings("unchecked")
 	public AllTests(Class<?> klass) throws Throwable {
-		super(suite(klass));
+		super(testFromSuiteMethod(klass));
 	}
 
-	private static Test suite(Class<?> klass) throws Throwable {
+	public static Test testFromSuiteMethod(Class<?> klass) throws Throwable {
 		Method suiteMethod= null;
 		Test suite= null;
 		try {
@@ -34,7 +34,7 @@
 				throw new Exception(klass.getName() + ".suite() must be static");
 			}
 			suite= (Test) suiteMethod.invoke(null); // static method
-		} catch (InvocationTargetException e) { // TODO need coverage
+		} catch (InvocationTargetException e) {
 			throw e.getCause();
 		}
 		return suite;

[Junit-devel] CVS: junit/src/org/junit/tests OldTestClassAdaptingListenerTest.java, NONE, 1.1 AllTestsTest.java, 1.2, 1.3 AllTests.java, 1.7, 1.8

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26251/src/org/junit/tests

Modified Files:
	AllTestsTest.java AllTests.java 
Added Files:
	OldTestClassAdaptingListenerTest.java 
Log Message:
Improving test coverage on OldTestClassRunner and AllTestsRunner

--- NEW FILE: OldTestClassAdaptingListenerTest.java ---
package org.junit.tests;

import static org.junit.Assert.*;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import junit.framework.TestListener;
import org.junit.Test;
import org.junit.internal.runners.OldTestClassRunner;
import org.junit.runner.Result;
import org.junit.runner.notification.RunListener;
import org.junit.runner.notification.RunNotifier;

public class OldTestClassAdaptingListenerTest {
	@Test
	public void addFailureDelegatesToNotifier() {
		Result result= new Result();
		RunListener listener= result.createListener();
		RunNotifier notifier= new RunNotifier();
		notifier.addFirstListener(listener);
		TestListener adaptingListener= OldTestClassRunner
				.createAdaptingListener(notifier);
		TestCase testCase= new TestCase() {
		};
		adaptingListener.addFailure(testCase, new AssertionFailedError());
		assertEquals(1, result.getFailureCount());
	}
}

Index: AllTestsTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/AllTestsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AllTestsTest.java	6 Dec 2006 01:22:48 -0000	1.2
+++ AllTestsTest.java	21 Feb 2007 15:19:39 -0000	1.3
@@ -59,4 +59,16 @@
 		AllTests tests= new AllTests(AllJUnit4.class);
 		assertEquals(1, tests.testCount());
 	}
+	
+	@RunWith(AllTests.class)
+	public static class BadSuiteMethod {
+		public static junit.framework.Test suite() {
+			throw new RuntimeException("can't construct");
+		}
+	}
+
+	@org.junit.Test(expected= RuntimeException.class)
+	public void exceptionThrownWhenSuiteIsBad() throws Throwable {
+		new AllTests(BadSuiteMethod.class);
+	}
 }

Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/AllTests.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AllTests.java	26 Jan 2007 14:04:13 -0000	1.7
+++ AllTests.java	21 Feb 2007 15:19:39 -0000	1.8
@@ -6,6 +6,8 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+// TODO (Feb 21, 2007 10:05:41 AM):  organize these tests
+
 @RunWith(Suite.class)
 @SuiteClasses({
 	ListenerTest.class,
@@ -41,7 +43,8 @@
 	InaccessibleBaseClassTest.class,
 	SuiteMethodTest.class,
 	TestClassMethodsRunnerTest.class,
-	IgnoreClassTest.class
+	IgnoreClassTest.class,
+	OldTestClassAdaptingListenerTest.class
 })
 public class AllTests {
 	public static Test suite() {

[Junit-devel] CVS: junit/src/org/junit/internal/runners OldTestClassRunner.java, 1.2, 1.3

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/internal/runners
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26251/src/org/junit/internal/runners

Modified Files:
	OldTestClassRunner.java 
Log Message:
Improving test coverage on OldTestClassRunner and AllTestsRunner

Index: OldTestClassRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/runners/OldTestClassRunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OldTestClassRunner.java	8 Feb 2007 22:45:21 -0000	1.2
+++ OldTestClassRunner.java	21 Feb 2007 15:19:39 -0000	1.3
@@ -15,7 +15,49 @@
 import org.junit.runner.notification.RunNotifier;
 
 public class OldTestClassRunner extends Runner {
-	
+	private static final class OldTestClassAdaptingListener implements
+			TestListener {
+		private final RunNotifier fNotifier;
+
+		private OldTestClassAdaptingListener(RunNotifier notifier) {
+			fNotifier= notifier;
+		}
+
+		public void endTest(Test test) {
+			// TODO: uncovered
+			fNotifier.fireTestFinished(asDescription(test));
+		}
+
+		public void startTest(Test test) {
+			fNotifier.fireTestStarted(asDescription(test));
+		}
+
+		// Implement junit.framework.TestListener
+		public void addError(Test test, Throwable t) {
+			Failure failure= new Failure(asDescription(test), t);
+			fNotifier.fireTestFailure(failure);
+		}
+
+		private Description asDescription(Test test) {
+			if (test instanceof JUnit4TestCaseFacade) {
+				JUnit4TestCaseFacade facade= (JUnit4TestCaseFacade) test;
+				return facade.getDescription();
+			}
+			return Description.createTestDescription(test.getClass(), getName(test));
+		}
+
+		private String getName(Test test) {
+			if (test instanceof TestCase)
+				return ((TestCase) test).getName();
+			else
+				return test.toString();
+		}
+
+		public void addFailure(Test test, AssertionFailedError t) {
+			addError(test, t);
+		}
+	}
+
 	private Test fTest;
 	
 	@SuppressWarnings("unchecked")
@@ -31,48 +73,12 @@
 	@Override
 	public void run(RunNotifier notifier) {
 		TestResult result= new TestResult();
-		result.addListener(getListener(notifier));
+		result.addListener(createAdaptingListener(notifier));
 		fTest.run(result);
 	}
 
-	private TestListener getListener(final RunNotifier notifier) {
-		return new TestListener() {
-			public void endTest(Test test) {
-				// TODO: uncovered
-				notifier.fireTestFinished(asDescription(test));
-			}
-
-			public void startTest(Test test) {
-				notifier.fireTestStarted(asDescription(test));
-			}
-		
-			// Implement junit.framework.TestListener
-			//TODO method not covered
-			public void addError(Test test, Throwable t) {
-				Failure failure= new Failure(asDescription(test), t);
-				notifier.fireTestFailure(failure);
-			}
-			
-			private Description asDescription(Test test) {
-				if (test instanceof JUnit4TestCaseFacade) {
-					JUnit4TestCaseFacade facade= (JUnit4TestCaseFacade) test;
-					return facade.getDescription();
-				}
-				return Description.createTestDescription(test.getClass(), getName(test));
-			}
-
-			private String getName(Test test) {
-				if (test instanceof TestCase)
-					return ((TestCase) test).getName();
-				else
-					return test.toString();
-			}
-
-			//TODO method not covered
-			public void addFailure(Test test, AssertionFailedError t) {
-				addError(test, t);
-			}
-		};
+	public static TestListener createAdaptingListener(final RunNotifier notifier) {
+		return new OldTestClassAdaptingListener(notifier);
 	}
 	
 	@Override

[Junit-devel] CVS: junit/src/org/junit/internal/runners TestClassRunner.java, 1.2, 1.3 MethodValidator.java, 1.3, 1.4

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/internal/runners
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12633/src/org/junit/internal/runners

Modified Files:
	TestClassRunner.java MethodValidator.java 
Log Message:
Rename validateAllMethods to validateMethodsForDefaultRunner, which is clearer

Index: TestClassRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/runners/TestClassRunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TestClassRunner.java	6 Dec 2006 01:22:48 -0000	1.2
+++ TestClassRunner.java	21 Feb 2007 14:46:51 -0000	1.3
@@ -30,7 +30,7 @@
 
 	// TODO: this is parallel to passed-in runner
 	protected void validate(MethodValidator methodValidator) {
-		methodValidator.validateAllMethods();
+		methodValidator.validateMethodsForDefaultRunner();
 	}
 
 	@Override

Index: MethodValidator.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/internal/runners/MethodValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MethodValidator.java	24 Jan 2007 16:32:59 -0000	1.3
+++ MethodValidator.java	21 Feb 2007 14:46:51 -0000	1.4
@@ -35,8 +35,7 @@
 		validateTestMethods(AfterClass.class, true);
 	}
 	
-	// TODO Ugly API--one method should do both
-	public List<Throwable> validateAllMethods() {
+	public List<Throwable> validateMethodsForDefaultRunner() {
 		validateNoArgConstructor();
 		validateStaticMethods();
 		validateInstanceMethods();

[Junit-devel] CVS: junit/src/org/junit/tests TestMethodTest.java, 1.3, 1.4 InaccessibleBaseClassTest.java, 1.1, 1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12633/src/org/junit/tests

Modified Files:
	TestMethodTest.java InaccessibleBaseClassTest.java 
Log Message:
Rename validateAllMethods to validateMethodsForDefaultRunner, which is clearer

Index: TestMethodTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/TestMethodTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TestMethodTest.java	8 Feb 2007 22:45:20 -0000	1.3
+++ TestMethodTest.java	21 Feb 2007 14:46:51 -0000	1.4
@@ -121,7 +121,7 @@
 	
 	@Test public void overloaded() {
 		MethodValidator validator= new MethodValidator(Confused.class);
-		List<Throwable> errors= validator.validateAllMethods();
+		List<Throwable> errors= validator.validateMethodsForDefaultRunner();
 		assertEquals(1, errors.size());
 	}
 	

Index: InaccessibleBaseClassTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/InaccessibleBaseClassTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InaccessibleBaseClassTest.java	21 Nov 2006 18:53:34 -0000	1.1
+++ InaccessibleBaseClassTest.java	21 Feb 2007 14:46:51 -0000	1.2
@@ -9,7 +9,7 @@
 	@Test(expected=InitializationError.class)
 	public void inaccessibleBaseClassIsCaughtAtValidation() throws InitializationError {
 		MethodValidator methodValidator= new MethodValidator(Sub.class);
-		methodValidator.validateAllMethods();
+		methodValidator.validateMethodsForDefaultRunner();
 		methodValidator.assertValid();
 	}
 }