FUNCTOR-29 removing Serializable from test classes
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/functor/trunk@1537907 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoUntil.java b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoUntil.java
index 52c1554..f233b34 100644
--- a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoUntil.java
+++ b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoUntil.java
@@ -18,8 +18,6 @@
import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.NullaryProcedure;
import org.apache.commons.functor.core.Offset;
@@ -51,8 +49,7 @@
// Classes
// ------------------------------------------------------------------------
- static class Counter implements NullaryProcedure, Serializable {
- private static final long serialVersionUID = 1L;
+ static class Counter implements NullaryProcedure {
public void run() {
count++;
}
diff --git a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoWhile.java b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoWhile.java
index f74dade..99e4d10 100644
--- a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoWhile.java
+++ b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestDoWhile.java
@@ -18,8 +18,6 @@
import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.NullaryProcedure;
import org.apache.commons.functor.core.Limit;
@@ -51,8 +49,7 @@
// Classes
// ------------------------------------------------------------------------
- static class Counter implements NullaryProcedure, Serializable {
- private static final long serialVersionUID = 1L;
+ static class Counter implements NullaryProcedure {
public void run() {
count++;
}
diff --git a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java
index 459961e..2c31f8e 100644
--- a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java
+++ b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java
@@ -18,7 +18,6 @@
import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -58,8 +57,7 @@
// Classes
// ------------------------------------------------------------------------
- static class Sum implements BinaryFunction<Integer, Integer, Integer>, Serializable {
- private static final long serialVersionUID = 1L;
+ static class Sum implements BinaryFunction<Integer, Integer, Integer> {
public Integer evaluate(Integer a, Integer b) {
return new Integer(a + b);
diff --git a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldRight.java b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldRight.java
index f507828..3621241 100644
--- a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldRight.java
+++ b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldRight.java
@@ -18,7 +18,6 @@
import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -58,8 +57,7 @@
// Classes
// ------------------------------------------------------------------------
- static class StringConcatenator implements BinaryFunction<Object, Object, Object>, Serializable {
- private static final long serialVersionUID = 1L;
+ static class StringConcatenator implements BinaryFunction<Object, Object, Object> {
public Object evaluate(Object left, Object right) {
StringBuilder buf = left instanceof StringBuilder ? (StringBuilder) left : new StringBuilder().append(left);
diff --git a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java
index 367dfb7..6a9f769 100644
--- a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java
+++ b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.NullaryFunction;
import org.junit.Test;
@@ -62,8 +60,7 @@
// ------------------------------------------------------------------------
/** Recursive function for test. */
- static class RecFunc implements NullaryFunction<Object>, Serializable {
- private static final long serialVersionUID = 1L;
+ static class RecFunc implements NullaryFunction<Object> {
int times = 0;
boolean returnFunc = false;
@@ -103,8 +100,7 @@
}
/** Inner function called from recursive function */
- static class InnerNullaryFunction implements NullaryFunction<Object>, Serializable {
- private static final long serialVersionUID = 1L;
+ static class InnerNullaryFunction implements NullaryFunction<Object> {
private int times;
diff --git a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestUntilDo.java b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestUntilDo.java
index 79c53d5..31e5059 100644
--- a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestUntilDo.java
+++ b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestUntilDo.java
@@ -18,8 +18,6 @@
import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.NullaryProcedure;
import org.apache.commons.functor.core.Offset;
@@ -51,8 +49,7 @@
// Classes
// ------------------------------------------------------------------------
- static class Counter implements NullaryProcedure, Serializable {
- private static final long serialVersionUID = 1L;
+ static class Counter implements NullaryProcedure {
public void run() {
count++;
}
diff --git a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestWhileDo.java b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestWhileDo.java
index 69ffdcb..fab26a4 100644
--- a/core/src/test/java/org/apache/commons/functor/core/algorithm/TestWhileDo.java
+++ b/core/src/test/java/org/apache/commons/functor/core/algorithm/TestWhileDo.java
@@ -18,8 +18,6 @@
import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.NullaryProcedure;
import org.apache.commons.functor.core.Limit;
@@ -52,8 +50,7 @@
// Classes
// ------------------------------------------------------------------------
- static class Counter implements NullaryProcedure, Serializable {
- private static final long serialVersionUID = 1L;
+ static class Counter implements NullaryProcedure {
public void run() {
count++;
}
diff --git a/core/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopNullaryProcedure.java b/core/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopNullaryProcedure.java
index d70fee3..1dd3c35 100644
--- a/core/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopNullaryProcedure.java
+++ b/core/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopNullaryProcedure.java
@@ -52,7 +52,6 @@
}
class MockLoopProcedure extends AbstractLoopNullaryProcedure {
- private static final long serialVersionUID = 1L;
public MockLoopProcedure(NullaryPredicate condition, NullaryProcedure action) {
super(condition,action);
}
diff --git a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryFunction.java b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryFunction.java
index 44fb8a7..dd1bcba 100644
--- a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryFunction.java
+++ b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryFunction.java
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.BinaryFunction;
import org.apache.commons.functor.Function;
@@ -33,8 +31,7 @@
*/
public class TestTransformedBinaryFunction extends BaseFunctorTest {
- private static class Sum implements BinaryFunction<Integer, Integer, Integer>, Serializable {
- private static final long serialVersionUID = 2255396324585938931L;
+ private static class Sum implements BinaryFunction<Integer, Integer, Integer> {
public Integer evaluate(Integer left, Integer right) {
return left+right;
}
@@ -48,8 +45,7 @@
}
}
- private static class AddOne implements Function<Integer, Integer>, Serializable {
- private static final long serialVersionUID = 8759620198239402369L;
+ private static class AddOne implements Function<Integer, Integer> {
public Integer evaluate(Integer obj) {
return obj + 1;
}
diff --git a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryProcedure.java b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryProcedure.java
index c662c6c..9f022f1 100644
--- a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryProcedure.java
+++ b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedBinaryProcedure.java
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.BinaryFunction;
import org.apache.commons.functor.Procedure;
@@ -33,8 +31,7 @@
*/
public class TestTransformedBinaryProcedure extends BaseFunctorTest {
- private static class Sum implements BinaryFunction<Integer, Integer, Integer>, Serializable {
- private static final long serialVersionUID = 2255396324585938931L;
+ private static class Sum implements BinaryFunction<Integer, Integer, Integer> {
public Integer evaluate(Integer left, Integer right) {
return left+right;
}
@@ -48,8 +45,7 @@
}
}
- private static class Total implements Procedure<Integer>, Serializable {
- private static final long serialVersionUID = 8532164308852418241L;
+ private static class Total implements Procedure<Integer> {
private int total = 0;
public void run(Integer obj) {
total += obj;
diff --git a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryFunction.java b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryFunction.java
index 92dcf1a..dc66166 100644
--- a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryFunction.java
+++ b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryFunction.java
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.NullaryFunction;
import org.apache.commons.functor.Function;
@@ -32,8 +30,7 @@
*/
public class TestTransformedNullaryFunction extends BaseFunctorTest {
- private static class One implements NullaryFunction<Integer>, Serializable {
- private static final long serialVersionUID = 8160546546365936087L;
+ private static class One implements NullaryFunction<Integer> {
public Integer evaluate() {
return new Integer(1);
}
@@ -47,8 +44,7 @@
}
};
- private static class AddOne implements Function<Integer, Integer>, Serializable {
- private static final long serialVersionUID = 2005155787293129721L;
+ private static class AddOne implements Function<Integer, Integer> {
public Integer evaluate(Integer obj) {
return obj + 1;
}
diff --git a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryProcedure.java b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryProcedure.java
index 8e5a58e..8e26408 100644
--- a/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryProcedure.java
+++ b/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryProcedure.java
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.Serializable;
-
import org.apache.commons.functor.BaseFunctorTest;
import org.apache.commons.functor.NullaryFunction;
import org.apache.commons.functor.Procedure;
@@ -32,8 +30,7 @@
*/
public class TestTransformedNullaryProcedure extends BaseFunctorTest{
- private static class One implements NullaryFunction<Integer>, Serializable {
- private static final long serialVersionUID = 7385852113529459456L;
+ private static class One implements NullaryFunction<Integer> {
public Integer evaluate() {
return new Integer(1);
}
@@ -47,8 +44,7 @@
}
};
- private static class AggregatorProcedure implements Procedure<Integer>, Serializable {
- private static final long serialVersionUID = -2744193737701268327L;
+ private static class AggregatorProcedure implements Procedure<Integer> {
private int total = 0;
public void run(Integer obj) {
total += obj;
