Fixed broken unit tests. JUnit was trying to execute OurTestClass.java as a test.

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

Author: adrian-crum

…mmons/io/serialization/OurTestClass.java …o/serialization/MockSerializedClass.javasrc/test/java/org/apache/commons/io/serialization/OurTestClass.java renamed to src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java src/test/java/org/apache/commons/io/serialization/OurTestClass.java renamed to src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java

@@ -20,12 +20,12 @@
 
 import java.io.Serializable;
 
-public class OurTestClass implements Serializable {
+public class MockSerializedClass implements Serializable {
     private static final long serialVersionUID = 2139985988735372175L;
 
     private final String str;
 
-    OurTestClass(String str) {
+    MockSerializedClass(String str) {
         this.str = str;
     }
 
@@ -36,9 +36,9 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if(!(obj instanceof OurTestClass)) {
+        if(!(obj instanceof MockSerializedClass)) {
             return false;
         }
-        return str.equals(((OurTestClass)obj).str);
+        return str.equals(((MockSerializedClass)obj).str);
     }
 }

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

@@ -36,7 +36,7 @@
 import org.junit.Test;
 
 public class ValidatingObjectInputStreamTest extends ClosingBase {
-    private OurTestClass testObject;
+    private MockSerializedClass testObject;
     private InputStream testStream;
 
     static private final ClassNameMatcher ALWAYS_TRUE = new ClassNameMatcher() {
@@ -48,15 +48,15 @@ public boolean matches(String className) {
 
     @Before
     public void setup() throws IOException {
-        testObject = new OurTestClass(UUID.randomUUID().toString());
+        testObject = new MockSerializedClass(UUID.randomUUID().toString());
         final ByteArrayOutputStream bos = willClose(new ByteArrayOutputStream());
         final ObjectOutputStream oos = willClose(new ObjectOutputStream(bos));
         oos.writeObject(testObject);
         testStream = willClose(new ByteArrayInputStream(bos.toByteArray()));
     }
 
     private void assertSerialization(ObjectInputStream ois) throws ClassNotFoundException, IOException {
-        final OurTestClass result = (OurTestClass) (ois.readObject());
+        final MockSerializedClass result = (MockSerializedClass) (ois.readObject());
         assertEquals(testObject, result);
     }
 
@@ -73,7 +73,7 @@ public void exceptionIncludesClassName() throws Exception {
                     willClose(new ValidatingObjectInputStream(testStream)));
             fail("Expected an InvalidClassException");
         } catch(InvalidClassException ice) {
-            final String name = OurTestClass.class.getName();
+            final String name = MockSerializedClass.class.getName();
             assertTrue("Expecting message to contain " + name, ice.getMessage().contains(name));
         }
     }
@@ -90,7 +90,7 @@ public void acceptCustomMatcher() throws Exception {
     public void rejectCustomMatcher() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(OurTestClass.class)
+                .accept(MockSerializedClass.class)
                 .reject(ALWAYS_TRUE)
         );
     }
@@ -99,15 +99,15 @@ public void rejectCustomMatcher() throws Exception {
     public void acceptPattern() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(Pattern.compile(".*OurTestClass.*"))
+                .accept(Pattern.compile(".*MockSerializedClass.*"))
         );
     }
 
     @Test(expected = InvalidClassException.class)
     public void rejectPattern() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(OurTestClass.class)
+                .accept(MockSerializedClass.class)
                 .reject(Pattern.compile("org.*"))
         );
     }
@@ -124,7 +124,7 @@ public void acceptWildcard() throws Exception {
     public void rejectWildcard() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(OurTestClass.class)
+                .accept(MockSerializedClass.class)
                 .reject("org.*")
         );
     }
@@ -141,39 +141,39 @@ public void ourTestClassNotAccepted() throws Exception {
     public void ourTestClassOnlyAccepted() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(OurTestClass.class)
+                .accept(MockSerializedClass.class)
         );
     }
 
     @Test
     public void ourTestClassAcceptedFirst() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(OurTestClass.class, Integer.class)
+                .accept(MockSerializedClass.class, Integer.class)
         );
     }
 
     @Test
     public void ourTestClassAcceptedSecond() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(Integer.class, OurTestClass.class)
+                .accept(Integer.class, MockSerializedClass.class)
         );
     }
 
     @Test
     public void ourTestClassAcceptedFirstWildcard() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept("*OurTestClass","*Integer")
+                .accept("*MockSerializedClass","*Integer")
         );
     }
 
     @Test
     public void ourTestClassAcceptedSecondWildcard() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept("*Integer","*OurTestClass")
+                .accept("*Integer","*MockSerializedClass")
         );
     }
 
@@ -182,16 +182,16 @@ public void reject() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
                 .accept(Long.class)
-                .reject(OurTestClass.class, Integer.class)
+                .reject(MockSerializedClass.class, Integer.class)
         );
     }
 
     @Test(expected = InvalidClassException.class)
     public void rejectPrecedence() throws Exception {
         assertSerialization(
                 willClose(new ValidatingObjectInputStream(testStream))
-                .accept(OurTestClass.class)
-                .reject(OurTestClass.class, Integer.class)
+                .accept(MockSerializedClass.class)
+                .reject(MockSerializedClass.class, Integer.class)
         );
     }