svn commit: r824595 - in /commons/proper/lang/trunk: pom.xml src/test/org/apache/commons/lang/CharUtilsPerfRun.java src/test/org/apache/commons/lang/CharUtilsPerfTest.java src/test/org/apache/commons/lang/SerializationUtilsTest.java

[ba...@apache.org]

Author: bayard
Date: Tue Oct 13 05:40:15 2009
New Revision: 824595

URL: http://svn.apache.org/viewvc?rev=824595&view=rev
Log:
Upgrading to JUnit 4.7. Changing two classes (ClassNotFoundSerializationTest and CharUtilsPerfTest) to not end with Test as that was throwing them into the JUnit setup. CharUtilsPerfTest renamed to CharUtilsPerfRun. ClassNotFoundSerializationTest becomes ClassNotFoundSerialization. 

Added:
    commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfRun.java
      - copied, changed from r815157, commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfTest.java
Removed:
    commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfTest.java
Modified:
    commons/proper/lang/trunk/pom.xml
    commons/proper/lang/trunk/src/test/org/apache/commons/lang/SerializationUtilsTest.java

Modified: commons/proper/lang/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=824595&r1=824594&r2=824595&view=diff
==============================================================================
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Tue Oct 13 05:40:15 2009
@@ -401,11 +401,10 @@
 
   <!-- Lang should depend on very little -->
   <dependencies>
-    <!-- TODO: replace with TestNG -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.7</version>
       <scope>test</scope>
     </dependency>
   </dependencies> 

Copied: commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfRun.java (from r815157, commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfRun.java?p2=commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfRun.java&p1=commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfTest.java&r1=815157&r2=824595&rev=824595&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfTest.java (original)
+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/CharUtilsPerfRun.java Tue Oct 13 05:40:15 2009
@@ -56,7 +56,7 @@
 
  * @version $Id$
  */
-public class CharUtilsPerfTest {
+public class CharUtilsPerfRun {
     final static String VERSION = "$Id$";
 
     final static int WARM_UP = 100;
@@ -72,7 +72,7 @@
     }
 
     public static void main(String[] args) {
-        new CharUtilsPerfTest().run();
+        new CharUtilsPerfRun().run();
     }
 
     private void printSysInfo() {

Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/SerializationUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/SerializationUtilsTest.java?rev=824595&r1=824594&r2=824595&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/SerializationUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/SerializationUtilsTest.java Tue Oct 13 05:40:15 2009
@@ -42,7 +42,7 @@
  */
 public class SerializationUtilsTest extends TestCase {
 
-  static final String CLASS_NOT_FOUND_MESSAGE = "ClassNotFoundSerializationTest.readObject fake exception";
+  static final String CLASS_NOT_FOUND_MESSAGE = "ClassNotFoundSerialization.readObject fake exception";
     protected static final String SERIALIZE_IO_EXCEPTION_MESSAGE = "Anonymous OutputStream I/O exception";
   
     private String iString;
@@ -252,7 +252,7 @@
     public void testDeserializeStreamClassNotFound() throws Exception {
         ByteArrayOutputStream streamReal = new ByteArrayOutputStream();
         ObjectOutputStream oos = new ObjectOutputStream(streamReal);
-        oos.writeObject(new ClassNotFoundSerializationTest());
+        oos.writeObject(new ClassNotFoundSerialization());
         oos.flush();
         oos.close();
 
@@ -391,10 +391,10 @@
 
 }
 
-class ClassNotFoundSerializationTest implements Serializable
+class ClassNotFoundSerialization implements Serializable
 {
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException    {
         throw new ClassNotFoundException(SerializationUtilsTest.CLASS_NOT_FOUND_MESSAGE);
     }
-}
\ No newline at end of file
+}