You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2008/04/03 22:23:31 UTC
svn commit: r644470 [5/7] - in /commons/sandbox/functor/trunk/src:
main/java/org/apache/commons/functor/
main/java/org/apache/commons/functor/adapter/
main/java/org/apache/commons/functor/core/
main/java/org/apache/commons/functor/core/collection/ main...
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java Thu Apr 3 13:23:16 2008
@@ -46,7 +46,7 @@
protected Object makeFunctor() {
return new Identity();
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -60,7 +60,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
UnaryFunction f = new Identity();
assertNull(f.evaluate(null));
@@ -69,7 +69,7 @@
Object obj = new Long(12345L);
assertSame(obj,f.evaluate(obj));
}
-
+
public void testTest() throws Exception {
UnaryPredicate p = new Identity();
assertTrue(p.test(Boolean.TRUE));
@@ -94,7 +94,7 @@
assertObjectsAreEqual(f,Identity.instance());
assertObjectsAreNotEqual(f,new Constant("abcde"));
}
-
+
public void testConstant() throws Exception {
assertEquals(Identity.instance(),Identity.instance());
assertSame(Identity.instance(),Identity.instance());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsEqual.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsEqual.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsEqual.java Thu Apr 3 13:23:16 2008
@@ -45,7 +45,7 @@
protected Object makeFunctor() {
return new IsEqual();
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -59,7 +59,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsEqual p = new IsEqual();
assertTrue("For symmetry, two nulls should be equal",p.test(null,null));
@@ -75,7 +75,7 @@
assertTrue(!p.test("3",new Integer(3)));
assertTrue(!p.test(new Integer(3),"3"));
}
-
+
public void testEquals() throws Exception {
BinaryPredicate f = new IsEqual();
assertEquals(f,f);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsInstanceOf.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsInstanceOf.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsInstanceOf.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsInstanceOf.java Thu Apr 3 13:23:16 2008
@@ -45,7 +45,7 @@
protected Object makeFunctor() {
return new IsInstanceOf(String.class);
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -59,7 +59,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
UnaryPredicate p = new IsInstanceOf(Number.class);
assertTrue(!p.test(null));
@@ -68,7 +68,7 @@
assertTrue(p.test(new Integer(3)));
assertTrue(p.test((new Long(3L))));
}
-
+
public void testInstanceOfNull() throws Exception {
UnaryPredicate p = new IsInstanceOf(null);
try {
@@ -78,7 +78,7 @@
// expected
}
}
-
+
public void testEquals() throws Exception {
UnaryPredicate p = new IsInstanceOf(Object.class);
assertEquals(p,p);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java Thu Apr 3 13:23:16 2008
@@ -45,7 +45,7 @@
protected Object makeFunctor() {
return new IsNotEqual();
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -59,7 +59,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsNotEqual p = new IsNotEqual();
assertTrue("For symmetry, two nulls should be equal",!p.test(null,null));
@@ -75,7 +75,7 @@
assertTrue(p.test("3",new Integer(3)));
assertTrue(p.test(new Integer(3),"3"));
}
-
+
public void testEquals() throws Exception {
BinaryPredicate p = new IsNotEqual();
assertEquals(p,p);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java Thu Apr 3 13:23:16 2008
@@ -45,7 +45,7 @@
protected Object makeFunctor() {
return new IsNotNull();
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -59,14 +59,14 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
UnaryPredicate p = new IsNotNull();
assertTrue(!p.test(null));
assertTrue(p.test("foo"));
assertTrue(p.test(new Integer(3)));
}
-
+
public void testEquals() throws Exception {
UnaryPredicate p = new IsNotNull();
assertEquals(p,p);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNull.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNull.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNull.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIsNull.java Thu Apr 3 13:23:16 2008
@@ -45,7 +45,7 @@
protected Object makeFunctor() {
return new IsNull();
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -59,21 +59,21 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
UnaryPredicate p = new IsNull();
assertTrue(p.test(null));
assertTrue(!p.test("foo"));
assertTrue(!p.test(new Integer(3)));
}
-
+
public void testAsBinary() throws Exception {
assertTrue( IsNull.left().test(null,"not null"));
assertTrue(!IsNull.left().test("not null",null));
assertTrue( IsNull.right().test("not null",null));
assertTrue(!IsNull.right().test(null,"not null"));
}
-
+
public void testEquals() throws Exception {
UnaryPredicate p = new IsNull();
assertEquals(p,p);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java Thu Apr 3 13:23:16 2008
@@ -46,7 +46,7 @@
protected Object makeFunctor() {
return new LeftIdentity();
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -60,7 +60,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
BinaryFunction f = new LeftIdentity();
assertNull(f.evaluate(null,null));
@@ -72,7 +72,7 @@
assertSame(obj,f.evaluate(obj,null));
assertSame(obj,f.evaluate(obj,obj));
}
-
+
public void testTest() throws Exception {
BinaryPredicate p = new LeftIdentity();
assertTrue(p.test(Boolean.TRUE,null));
@@ -90,7 +90,7 @@
// expected
}
}
-
+
public void testEquals() throws Exception {
BinaryFunction f = new LeftIdentity();
assertEquals(f,f);
@@ -100,7 +100,7 @@
assertObjectsAreNotEqual(f,new Constant("abcde"));
assertObjectsAreNotEqual(f,new Constant(true));
}
-
+
public void testConstant() throws Exception {
assertEquals(LeftIdentity.instance(),LeftIdentity.instance());
assertSame(LeftIdentity.instance(),LeftIdentity.instance());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLimit.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLimit.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLimit.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestLimit.java Thu Apr 3 13:23:16 2008
@@ -47,7 +47,7 @@
protected Object makeFunctor() {
return new Limit(3);
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -69,7 +69,7 @@
// expected
}
}
-
+
public void testTestNilary() throws Exception {
Predicate p = new Limit(3);
assertTrue(p.test());
@@ -85,7 +85,7 @@
assertTrue(p.test(null));
assertTrue(! p.test(null));
}
-
+
public void testTestBinary() throws Exception {
BinaryPredicate p = new Limit(3);
assertTrue(p.test(null,null));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestNoOp.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestNoOp.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestNoOp.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestNoOp.java Thu Apr 3 13:23:16 2008
@@ -61,7 +61,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testRun() throws Exception {
NoOp p = new NoOp();
p.run();
@@ -70,9 +70,9 @@
p.run("foo");
p.run("foo",null);
p.run(null,"bar");
- p.run("foo","bar");
+ p.run("foo","bar");
}
-
+
public void testEquals() throws Exception {
NoOp p = new NoOp();
assertEquals(p,p);
@@ -82,7 +82,7 @@
assertObjectsAreNotEqual(p,new UnaryProcedure() { public void run(Object a) { } });
assertObjectsAreNotEqual(p,new BinaryProcedure() { public void run(Object a, Object b) { } });
}
-
+
public void testConstant() throws Exception {
assertEquals(NoOp.instance(),NoOp.instance());
assertSame(NoOp.instance(),NoOp.instance());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestOffset.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestOffset.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestOffset.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestOffset.java Thu Apr 3 13:23:16 2008
@@ -47,7 +47,7 @@
protected Object makeFunctor() {
return new Offset(3);
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -69,7 +69,7 @@
// expected
}
}
-
+
public void testTestNilary() throws Exception {
Predicate p = new Offset(3);
assertTrue(!p.test());
@@ -85,7 +85,7 @@
assertTrue(!p.test(null));
assertTrue(p.test(null));
}
-
+
public void testTestBinary() throws Exception {
BinaryPredicate p = new Offset(3);
assertTrue(!p.test(null,null));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java Thu Apr 3 13:23:16 2008
@@ -46,7 +46,7 @@
protected Object makeFunctor() {
return new RightIdentity();
}
-
+
// Lifecycle
// ------------------------------------------------------------------------
@@ -60,7 +60,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
BinaryFunction f = new RightIdentity();
assertNull(f.evaluate(null,null));
@@ -72,7 +72,7 @@
assertSame(obj,f.evaluate(null,obj));
assertSame(obj,f.evaluate(obj,obj));
}
-
+
public void testTest() throws Exception {
BinaryPredicate p = new RightIdentity();
assertTrue(p.test(null,Boolean.TRUE));
@@ -90,7 +90,7 @@
// expected
}
}
-
+
public void testEquals() throws Exception {
BinaryFunction f = new RightIdentity();
assertEquals(f,f);
@@ -101,7 +101,7 @@
assertObjectsAreNotEqual(f,new Constant(true));
assertObjectsAreNotEqual(f,new Constant("abcde"));
}
-
+
public void testConstant() throws Exception {
assertEquals(RightIdentity.instance(),RightIdentity.instance());
assertSame(RightIdentity.instance(),RightIdentity.instance());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestAll.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestAll.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestAll.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestAll.java Thu Apr 3 13:23:16 2008
@@ -31,13 +31,13 @@
public static Test suite() {
TestSuite suite = new TestSuite();
-
+
suite.addTest(TestFilteredIterator.suite());
suite.addTest(TestTransformedIterator.suite());
suite.addTest(TestIsEmpty.suite());
suite.addTest(TestIsElementOf.suite());
suite.addTest(TestSize.suite());
-
+
return suite;
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java Thu Apr 3 13:23:16 2008
@@ -48,7 +48,7 @@
public Object makeFunctor() {
List list = new ArrayList();
- list.add("xyzzy");
+ list.add("xyzzy");
return FilteredIterator.filter(list.iterator(),Constant.truePredicate());
}
@@ -75,7 +75,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testSomePass() {
Iterator expected = evens.iterator();
Iterator testing = new FilteredIterator(list.iterator(),isEven);
@@ -148,7 +148,7 @@
// expected
}
}
-
+
public void testRemoveBeforeNext() {
Iterator testing = new FilteredIterator(list.iterator(),isEven);
try {
@@ -158,7 +158,7 @@
// expected
}
}
-
+
public void testRemoveAfterNext() {
Iterator testing = new FilteredIterator(list.iterator(),isEven);
testing.next();
@@ -170,7 +170,7 @@
// expected
}
}
-
+
public void testRemoveSome() {
Iterator testing = new FilteredIterator(list.iterator(),isEven);
while(testing.hasNext()) {
@@ -199,11 +199,11 @@
}
assertTrue(list.isEmpty());
}
-
+
public void testFilterWithNullIteratorReturnsNull() {
assertNull(FilteredIterator.filter(null,Constant.truePredicate()));
}
-
+
public void testFilterWithNullPredicateReturnsIdentity() {
Iterator iter = list.iterator();
assertSame(iter,FilteredIterator.filter(iter,null));
@@ -229,16 +229,16 @@
// expected
}
}
-
+
// Attributes
// ------------------------------------------------------------------------
- private List list = null;
+ private List list = null;
private List evens = null;
- private UnaryPredicate isEven = new UnaryPredicate() {
+ private UnaryPredicate isEven = new UnaryPredicate() {
public boolean test(Object obj) {
return ((Number)obj).intValue() % 2 == 0;
}
};
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java Thu Apr 3 13:23:16 2008
@@ -69,7 +69,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
assertTrue(IsEmpty.instance().test(Collections.EMPTY_LIST));
assertTrue(IsEmpty.instance().test(Collections.EMPTY_SET));
@@ -95,7 +95,7 @@
// expected
}
}
-
+
public void testTestNonCollection() throws Exception {
try {
IsEmpty.instance().test(new Integer(3));
@@ -104,7 +104,7 @@
// expected
}
}
-
+
public void testTestArray() throws Exception {
assertTrue(! IsEmpty.instance().test(new int[10]));
assertTrue(! IsEmpty.instance().test(new Object[10]));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java Thu Apr 3 13:23:16 2008
@@ -66,7 +66,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
assertEquals(new Integer(0),Size.instance().evaluate(Collections.EMPTY_LIST));
assertEquals(new Integer(0),Size.instance().evaluate(Collections.EMPTY_SET));
@@ -74,18 +74,18 @@
List list = new ArrayList();
assertEquals(new Integer(0),Size.instance().evaluate(list));
for(int i=0;i<2;i++) {
- assertEquals(new Integer(i),Size.instance().evaluate(list));
+ assertEquals(new Integer(i),Size.instance().evaluate(list));
list.add(new Integer(i));
- assertEquals(new Integer(i+1),Size.instance().evaluate(list));
+ assertEquals(new Integer(i+1),Size.instance().evaluate(list));
}
}
{
Set set = new HashSet();
assertEquals(new Integer(0),Size.instance().evaluate(set));
for(int i=0;i<2;i++) {
- assertEquals(new Integer(i),Size.instance().evaluate(set));
+ assertEquals(new Integer(i),Size.instance().evaluate(set));
set.add(new Integer(i));
- assertEquals(new Integer(i+1),Size.instance().evaluate(set));
+ assertEquals(new Integer(i+1),Size.instance().evaluate(set));
}
}
}
@@ -98,7 +98,7 @@
// expected
}
}
-
+
public void testEvaluateNonCollection() throws Exception {
try {
Size.instance().evaluate(new Integer(3));
@@ -107,7 +107,7 @@
// expected
}
}
-
+
public void testEvaluateArray() throws Exception {
assertEquals(new Integer(10),Size.instance().evaluate(new int[10]));
assertEquals(new Integer(7),Size.instance().evaluate(new String[7]));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java Thu Apr 3 13:23:16 2008
@@ -45,10 +45,10 @@
public static Test suite() {
return new TestSuite(TestTransformedIterator.class);
}
-
+
public Object makeFunctor() {
List list = new ArrayList();
- list.add("xyzzy");
+ list.add("xyzzy");
return TransformedIterator.transform(list.iterator(),Identity.instance());
}
@@ -73,7 +73,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testBasicTransform() {
Iterator expected = negatives.iterator();
Iterator testing = new TransformedIterator(list.iterator(),negate);
@@ -121,7 +121,7 @@
// expected
}
}
-
+
public void testRemoveBeforeNext() {
Iterator testing = new TransformedIterator(list.iterator(),negate);
try {
@@ -131,7 +131,7 @@
// expected
}
}
-
+
public void testRemoveAfterNext() {
Iterator testing = new TransformedIterator(list.iterator(),negate);
testing.next();
@@ -143,7 +143,7 @@
// expected
}
}
-
+
public void testRemoveAll() {
Iterator testing = new TransformedIterator(list.iterator(),negate);
while(testing.hasNext()) {
@@ -161,11 +161,11 @@
}
assertTrue(list.isEmpty());
}
-
+
public void testTransformWithNullIteratorReturnsNull() {
assertNull(TransformedIterator.transform(null,negate));
}
-
+
public void testTransformWithNullPredicateReturnsIdentity() {
Iterator iter = list.iterator();
assertSame(iter,TransformedIterator.transform(iter,null));
@@ -191,16 +191,16 @@
// expected
}
}
-
+
// Attributes
// ------------------------------------------------------------------------
- private List list = null;
+ private List list = null;
private List negatives = null;
- private UnaryFunction negate = new UnaryFunction() {
+ private UnaryFunction negate = new UnaryFunction() {
public Object evaluate(Object obj) {
return new Integer(((Number)obj).intValue() * -1);
}
};
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/BaseComparisonPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/BaseComparisonPredicateTest.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/BaseComparisonPredicateTest.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/BaseComparisonPredicateTest.java Thu Apr 3 13:23:16 2008
@@ -45,7 +45,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public final void testTestNull() throws Exception {
BinaryPredicate p = (BinaryPredicate)(makeFunctor());
try {
@@ -67,7 +67,7 @@
// expected
}
}
-
+
public final void testTestNonComparable() throws Exception {
BinaryPredicate p = (BinaryPredicate)(makeFunctor());
try {
@@ -89,5 +89,5 @@
// expected
}
}
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestAll.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestAll.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestAll.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestAll.java Thu Apr 3 13:23:16 2008
@@ -31,9 +31,9 @@
public static Test suite() {
TestSuite suite = new TestSuite();
-
+
suite.addTest(TestComparableComparator.suite());
- suite.addTest(TestComparatorFunction.suite());
+ suite.addTest(TestComparatorFunction.suite());
suite.addTest(TestIsLessThan.suite());
suite.addTest(TestIsLessThanOrEqual.suite());
suite.addTest(TestIsEquivalent.suite());
@@ -43,7 +43,7 @@
suite.addTest(TestIsWithinRange.suite());
suite.addTest(TestMax.suite());
suite.addTest(TestMin.suite());
-
+
return suite;
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparableComparator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparableComparator.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparableComparator.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparableComparator.java Thu Apr 3 13:23:16 2008
@@ -50,7 +50,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testCompareIntegers() {
assertTrue(ComparableComparator.instance().compare(new Integer(Integer.MIN_VALUE),new Integer(Integer.MIN_VALUE)) == 0);
assertTrue(ComparableComparator.instance().compare(new Integer(-1),new Integer(-1)) == 0);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java Thu Apr 3 13:23:16 2008
@@ -42,14 +42,14 @@
// Framework
// ------------------------------------------------------------------------
-
+
protected Object makeFunctor() {
return new ComparatorFunction(new ComparableComparator());
}
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() {
ComparatorFunction f = new ComparatorFunction();
@@ -64,13 +64,13 @@
assertTrue(((Integer)(f.evaluate(new Integer(1),new Integer(0)))).intValue() > 0);
assertTrue(((Integer)(f.evaluate(new Integer(1),new Integer(-1)))).intValue() > 0);
assertTrue(((Integer)(f.evaluate(new Integer(1),new Integer(Integer.MIN_VALUE)))).intValue() > 0);
-
+
assertTrue(((Integer)(f.evaluate(new Integer(0),new Integer(Integer.MAX_VALUE)))).intValue() < 0);
assertTrue(((Integer)(f.evaluate(new Integer(0),new Integer(1)))).intValue() < 0);
assertTrue(((Integer)(f.evaluate(new Integer(0),new Integer(0)))).intValue() == 0);
assertTrue(((Integer)(f.evaluate(new Integer(0),new Integer(-1)))).intValue() > 0);
assertTrue(((Integer)(f.evaluate(new Integer(0),new Integer(Integer.MIN_VALUE)))).intValue() > 0);
-
+
assertTrue(((Integer)(f.evaluate(new Integer(-1),new Integer(Integer.MAX_VALUE)))).intValue() < 0);
assertTrue(((Integer)(f.evaluate(new Integer(-1),new Integer(1)))).intValue() < 0);
assertTrue(((Integer)(f.evaluate(new Integer(-1),new Integer(0)))).intValue() < 0);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java Thu Apr 3 13:23:16 2008
@@ -58,7 +58,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsEquivalent p = new IsEquivalent();
assertTrue(!p.test(new Integer(2),new Integer(4)));
@@ -67,12 +67,12 @@
assertTrue(!p.test(new Integer(5),new Integer(4)));
assertTrue(!p.test(new Integer(6),new Integer(4)));
}
-
+
public void testInstance() {
assertTrue(IsEquivalent.instance("Xyzzy").test("Xyzzy"));
assertTrue(!IsEquivalent.instance("Xyzzy").test("z"));
}
-
+
public void testEquals() throws Exception {
IsEquivalent p = new IsEquivalent();
assertEquals(p,p);
@@ -84,5 +84,5 @@
assertSame(IsEquivalent.instance(),IsEquivalent.instance());
assertObjectsAreNotEqual(p,new Constant(false));
}
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java Thu Apr 3 13:23:16 2008
@@ -58,7 +58,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsGreaterThan p = new IsGreaterThan();
assertTrue(!p.test(new Integer(2),new Integer(4)));
@@ -67,12 +67,12 @@
assertTrue(p.test(new Integer(5),new Integer(4)));
assertTrue(p.test(new Integer(6),new Integer(4)));
}
-
+
public void testInstance() {
assertTrue(IsGreaterThan.instance(new Integer(7)).test(new Integer(8)));
assertTrue(! IsGreaterThan.instance(new Integer(7)).test(new Integer(6)));
}
-
+
public void testEquals() throws Exception {
IsGreaterThan p = new IsGreaterThan();
assertEquals(p,p);
@@ -84,5 +84,5 @@
assertSame(IsGreaterThan.instance(),IsGreaterThan.instance());
assertObjectsAreNotEqual(p,new Constant(false));
}
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java Thu Apr 3 13:23:16 2008
@@ -58,7 +58,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsGreaterThanOrEqual p = new IsGreaterThanOrEqual();
assertTrue(!p.test(new Integer(2),new Integer(4)));
@@ -67,7 +67,7 @@
assertTrue(p.test(new Integer(5),new Integer(4)));
assertTrue(p.test(new Integer(6),new Integer(4)));
}
-
+
public void testInstance() {
assertTrue(IsGreaterThanOrEqual.instance(new Integer(7)).test(new Integer(8)));
assertTrue(! IsGreaterThanOrEqual.instance(new Integer(7)).test(new Integer(6)));
@@ -84,5 +84,5 @@
assertSame(IsGreaterThanOrEqual.instance(),IsGreaterThanOrEqual.instance());
assertObjectsAreNotEqual(p,new Constant(false));
}
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java Thu Apr 3 13:23:16 2008
@@ -58,7 +58,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsLessThan p = new IsLessThan();
assertTrue(p.test(new Integer(2),new Integer(4)));
@@ -67,12 +67,12 @@
assertTrue(!p.test(new Integer(5),new Integer(4)));
assertTrue(!p.test(new Integer(6),new Integer(4)));
}
-
+
public void testInstance() {
assertTrue(! IsLessThan.instance(new Integer(7)).test(new Integer(8)));
assertTrue(IsLessThan.instance(new Integer(7)).test(new Integer(6)));
}
-
+
public void testEquals() throws Exception {
IsLessThan p = new IsLessThan();
assertEquals(p,p);
@@ -84,5 +84,5 @@
assertSame(IsLessThan.instance(),IsLessThan.instance());
assertObjectsAreNotEqual(p,new Constant(false));
}
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java Thu Apr 3 13:23:16 2008
@@ -58,7 +58,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsLessThanOrEqual p = new IsLessThanOrEqual();
assertTrue(p.test(new Integer(2),new Integer(4)));
@@ -67,12 +67,12 @@
assertTrue(!p.test(new Integer(5),new Integer(4)));
assertTrue(!p.test(new Integer(6),new Integer(4)));
}
-
+
public void testInstance() {
assertTrue(! IsLessThanOrEqual.instance(new Integer(7)).test(new Integer(8)));
assertTrue(IsLessThanOrEqual.instance(new Integer(7)).test(new Integer(6)));
}
-
+
public void testEquals() throws Exception {
IsLessThanOrEqual p = new IsLessThanOrEqual();
assertEquals(p,p);
@@ -84,5 +84,5 @@
assertSame(IsLessThanOrEqual.instance(),IsLessThanOrEqual.instance());
assertObjectsAreNotEqual(p,new Constant(false));
}
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java Thu Apr 3 13:23:16 2008
@@ -58,7 +58,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
IsNotEquivalent p = new IsNotEquivalent();
assertTrue(p.test(new Integer(2),new Integer(4)));
@@ -67,12 +67,12 @@
assertTrue(p.test(new Integer(5),new Integer(4)));
assertTrue(p.test(new Integer(6),new Integer(4)));
}
-
+
public void testInstance() {
assertTrue(! IsNotEquivalent.instance(new Integer(7)).test(new Integer(7)));
assertTrue(IsNotEquivalent.instance(new Integer(7)).test(new Integer(8)));
}
-
+
public void testEquals() throws Exception {
IsNotEquivalent p = new IsNotEquivalent();
assertEquals(p,p);
@@ -84,5 +84,5 @@
assertSame(IsNotEquivalent.instance(),IsNotEquivalent.instance());
assertObjectsAreNotEqual(p,new Constant(false));
}
-
+
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java Thu Apr 3 13:23:16 2008
@@ -42,19 +42,19 @@
// Framework
// ------------------------------------------------------------------------
-
+
protected Object makeFunctor() {
return new Max();
}
- private Integer MIN = new Integer(Integer.MIN_VALUE);
- private Integer MINUS_TWO = new Integer(-2);
- private Integer ZERO = new Integer(0);
- private Integer ONE = new Integer(1);
- private Integer MAX = new Integer(Integer.MAX_VALUE);
+ private Integer MIN = new Integer(Integer.MIN_VALUE);
+ private Integer MINUS_TWO = new Integer(-2);
+ private Integer ZERO = new Integer(0);
+ private Integer ONE = new Integer(1);
+ private Integer MAX = new Integer(Integer.MAX_VALUE);
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() {
Max f = new Max();
assertEquals(ONE,f.evaluate(ONE,ONE));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java Thu Apr 3 13:23:16 2008
@@ -42,19 +42,19 @@
// Framework
// ------------------------------------------------------------------------
-
+
protected Object makeFunctor() {
return new Min();
}
- private Integer MIN = new Integer(Integer.MIN_VALUE);
- private Integer MINUS_TWO = new Integer(-2);
- private Integer ZERO = new Integer(0);
- private Integer ONE = new Integer(1);
- private Integer MAX = new Integer(Integer.MAX_VALUE);
+ private Integer MIN = new Integer(Integer.MIN_VALUE);
+ private Integer MINUS_TWO = new Integer(-2);
+ private Integer ZERO = new Integer(0);
+ private Integer ONE = new Integer(1);
+ private Integer MAX = new Integer(Integer.MAX_VALUE);
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() {
Min f = new Min();
assertEquals(ONE,f.evaluate(ONE,ONE));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopProcedure.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAbstractLoopProcedure.java Thu Apr 3 13:23:16 2008
@@ -65,7 +65,7 @@
public MockLoopProcedure(Predicate condition, Procedure action) {
super(condition,action);
}
-
+
public void run() {
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAll.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAll.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAll.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAll.java Thu Apr 3 13:23:16 2008
@@ -39,7 +39,7 @@
suite.addTest(TestOr.suite());
suite.addTest(TestUnaryOr.suite());
suite.addTest(TestBinaryOr.suite());
-
+
suite.addTest(TestNot.suite());
suite.addTest(TestUnaryNot.suite());
suite.addTest(TestBinaryNot.suite());
@@ -49,7 +49,7 @@
suite.addTest(TestBinarySequence.suite());
suite.addTest(TestComposite.suite());
-
+
suite.addTest(TestCompositeUnaryFunction.suite());
suite.addTest(TestCompositeUnaryPredicate.suite());
suite.addTest(TestCompositeUnaryProcedure.suite());
@@ -74,11 +74,11 @@
suite.addTest(TestConditionalProcedure.suite());
suite.addTest(TestConditionalUnaryProcedure.suite());
suite.addTest(TestConditionalBinaryProcedure.suite());
-
+
suite.addTest(TestAbstractLoopProcedure.suite());
suite.addTest(TestWhileDoProcedure.suite());
suite.addTest(TestDoWhileProcedure.suite());
-
+
return suite;
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java Thu Apr 3 13:23:16 2008
@@ -60,64 +60,64 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTrue() throws Exception {
assertTrue((new And()).test());
assertTrue((new And(new Constant(true))).test());
assertTrue((new And(new Constant(true),new Constant(true))).test());
assertTrue((new And(new Constant(true),new Constant(true),new Constant(true))).test());
-
+
And p = new And(new Constant(true));
- assertTrue(p.test());
+ assertTrue(p.test());
for(int i=0;i<10;i++) {
p.and(new Constant(true));
- assertTrue(p.test());
+ assertTrue(p.test());
}
-
+
And q = new And(new Constant(true));
- assertTrue(q.test());
+ assertTrue(q.test());
for(int i=0;i<10;i++) {
q.and(new Constant(true));
- assertTrue(q.test());
+ assertTrue(q.test());
}
-
+
And r = new And(p,q);
- assertTrue(r.test());
+ assertTrue(r.test());
}
-
+
public void testFalse() throws Exception {
assertTrue(!(new And(new Constant(false))).test());
assertTrue(!(new And(new Constant(true),new Constant(false))).test());
assertTrue(!(new And(new Constant(true),new Constant(true),new Constant(false))).test());
-
+
And p = new And(new Constant(false));
- assertTrue(!p.test());
+ assertTrue(!p.test());
for(int i=0;i<10;i++) {
p.and(new Constant(false));
- assertTrue(!p.test());
+ assertTrue(!p.test());
}
-
+
And q = new And(new Constant(true));
- assertTrue(q.test());
+ assertTrue(q.test());
for(int i=0;i<10;i++) {
q.and(new Constant(true));
- assertTrue(q.test());
+ assertTrue(q.test());
}
-
+
And r = new And(p,q);
- assertTrue(!r.test());
+ assertTrue(!r.test());
}
-
+
public void testDuplicateAdd() throws Exception {
Predicate p = new Constant(true);
And q = new And(p,p);
assertTrue(q.test());
for(int i=0;i<10;i++) {
q.and(p);
- assertTrue(q.test());
+ assertTrue(q.test());
}
}
-
+
public void testEquals() throws Exception {
And p = new And();
assertEquals(p,p);
@@ -130,11 +130,11 @@
q.and(Constant.truePredicate());
assertObjectsAreEqual(p,q);
p.and(new And(Constant.truePredicate(),Constant.falsePredicate()));
- assertObjectsAreNotEqual(p,q);
+ assertObjectsAreNotEqual(p,q);
q.and(new And(Constant.truePredicate(),Constant.falsePredicate()));
- assertObjectsAreEqual(p,q);
+ assertObjectsAreEqual(p,q);
}
-
+
assertObjectsAreNotEqual(p,Constant.truePredicate());
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java Thu Apr 3 13:23:16 2008
@@ -60,64 +60,64 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTrue() throws Exception {
assertTrue((new BinaryAnd()).test("xyzzy",new Integer(3)));
assertTrue((new BinaryAnd(new Constant(true))).test("xyzzy",new Integer(3)));
assertTrue((new BinaryAnd(new Constant(true),new Constant(true))).test("xyzzy",new Integer(3)));
assertTrue((new BinaryAnd(new Constant(true),new Constant(true),new Constant(true))).test("xyzzy",new Integer(3)));
-
+
BinaryAnd p = new BinaryAnd(new Constant(true));
- assertTrue(p.test("xyzzy",new Integer(3)));
+ assertTrue(p.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
p.and(new Constant(true));
- assertTrue(p.test("xyzzy",new Integer(3)));
+ assertTrue(p.test("xyzzy",new Integer(3)));
}
-
+
BinaryAnd q = new BinaryAnd(new Constant(true));
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
q.and(new Constant(true));
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
}
-
+
BinaryAnd r = new BinaryAnd(p,q);
- assertTrue(r.test("xyzzy",new Integer(3)));
+ assertTrue(r.test("xyzzy",new Integer(3)));
}
-
+
public void testFalse() throws Exception {
assertTrue(!(new BinaryAnd(new Constant(false))).test("xyzzy",new Integer(3)));
assertTrue(!(new BinaryAnd(new Constant(true),new Constant(false))).test("xyzzy",new Integer(3)));
assertTrue(!(new BinaryAnd(new Constant(true),new Constant(true),new Constant(false))).test("xyzzy",new Integer(3)));
-
+
BinaryAnd p = new BinaryAnd(new Constant(false));
- assertTrue(!p.test("xyzzy",new Integer(3)));
+ assertTrue(!p.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
p.and(new Constant(false));
- assertTrue(!p.test("xyzzy",new Integer(3)));
+ assertTrue(!p.test("xyzzy",new Integer(3)));
}
-
+
BinaryAnd q = new BinaryAnd(new Constant(true));
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
q.and(new Constant(true));
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
}
-
+
BinaryAnd r = new BinaryAnd(p,q);
- assertTrue(!r.test("xyzzy",new Integer(3)));
+ assertTrue(!r.test("xyzzy",new Integer(3)));
}
-
+
public void testDuplicateAdd() throws Exception {
BinaryPredicate p = new Constant(true);
BinaryAnd q = new BinaryAnd(p,p);
assertTrue(q.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
q.and(p);
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
}
}
-
+
public void testEquals() throws Exception {
BinaryAnd p = new BinaryAnd();
assertEquals(p,p);
@@ -132,11 +132,11 @@
q.and(Constant.truePredicate());
assertObjectsAreEqual(p,q);
p.and(new BinaryAnd(Constant.truePredicate(),Constant.falsePredicate()));
- assertObjectsAreNotEqual(p,q);
+ assertObjectsAreNotEqual(p,q);
q.and(new BinaryAnd(Constant.truePredicate(),Constant.falsePredicate()));
- assertObjectsAreEqual(p,q);
+ assertObjectsAreEqual(p,q);
}
-
+
assertObjectsAreNotEqual(p,Constant.truePredicate());
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryCompositeBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryCompositeBinaryFunction.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryCompositeBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryCompositeBinaryFunction.java Thu Apr 3 13:23:16 2008
@@ -65,7 +65,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
BinaryFunction f = new BinaryCompositeBinaryFunction(
new RightIdentity(),
@@ -75,7 +75,7 @@
assertNull("right",f.evaluate("left",null));
assertEquals("right",f.evaluate(null,"right"));
}
-
+
public void testEquals() throws Exception {
BinaryFunction f = new BinaryCompositeBinaryFunction(
new LeftIdentity(),
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryNot.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryNot.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryNot.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryNot.java Thu Apr 3 13:23:16 2008
@@ -60,14 +60,14 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
BinaryPredicate truePred = new BinaryNot(new Constant(false));
assertTrue(truePred.test(null,null));
assertTrue(truePred.test("xyzzy","abcde"));
assertTrue(truePred.test("xyzzy",new Integer(3)));
}
-
+
public void testEquals() throws Exception {
BinaryNot p = new BinaryNot(Constant.truePredicate());
assertEquals(p,p);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java Thu Apr 3 13:23:16 2008
@@ -60,64 +60,64 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTrue() throws Exception {
assertTrue((new BinaryOr(new Constant(true))).test("xyzzy",new Integer(3)));
assertTrue((new BinaryOr(new Constant(false),new Constant(true))).test("xyzzy",new Integer(3)));
assertTrue((new BinaryOr(new Constant(false),new Constant(false),new Constant(true))).test("xyzzy",new Integer(3)));
-
+
BinaryOr p = new BinaryOr(new Constant(true));
- assertTrue(p.test("xyzzy",new Integer(3)));
+ assertTrue(p.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
p.or(new Constant(i%2==0));
- assertTrue(p.test("xyzzy",new Integer(3)));
+ assertTrue(p.test("xyzzy",new Integer(3)));
}
-
+
BinaryOr q = new BinaryOr(new Constant(true));
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
q.or(new Constant(i%2==0));
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
}
-
+
BinaryOr r = new BinaryOr(p,q);
- assertTrue(r.test("xyzzy",new Integer(3)));
+ assertTrue(r.test("xyzzy",new Integer(3)));
}
-
+
public void testFalse() throws Exception {
assertTrue(!(new BinaryOr()).test("xyzzy",new Integer(3)));
assertTrue(!(new BinaryOr(new Constant(false))).test("xyzzy",new Integer(3)));
assertTrue(!(new BinaryOr(new Constant(false),new Constant(false))).test("xyzzy",new Integer(3)));
assertTrue(!(new BinaryOr(new Constant(false),new Constant(false),new Constant(false))).test("xyzzy",new Integer(3)));
-
+
BinaryOr p = new BinaryOr(new Constant(false));
- assertTrue(!p.test("xyzzy",new Integer(3)));
+ assertTrue(!p.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
p.or(new Constant(false));
- assertTrue(!p.test("xyzzy",new Integer(3)));
+ assertTrue(!p.test("xyzzy",new Integer(3)));
}
-
+
BinaryOr q = new BinaryOr(new Constant(false));
- assertTrue(!q.test("xyzzy",new Integer(3)));
+ assertTrue(!q.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
q.or(new Constant(false));
- assertTrue(!q.test("xyzzy",new Integer(3)));
+ assertTrue(!q.test("xyzzy",new Integer(3)));
}
-
+
BinaryOr r = new BinaryOr(p,q);
- assertTrue(!r.test("xyzzy",new Integer(3)));
+ assertTrue(!r.test("xyzzy",new Integer(3)));
}
-
+
public void testDuplicateAdd() throws Exception {
BinaryPredicate p = new Constant(true);
BinaryOr q = new BinaryOr(p,p);
assertTrue(q.test("xyzzy",new Integer(3)));
for(int i=0;i<10;i++) {
q.or(p);
- assertTrue(q.test("xyzzy",new Integer(3)));
+ assertTrue(q.test("xyzzy",new Integer(3)));
}
}
-
+
public void testEquals() throws Exception {
BinaryOr p = new BinaryOr();
assertEquals(p,p);
@@ -127,7 +127,7 @@
BinaryAnd r = new BinaryAnd();
assertObjectsAreNotEqual(p,r);
-
+
for(int i=0;i<3;i++) {
p.or(Constant.truePredicate());
assertObjectsAreNotEqual(p,q);
@@ -137,13 +137,13 @@
assertObjectsAreNotEqual(p,r);
p.or(new BinaryOr(Constant.truePredicate(),Constant.falsePredicate()));
- assertObjectsAreNotEqual(p,q);
+ assertObjectsAreNotEqual(p,q);
q.or(new BinaryOr(Constant.truePredicate(),Constant.falsePredicate()));
- assertObjectsAreEqual(p,q);
+ assertObjectsAreEqual(p,q);
r.and(new BinaryOr(Constant.truePredicate(),Constant.falsePredicate()));
assertObjectsAreNotEqual(p,r);
}
-
+
assertObjectsAreNotEqual(p,Constant.truePredicate());
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java Thu Apr 3 13:23:16 2008
@@ -63,7 +63,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testRunZero() throws Exception {
BinarySequence seq = new BinarySequence();
seq.run(null,null);
@@ -92,11 +92,11 @@
assertEquals(2,counter[0].count);
assertEquals(2,counter[1].count);
}
-
+
public void testThen() throws Exception {
List list = new ArrayList();
BinarySequence seq = new BinarySequence();
- seq.run(null,null);
+ seq.run(null,null);
for(int i=0;i<10;i++) {
RunCounter counter = new RunCounter();
seq.then(counter);
@@ -107,7 +107,7 @@
}
}
}
-
+
public void testEquals() throws Exception {
BinarySequence p = new BinarySequence();
assertEquals(p,p);
@@ -120,21 +120,21 @@
q.then(new NoOp());
assertObjectsAreEqual(p,q);
p.then(new BinarySequence(new NoOp(),new NoOp()));
- assertObjectsAreNotEqual(p,q);
+ assertObjectsAreNotEqual(p,q);
q.then(new BinarySequence(new NoOp(),new NoOp()));
- assertObjectsAreEqual(p,q);
+ assertObjectsAreEqual(p,q);
}
-
+
assertObjectsAreNotEqual(p,new NoOp());
}
// Classes
// ------------------------------------------------------------------------
-
- static class RunCounter implements BinaryProcedure {
+
+ static class RunCounter implements BinaryProcedure {
public void run(Object a, Object b) {
- count++;
- }
+ count++;
+ }
public int count = 0;
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestComposite.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestComposite.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestComposite.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestComposite.java Thu Apr 3 13:23:16 2008
@@ -44,20 +44,20 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testHasNoArgConstructor() throws Exception {
assertNotNull(new Composite());
}
public void testUnaryMethods() {
- assertNotNull(Composite.procedure(NoOp.instance(),Identity.instance()));
- assertNotNull(Composite.predicate(Identity.instance(),Identity.instance()));
- assertNotNull(Composite.function(Identity.instance(),Identity.instance()));
+ assertNotNull(Composite.procedure(NoOp.instance(),Identity.instance()));
+ assertNotNull(Composite.predicate(Identity.instance(),Identity.instance()));
+ assertNotNull(Composite.function(Identity.instance(),Identity.instance()));
}
public void testBinaryMethods() {
- assertNotNull(Composite.function(LeftIdentity.instance(),LeftIdentity.instance(),LeftIdentity.instance()));
- assertNotNull(Composite.predicate(IsGreaterThan.instance(),Identity.instance(),Identity.instance()));
- assertNotNull(Composite.function(LeftIdentity.instance(),Identity.instance(),Identity.instance()));
+ assertNotNull(Composite.function(LeftIdentity.instance(),LeftIdentity.instance(),LeftIdentity.instance()));
+ assertNotNull(Composite.predicate(IsGreaterThan.instance(),Identity.instance(),Identity.instance()));
+ assertNotNull(Composite.function(LeftIdentity.instance(),Identity.instance(),Identity.instance()));
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java Thu Apr 3 13:23:16 2008
@@ -61,18 +61,18 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
// empty composite acts like identity function
assertEquals("xyzzy",(new CompositeUnaryFunction()).evaluate("xyzzy"));
assertNull(null,(new CompositeUnaryFunction()).evaluate(null));
assertEquals(new Integer(4),(new CompositeUnaryFunction(new Constant(new Integer(4)))).evaluate(null));
-
+
assertEquals(new Integer(4),(new CompositeUnaryFunction(new Constant(new Integer(4)),new Constant(new Integer(3)))).evaluate("xyzzy"));
assertEquals(new Integer(3),(new CompositeUnaryFunction(new Constant(new Integer(3)),new Constant(new Integer(4)))).evaluate("xyzzy"));
}
-
+
public void testOf() throws Exception {
CompositeUnaryFunction f = new CompositeUnaryFunction();
assertNull(f.evaluate(null));
@@ -81,7 +81,7 @@
public Object evaluate(Object obj) {
if(obj instanceof Integer) {
return new Integer((((Integer)obj).intValue())+1);
- } else {
+ } else {
return new Integer(1);
}
}
@@ -89,7 +89,7 @@
assertEquals(new Integer(i+1),f.evaluate(null));
}
}
-
+
public void testEquals() throws Exception {
CompositeUnaryFunction f = new CompositeUnaryFunction();
assertEquals(f,f);
@@ -102,11 +102,11 @@
g.of(new Constant("x"));
assertObjectsAreEqual(f,g);
f.of(new CompositeUnaryFunction(new Constant("y"),new Constant("z")));
- assertObjectsAreNotEqual(f,g);
+ assertObjectsAreNotEqual(f,g);
g.of(new CompositeUnaryFunction(new Constant("y"),new Constant("z")));
- assertObjectsAreEqual(f,g);
+ assertObjectsAreEqual(f,g);
}
-
+
assertObjectsAreNotEqual(f,new Constant("y"));
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java Thu Apr 3 13:23:16 2008
@@ -60,9 +60,9 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
- assertEquals(true,(new CompositeUnaryPredicate(new Constant(true))).test(null));
+ assertEquals(true,(new CompositeUnaryPredicate(new Constant(true))).test(null));
assertEquals(true,(new CompositeUnaryPredicate(new Constant(true),new Constant(new Integer(3)))).test("xyzzy"));
assertEquals(false,(new CompositeUnaryPredicate(new Constant(false),new Constant(new Integer(4)))).test("xyzzy"));
}
@@ -87,7 +87,7 @@
// expected
}
}
-
+
public void testOf() throws Exception {
CompositeUnaryPredicate f = new CompositeUnaryPredicate(new Constant(true));
assertTrue(f.test(null));
@@ -96,7 +96,7 @@
assertEquals(true,f.test(null));
}
}
-
+
public void testEquals() throws Exception {
CompositeUnaryPredicate f = new CompositeUnaryPredicate(new Constant(true));
assertEquals(f,f);
@@ -109,11 +109,11 @@
g.of(new Constant("x"));
assertObjectsAreEqual(f,g);
f.of(new CompositeUnaryFunction(new Constant("y"),new Constant("z")));
- assertObjectsAreNotEqual(f,g);
+ assertObjectsAreNotEqual(f,g);
g.of(new CompositeUnaryFunction(new Constant("y"),new Constant("z")));
- assertObjectsAreEqual(f,g);
+ assertObjectsAreEqual(f,g);
}
-
+
assertObjectsAreNotEqual(f,new Constant(false));
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java Thu Apr 3 13:23:16 2008
@@ -61,11 +61,11 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testRun() throws Exception {
new CompositeUnaryProcedure(new NoOp(),new Identity()).run(null);
}
-
+
public void testNullNotAllowed() throws Exception {
try {
new CompositeUnaryProcedure(null);
@@ -89,7 +89,7 @@
public void testOf() throws Exception {
new CompositeUnaryProcedure(new NoOp()).of(new Identity()).run(null);
}
-
+
public void testEquals() throws Exception {
CompositeUnaryProcedure f = new CompositeUnaryProcedure(new NoOp());
assertEquals(f,f);
@@ -102,11 +102,11 @@
g.of(new Constant("x"));
assertObjectsAreEqual(f,g);
f.of(new CompositeUnaryFunction(new Constant("y"),new Constant("z")));
- assertObjectsAreNotEqual(f,g);
+ assertObjectsAreNotEqual(f,g);
g.of(new CompositeUnaryFunction(new Constant("y"),new Constant("z")));
- assertObjectsAreEqual(f,g);
+ assertObjectsAreEqual(f,g);
}
-
+
assertObjectsAreNotEqual(f,new Constant(false));
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditional.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditional.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditional.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditional.java Thu Apr 3 13:23:16 2008
@@ -46,20 +46,20 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testHasNoArgConstructor() throws Exception {
assertNotNull(new Conditional());
}
public void testUnaryMethods() {
- assertNotNull(Conditional.procedure(IsNull.instance(),NoOp.instance(),NoOp.instance()));
- assertNotNull(Conditional.function(IsNull.instance(),Identity.instance(),Identity.instance()));
- assertNotNull(Conditional.predicate(IsNull.instance(),Constant.truePredicate(),Constant.truePredicate()));
+ assertNotNull(Conditional.procedure(IsNull.instance(),NoOp.instance(),NoOp.instance()));
+ assertNotNull(Conditional.function(IsNull.instance(),Identity.instance(),Identity.instance()));
+ assertNotNull(Conditional.predicate(IsNull.instance(),Constant.truePredicate(),Constant.truePredicate()));
}
public void testBinaryMethods() {
- assertNotNull(Conditional.procedure(IsGreaterThan.instance(),NoOp.instance(),NoOp.instance()));
- assertNotNull(Conditional.function(IsGreaterThan.instance(),Max.instance(),Max.instance()));
- assertNotNull(Conditional.predicate(IsGreaterThan.instance(),Constant.truePredicate(),Constant.truePredicate()));
+ assertNotNull(Conditional.procedure(IsGreaterThan.instance(),NoOp.instance(),NoOp.instance()));
+ assertNotNull(Conditional.function(IsGreaterThan.instance(),Max.instance(),Max.instance()));
+ assertNotNull(Conditional.predicate(IsGreaterThan.instance(),Constant.truePredicate(),Constant.truePredicate()));
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryFunction.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryFunction.java Thu Apr 3 13:23:16 2008
@@ -63,7 +63,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
ConditionalBinaryFunction f = new ConditionalBinaryFunction(
new LeftIdentity(),
@@ -72,7 +72,7 @@
assertEquals("left",f.evaluate(Boolean.TRUE,null));
assertEquals("right",f.evaluate(Boolean.FALSE,null));
}
-
+
public void testEquals() throws Exception {
ConditionalBinaryFunction f = new ConditionalBinaryFunction(
new LeftIdentity(),
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryPredicate.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryPredicate.java Thu Apr 3 13:23:16 2008
@@ -62,7 +62,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
{
ConditionalBinaryPredicate p = new ConditionalBinaryPredicate(
@@ -79,7 +79,7 @@
assertTrue(!p.test(null,null));
}
}
-
+
public void testEquals() throws Exception {
ConditionalBinaryPredicate p = new ConditionalBinaryPredicate(
new Constant(true),
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryProcedure.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalBinaryProcedure.java Thu Apr 3 13:23:16 2008
@@ -65,7 +65,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testRun() throws Exception {
RunCounter left = new RunCounter();
RunCounter right = new RunCounter();
@@ -85,7 +85,7 @@
assertEquals(2,left.count);
assertEquals(1,right.count);
}
-
+
public void testEquals() throws Exception {
ConditionalBinaryProcedure p = new ConditionalBinaryProcedure(
new LeftIdentity(),
@@ -116,11 +116,11 @@
// Classes
// ------------------------------------------------------------------------
-
- static class RunCounter implements BinaryProcedure {
+
+ static class RunCounter implements BinaryProcedure {
public void run(Object left, Object right) {
- count++;
- }
+ count++;
+ }
public int count = 0;
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalFunction.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalFunction.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalFunction.java Thu Apr 3 13:23:16 2008
@@ -62,7 +62,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
{
ConditionalFunction f = new ConditionalFunction(
@@ -79,7 +79,7 @@
assertEquals("right",f.evaluate());
}
}
-
+
public void testEquals() throws Exception {
ConditionalFunction f = new ConditionalFunction(
new Constant(true),
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalPredicate.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalPredicate.java Thu Apr 3 13:23:16 2008
@@ -62,7 +62,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
{
ConditionalPredicate p = new ConditionalPredicate(
@@ -79,7 +79,7 @@
assertTrue(!p.test());
}
}
-
+
public void testEquals() throws Exception {
ConditionalPredicate p = new ConditionalPredicate(
new Constant(true),
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalProcedure.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalProcedure.java Thu Apr 3 13:23:16 2008
@@ -64,7 +64,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testRun() throws Exception {
{
RunCounter left = new RunCounter();
@@ -105,7 +105,7 @@
assertEquals(3,right.count);
}
}
-
+
public void testEquals() throws Exception {
ConditionalProcedure p = new ConditionalProcedure(
new Constant(false),
@@ -136,11 +136,11 @@
// Classes
// ------------------------------------------------------------------------
-
- static class RunCounter implements Procedure {
+
+ static class RunCounter implements Procedure {
public void run() {
- count++;
- }
+ count++;
+ }
public int count = 0;
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryFunction.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryFunction.java Thu Apr 3 13:23:16 2008
@@ -63,7 +63,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testEvaluate() throws Exception {
ConditionalUnaryFunction f = new ConditionalUnaryFunction(
new Identity(),
@@ -72,7 +72,7 @@
assertEquals("left",f.evaluate(Boolean.TRUE));
assertEquals("right",f.evaluate(Boolean.FALSE));
}
-
+
public void testEquals() throws Exception {
ConditionalUnaryFunction f = new ConditionalUnaryFunction(
new Identity(),
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java Thu Apr 3 13:23:16 2008
@@ -63,7 +63,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testTest() throws Exception {
ConditionalUnaryPredicate p = new ConditionalUnaryPredicate(
new Identity(),
@@ -72,7 +72,7 @@
assertTrue(p.test(Boolean.TRUE));
assertTrue(!p.test(Boolean.FALSE));
}
-
+
public void testEquals() throws Exception {
ConditionalUnaryPredicate p = new ConditionalUnaryPredicate(
new Identity(),
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java?rev=644470&r1=644469&r2=644470&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java Thu Apr 3 13:23:16 2008
@@ -65,7 +65,7 @@
// Tests
// ------------------------------------------------------------------------
-
+
public void testRun() throws Exception {
RunCounter left = new RunCounter();
RunCounter right = new RunCounter();
@@ -85,7 +85,7 @@
assertEquals(2,left.count);
assertEquals(1,right.count);
}
-
+
public void testEquals() throws Exception {
ConditionalUnaryProcedure p = new ConditionalUnaryProcedure(
new Identity(),
@@ -116,11 +116,11 @@
// Classes
// ------------------------------------------------------------------------
-
- static class RunCounter implements UnaryProcedure {
+
+ static class RunCounter implements UnaryProcedure {
public void run(Object obj) {
- count++;
- }
+ count++;
+ }
public int count = 0;
}
}