You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2012/07/23 18:40:50 UTC
svn commit: r1364704 -
/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/
Author: kinow
Date: Mon Jul 23 16:40:49 2012
New Revision: 1364704
URL: http://svn.apache.org/viewvc?rev=1364704&view=rev
Log:
[FUNCTOR-12] Tests for functor core comparators.
Modified:
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java Mon Jul 23 16:40:49 2012
@@ -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 @@ public class TestIsEquivalent extends Ba
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));
}
}
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java Mon Jul 23 16:40:49 2012
@@ -64,6 +64,7 @@ public class TestIsGreaterThan extends B
assertObjectsAreEqual(p,new IsGreaterThan<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsGreaterThan.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java Mon Jul 23 16:40:49 2012
@@ -64,6 +64,7 @@ public class TestIsGreaterThanOrEqual ex
assertObjectsAreEqual(p,new IsGreaterThanOrEqual<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsGreaterThanOrEqual.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java Mon Jul 23 16:40:49 2012
@@ -64,6 +64,7 @@ public class TestIsLessThan extends Base
assertObjectsAreEqual(p,new IsLessThan<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsLessThan.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java Mon Jul 23 16:40:49 2012
@@ -64,6 +64,7 @@ public class TestIsLessThanOrEqual exten
assertObjectsAreEqual(p,new IsLessThanOrEqual<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsLessThanOrEqual.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java Mon Jul 23 16:40:49 2012
@@ -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 @@ public class TestIsNotEquivalent extends
assertObjectsAreEqual(p,new IsNotEquivalent<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreEqual(p,IsNotEquivalent.instance());
assertObjectsAreNotEqual(p,Constant.FALSE);
+ assertFalse(p.equals(null));
}
}
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java Mon Jul 23 16:40:49 2012
@@ -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 @@ public class TestMax extends BaseFunctor
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));
}
}
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java?rev=1364704&r1=1364703&r2=1364704&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java Mon Jul 23 16:40:49 2012
@@ -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 @@ public class TestMin extends BaseFunctor
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));
}
}