[FUNCTOR-12] Tests for functor core comparators.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/functor/trunk@1364704 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java b/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
index 5ca3d2f..9f04b18 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
@@ -17,6 +17,7 @@
package org.apache.commons.functor.core.comparator;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.commons.functor.core.Constant;
@@ -59,9 +60,10 @@
IsEquivalent<Comparable<?>> p = IsEquivalent.INSTANCE;
assertEquals(p,p);
- assertObjectsAreEqual(p,IsEquivalent.instance());
+ assertObjectsAreEqual(p,new IsEquivalent<Comparable<?>>());
assertObjectsAreEqual(p,new IsEquivalent<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java b/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java
index 2b7e059..7d67958 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java
@@ -64,6 +64,7 @@
assertObjectsAreEqual(p,new IsGreaterThan<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsGreaterThan.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java b/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java
index 2a7be35..3e1ef6a 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java
@@ -64,6 +64,7 @@
assertObjectsAreEqual(p,new IsGreaterThanOrEqual<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsGreaterThanOrEqual.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java b/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java
index 64cce4f..ff0dfe8 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java
@@ -64,6 +64,7 @@
assertObjectsAreEqual(p,new IsLessThan<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsLessThan.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java b/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
index 2403f11..1e47a38 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
@@ -64,6 +64,7 @@
assertObjectsAreEqual(p,new IsLessThanOrEqual<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsLessThanOrEqual.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java b/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
index 8b98c1f..fdf011a 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
@@ -17,6 +17,7 @@
package org.apache.commons.functor.core.comparator;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.commons.functor.core.Constant;
@@ -62,6 +63,7 @@
assertObjectsAreEqual(p,new IsNotEquivalent<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsNotEquivalent.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java b/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java
index 9fd8022..2d7c414 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java
@@ -17,10 +17,12 @@
package org.apache.commons.functor.core.comparator;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import java.util.Collections;
import org.apache.commons.functor.BaseFunctorTest;
+import org.apache.commons.functor.UnaryFunction;
import org.junit.Test;
/**
@@ -62,5 +64,12 @@
assertObjectsAreEqual(f,Max.instance());
assertObjectsAreEqual(f,new Max<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreNotEqual(f,new Max<Comparable<?>>(Collections.<Comparable<?>>reverseOrder()));
+ assertFalse(f.equals(null));
+ }
+
+ @Test
+ public void testUnaryFunctionMin() {
+ UnaryFunction<Integer, Integer> unaryMax = Max.instance(ONE);
+ assertEquals(ONE,unaryMax.evaluate(ZERO));
}
}
diff --git a/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java b/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java
index e9f4815..5cc8c1c 100644
--- a/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java
+++ b/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java
@@ -17,10 +17,12 @@
package org.apache.commons.functor.core.comparator;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import java.util.Collections;
import org.apache.commons.functor.BaseFunctorTest;
+import org.apache.commons.functor.UnaryFunction;
import org.junit.Test;
/**
@@ -62,5 +64,12 @@
assertObjectsAreEqual(f,Min.instance());
assertObjectsAreEqual(f,new Min<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreNotEqual(f,new Min<Comparable<?>>(Collections.<Comparable<?>>reverseOrder()));
+ assertFalse(f.equals(null));
+ }
+
+ @Test
+ public void testUnaryFunctionMin() {
+ UnaryFunction<Integer, Integer> unaryMin = Min.instance(ONE);
+ assertEquals(ZERO,unaryMin.evaluate(ZERO));
}
}
