[Junit-devel] CVS: junit/src/org/junit/tests ValidationTest.java, 1.1, 1.2 SortableTest.java, 1.1, 1.2 ForwardCompatibilityTest.java, 1.1, 1.2 InitializationErrorForwardCompatibilityTest.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-serv11474/src/org/junit/tests

Modified Files:
	ValidationTest.java SortableTest.java 
	ForwardCompatibilityTest.java 
	InitializationErrorForwardCompatibilityTest.java 
Log Message:
Removed EmptyDescription, which was unneeded, and the only reason why Description had a protected constructor

Index: ValidationTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/ValidationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ValidationTest.java	21 Nov 2006 18:53:34 -0000	1.1
+++ ValidationTest.java	21 Feb 2007 14:44:00 -0000	1.2
@@ -1,9 +1,8 @@
 package org.junit.tests;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.internal.runners.EmptyDescription;
 import org.junit.internal.runners.InitializationError;
 import org.junit.internal.runners.TestClassRunner;
 import org.junit.runner.Description;
@@ -24,7 +23,7 @@
 		new TestClassRunner(WrongBeforeClass.class, new Runner() {
 			@Override
 			public Description getDescription() {
-				return new EmptyDescription();
+				return Description.EMPTY;
 			}
 
 			@Override

Index: SortableTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/SortableTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SortableTest.java	21 Nov 2006 18:53:33 -0000	1.1
+++ SortableTest.java	21 Feb 2007 14:44:00 -0000	1.2
@@ -1,12 +1,11 @@
 package org.junit.tests;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Comparator;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.internal.runners.EmptyDescription;
 import org.junit.internal.runners.InitializationError;
 import org.junit.internal.runners.TestClassRunner;
 import org.junit.runner.Description;
@@ -100,7 +99,7 @@
 			
 			@Override
 			public Description getDescription() {
-				return new EmptyDescription();
+				return Description.EMPTY;
 			}
 			
 			@Override

Index: ForwardCompatibilityTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/ForwardCompatibilityTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ForwardCompatibilityTest.java	21 Nov 2006 18:53:33 -0000	1.1
+++ ForwardCompatibilityTest.java	21 Feb 2007 14:44:00 -0000	1.2
@@ -11,7 +11,6 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.internal.runners.EmptyDescription;
 import org.junit.runner.Description;
 import org.junit.runner.RunWith;
 import org.junit.runner.Runner;
@@ -199,7 +198,7 @@
 
 		@Override
 		public Description getDescription() {
-			return new EmptyDescription();
+			return Description.EMPTY;
 		}
 	}
 

Index: InitializationErrorForwardCompatibilityTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/tests/InitializationErrorForwardCompatibilityTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InitializationErrorForwardCompatibilityTest.java	21 Nov 2006 18:53:33 -0000	1.1
+++ InitializationErrorForwardCompatibilityTest.java	21 Feb 2007 14:44:00 -0000	1.2
@@ -1,15 +1,12 @@
 package org.junit.tests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import junit.framework.AssertionFailedError;
 import junit.framework.JUnit4TestAdapter;
 import junit.framework.TestListener;
 import junit.framework.TestResult;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.internal.runners.EmptyDescription;
 import org.junit.internal.runners.TestClassRunner;
 import org.junit.runner.Description;
 import org.junit.runner.RunWith;
@@ -26,7 +23,7 @@
 
 		@Override
 		public Description getDescription() {
-			return new EmptyDescription();
+			return Description.EMPTY;
 		}
 
 		@Override