IO-487 - include class name in InvalidClassException

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1715221 13f79535-47bb-0310-9956-ffa450edef68

Author: bdelacretaz

src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java

@@ -93,7 +93,7 @@ private void validateClassName(String name) throws InvalidClassException {
      * @throws InvalidClassException
      */
     protected void invalidClassNameFound(String className) throws InvalidClassException{
-        throw new InvalidClassException("Class name not accepted");
+        throw new InvalidClassException("Class name not accepted: " + className);
     }
 
     @Override

src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java

@@ -18,6 +18,8 @@
  */
 package org.apache.commons.io.serialization;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayInputStream;
@@ -85,6 +87,18 @@ public void noAccept() throws Exception {
                 willClose(new ValidatingObjectInputStream(testStream)));
     }
 
+    @Test
+    public void exceptionIncludesClassName() throws Exception {
+        try {
+            assertSerialization(
+                    willClose(new ValidatingObjectInputStream(testStream)));
+            fail("Expected an InvalidClassException");
+        } catch(InvalidClassException ice) {
+            final String name = OurTestClass.class.getName();
+            assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));
+        }
+    }
+
     @Test
     public void acceptCustomMatcher() throws Exception {
         assertSerialization(