Skip to content
Permalink
Browse files

[COLLECTIONS-580] Remove serialization tests for classes which are no…

…t serializable anymore.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1714318 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
netomi committed Nov 14, 2015
1 parent e585cd0 commit da1a5fe00d79e1840b7e52317933e9eb56e88246
@@ -16,14 +16,14 @@
*/
package org.apache.commons.collections4;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.NotSerializableException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Date;
import java.util.TimeZone;
@@ -106,15 +106,6 @@ public void testPrototypeFactoryPublicCloneMethod() throws Exception {
final Date created = factory.create();
assertTrue(proto != created);
assertEquals(proto, created);

// check serialisation works
final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
final ObjectOutputStream out = new ObjectOutputStream(buffer);
out.writeObject(factory);
out.close();
final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(buffer.toByteArray()));
in.readObject();
in.close();
}

@Test
@@ -125,23 +116,6 @@ public void testPrototypeFactoryPublicCopyConstructor() throws Exception {
final Object created = factory.create();
assertTrue(proto != created);
assertEquals(proto, created);

// check serialisation works
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(buffer);
try {
out.writeObject(factory);
} catch (final NotSerializableException ex) {
out.close();
}
factory = FactoryUtils.<Object>prototypeFactory(new Mock2("S"));
buffer = new ByteArrayOutputStream();
out = new ObjectOutputStream(buffer);
out.writeObject(factory);
out.close();
final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(buffer.toByteArray()));
in.readObject();
in.close();
}

@Test
@@ -152,15 +126,6 @@ public void testPrototypeFactoryPublicSerialization() throws Exception {
final Integer created = factory.create();
assertTrue(proto != created);
assertEquals(proto, created);

// check serialisation works
final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
final ObjectOutputStream out = new ObjectOutputStream(buffer);
out.writeObject(factory);
out.close();
final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(buffer.toByteArray()));
in.readObject();
in.close();
}

@Test
@@ -16,7 +16,10 @@
*/
package org.apache.commons.collections4;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;

import java.util.ArrayList;
import java.util.Collection;
@@ -26,7 +29,6 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.collections4.functors.CloneTransformer;
import org.apache.commons.collections4.functors.ConstantTransformer;
import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.collections4.functors.ExceptionTransformer;
@@ -247,6 +249,7 @@ public void testIfTransformer() {
assertEquals("B", TransformerUtils.ifTransformer(FalsePredicate.falsePredicate(), a, b).transform(null));

Predicate<Integer> lessThanFivePredicate = new Predicate<Integer>() {
@Override
public boolean evaluate(Integer value) {
return value < 5;
}
@@ -481,7 +484,6 @@ public void testInstantiateTransformerNull() {
@Test
public void testSingletonPatternInSerialization() {
final Object[] singletones = new Object[] {
CloneTransformer.INSTANCE,
ExceptionTransformer.INSTANCE,
NOPTransformer.INSTANCE,
StringValueTransformer.stringValueTransformer(),

0 comments on commit da1a5fe

Please sign in to comment.
You can’t perform that action at this time.