[Junit-devel] CVS: junit/org/junit/internal/runners TestIntrospector.java, 1.3, 1.4 TestClassMethodsRunner.java, 1.3, 1.4 OldTestClassRunner.java, 1.3, 1.4 CompositeRunner.java, 1.2, 1.3

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

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

Modified Files:
	TestIntrospector.java TestClassMethodsRunner.java 
	OldTestClassRunner.java CompositeRunner.java 
Log Message:
- Fixed raw types because Eclipse 3.3 told us to.
- No longer dynamically check arrays that are statically typed as objects.
- Update documentation to 4.2

Index: TestIntrospector.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/TestIntrospector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TestIntrospector.java	27 Apr 2006 22:11:51 -0000	1.3
+++ TestIntrospector.java	16 Nov 2006 19:17:42 -0000	1.4
@@ -22,7 +22,7 @@
 
 	public List<Method> getTestMethods(Class<? extends Annotation> annotationClass) {
 		List<Method> results= new ArrayList<Method>();
-		for (Class eachClass : getSuperClasses(fTestClass)) {
+		for (Class<?> eachClass : getSuperClasses(fTestClass)) {
 			Method[] methods= eachClass.getDeclaredMethods();
 			for (Method eachMethod : methods) {
 				Annotation annotation= eachMethod.getAnnotation(annotationClass);
@@ -63,8 +63,8 @@
 		return true;
 	}
 
-	private List<Class> getSuperClasses(Class< ?> testClass) {
-		ArrayList<Class> results= new ArrayList<Class>();
+	private List<Class<?>> getSuperClasses(Class< ?> testClass) {
+		ArrayList<Class<?>> results= new ArrayList<Class<?>>();
 		Class<?> current= testClass;
 		while (current != null) {
 			results.add(current);

Index: TestClassMethodsRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/TestClassMethodsRunner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TestClassMethodsRunner.java	3 Aug 2006 22:03:01 -0000	1.3
+++ TestClassMethodsRunner.java	16 Nov 2006 19:17:42 -0000	1.4
@@ -88,8 +88,8 @@
 	}
 
 	public void filter(Filter filter) throws NoTestsRemainException {
-		for (Iterator iter= fTestMethods.iterator(); iter.hasNext();) {
-			Method method= (Method) iter.next();
+		for (Iterator<Method> iter= fTestMethods.iterator(); iter.hasNext();) {
+			Method method= iter.next();
 			if (!filter.shouldRun(methodDescription(method)))
 				iter.remove();
 		}

Index: OldTestClassRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/OldTestClassRunner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OldTestClassRunner.java	29 Jun 2006 23:06:46 -0000	1.3
+++ OldTestClassRunner.java	16 Nov 2006 19:17:42 -0000	1.4
@@ -20,7 +20,7 @@
 	
 	@SuppressWarnings("unchecked")
 	public OldTestClassRunner(Class<?> klass) {
-		this(new TestSuite((Class<? extends TestCase>) klass));
+		this(new TestSuite(klass.asSubclass(TestCase.class)));
 	}
 
 	public OldTestClassRunner(Test test) {

Index: CompositeRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/CompositeRunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CompositeRunner.java	15 Feb 2006 22:55:28 -0000	1.2
+++ CompositeRunner.java	16 Nov 2006 19:17:42 -0000	1.3
@@ -51,8 +51,8 @@
 	}
 	
 	public void filter(Filter filter) throws NoTestsRemainException {
-		for (Iterator iter= fRunners.iterator(); iter.hasNext();) {
-			Runner runner= (Runner) iter.next();
+		for (Iterator<Runner> iter= fRunners.iterator(); iter.hasNext();) {
+			Runner runner= iter.next();
 			if (filter.shouldRun(runner.getDescription())) {
 				filter.apply(runner);
 			} else {