Author: niallp
Date: Mon Feb  1 10:35:17 2010
New Revision: 905239

URL: http://svn.apache.org/viewvc?rev=905239&view=rev
Log:
Port r824595 to 2.x branch - 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/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfRun.java
      - copied, changed from r905157, 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfTest.java
Removed:
    
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfTest.java
Modified:
    
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/SerializationUtilsTest.java

Copied: 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfRun.java
 (from r905157, 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfTest.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfRun.java?p2=commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfRun.java&p1=commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfTest.java&r1=905157&r2=905239&rev=905239&view=diff
==============================================================================
--- 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfTest.java
 (original)
+++ 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/CharUtilsPerfRun.java
 Mon Feb  1 10:35:17 2010
@@ -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/branches/LANG_2_X/src/test/java/org/apache/commons/lang/SerializationUtilsTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/SerializationUtilsTest.java?rev=905239&r1=905238&r2=905239&view=diff
==============================================================================
--- 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/SerializationUtilsTest.java
 (original)
+++ 
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/SerializationUtilsTest.java
 Mon Feb  1 10:35:17 2010
@@ -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;
@@ -247,7 +247,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();
 
@@ -385,10 +385,10 @@
 
 }
 
-class ClassNotFoundSerializationTest implements Serializable
+class ClassNotFoundSerialization implements Serializable
 {
 
-    private void readObject(ObjectInputStream in) throws IOException, 
ClassNotFoundException    {
+    private void readObject(ObjectInputStream in) throws 
ClassNotFoundException    {
         throw new 
ClassNotFoundException(SerializationUtilsTest.CLASS_NOT_FOUND_MESSAGE);
     }
-}
\ No newline at end of file
+}


Reply via email to