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/25 00:19:24 UTC
svn commit: r1365328 - in /commons/proper/functor/trunk/src:
main/java/org/apache/commons/functor/core/comparator/
test/java/org/apache/commons/functor/core/comparator/
Author: kinow
Date: Tue Jul 24 22:19:23 2012
New Revision: 1365328
URL: http://svn.apache.org/viewvc?rev=1365328&view=rev
Log:
[FUNCTOR-12] Added more tests to core comparator classes. Also removed unreachable code, as it could not be tested and was immutable and created/validated during construction.
Modified:
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java
commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java?rev=1365328&r1=1365327&r2=1365328&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java (original)
+++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java Tue Jul 24 22:19:23 2012
@@ -97,9 +97,6 @@ public final class IsEquivalent<T> imple
*/
public boolean equals(IsEquivalent<?> that) {
if (null != that) {
- if (null == comparator) {
- return null == that.comparator;
- }
return comparator.equals(that.comparator);
}
return false;
Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java?rev=1365328&r1=1365327&r2=1365328&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java (original)
+++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java Tue Jul 24 22:19:23 2012
@@ -97,9 +97,6 @@ public final class IsGreaterThan<T> impl
*/
public boolean equals(IsGreaterThan<?> that) {
if (null != that) {
- if (null == comparator) {
- return null == that.comparator;
- }
return comparator.equals(that.comparator);
}
return false;
Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java?rev=1365328&r1=1365327&r2=1365328&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java (original)
+++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java Tue Jul 24 22:19:23 2012
@@ -98,9 +98,6 @@ public final class IsGreaterThanOrEqual<
*/
public boolean equals(IsGreaterThanOrEqual<?> that) {
if (null != that) {
- if (null == comparator) {
- return null == that.comparator;
- }
return comparator.equals(that.comparator);
}
return false;
Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java?rev=1365328&r1=1365327&r2=1365328&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java (original)
+++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java Tue Jul 24 22:19:23 2012
@@ -97,9 +97,6 @@ public final class IsLessThan<T> impleme
*/
public boolean equals(IsLessThan<?> that) {
if (null != that) {
- if (null == comparator) {
- return null == that.comparator;
- }
return comparator.equals(that.comparator);
}
return false;
Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java?rev=1365328&r1=1365327&r2=1365328&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java (original)
+++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java Tue Jul 24 22:19:23 2012
@@ -97,9 +97,6 @@ public final class IsLessThanOrEqual<T>
*/
public boolean equals(IsLessThanOrEqual<?> that) {
if (null != that) {
- if (null == comparator) {
- return null == that.comparator;
- }
return comparator.equals(that.comparator);
}
return false;
Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java?rev=1365328&r1=1365327&r2=1365328&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java (original)
+++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java Tue Jul 24 22:19:23 2012
@@ -97,9 +97,6 @@ public final class IsNotEquivalent<T> im
*/
public boolean equals(IsNotEquivalent<?> that) {
if (null != that) {
- if (null == comparator) {
- return null == that.comparator;
- }
return comparator.equals(that.comparator);
}
return false;
Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java?rev=1365328&r1=1365327&r2=1365328&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java (original)
+++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java Tue Jul 24 22:19:23 2012
@@ -80,5 +80,6 @@ public class TestComparatorFunction exte
assertObjectsAreEqual(f,f);
assertObjectsAreEqual(f,new ComparatorFunction<Integer>(ComparableComparator.<Integer>instance()));
assertObjectsAreNotEqual(f,new ComparatorFunction<Boolean>(Collections.reverseOrder()));
+ assertTrue(!f.equals(null));
}
}
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=1365328&r1=1365327&r2=1365328&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 Tue Jul 24 22:19:23 2012
@@ -57,7 +57,7 @@ public class TestIsEquivalent extends Ba
@Test
public void testEquals() throws Exception {
- IsEquivalent<Comparable<?>> p = IsEquivalent.INSTANCE;
+ IsEquivalent<Comparable<Integer>> p = IsEquivalent.instance();
assertEquals(p,p);
assertObjectsAreEqual(p,new IsEquivalent<Comparable<?>>());