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/08/16 21:09:11 UTC
svn commit: r1373984 - in
/commons/proper/functor/branches/generators-FUNCTOR-14: ./
src/main/java/org/apache/commons/functor/generator/util/
src/test/java/org/apache/commons/functor/
src/test/java/org/apache/commons/functor/example/kata/two/ src/test/...
Author: kinow
Date: Thu Aug 16 19:09:10 2012
New Revision: 1373984
URL: http://svn.apache.org/viewvc?rev=1373984&view=rev
Log:
Creating a branch to work on FUNCTOR-14 issue: Enhancements on the Generator API
Added:
commons/proper/functor/branches/generators-FUNCTOR-14/
- copied from r1373171, commons/proper/functor/trunk/
commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/IntegerGenerator.java
- copied, changed from r1373171, commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/LongGenerator.java
- copied, changed from r1373171, commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java
Removed:
commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/LongRange.java
Modified:
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/TestAlgorithms.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestFilteredGenerator.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateUntil.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateWhile.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestTransformedGenerator.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestUntilGenerate.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestWhileGenerate.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java
commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java
Copied: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/IntegerGenerator.java (from r1373171, commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java)
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/IntegerGenerator.java?p2=commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/IntegerGenerator.java&p1=commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java&r1=1373171&r2=1373984&rev=1373984&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/IntegerGenerator.java Thu Aug 16 19:09:10 2012
@@ -24,7 +24,7 @@ import org.apache.commons.functor.genera
* @since 1.0
* @version $Revision$ $Date$
*/
-public final class IntegerRange extends BaseGenerator<Integer> {
+public final class IntegerGenerator extends BaseGenerator<Integer> {
// attributes
//---------------------------------------------------------------
@@ -50,7 +50,7 @@ public final class IntegerRange extends
* @param from start
* @param to end
*/
- public IntegerRange(Number from, Number to) {
+ public IntegerGenerator(Number from, Number to) {
this(from.intValue(), to.intValue());
}
@@ -60,7 +60,7 @@ public final class IntegerRange extends
* @param to end
* @param step increment
*/
- public IntegerRange(Number from, Number to, Number step) {
+ public IntegerGenerator(Number from, Number to, Number step) {
this(from.intValue(), to.intValue(), step.intValue());
}
@@ -69,7 +69,7 @@ public final class IntegerRange extends
* @param from start
* @param to end
*/
- public IntegerRange(int from, int to) {
+ public IntegerGenerator(int from, int to) {
this(from, to, defaultStep(from, to));
}
@@ -79,7 +79,7 @@ public final class IntegerRange extends
* @param to end
* @param step increment
*/
- public IntegerRange(int from, int to, int step) {
+ public IntegerGenerator(int from, int to, int step) {
if (from != to && signOf(step) != signOf(to - from)) {
throw new IllegalArgumentException("Will never reach " + to + " from " + from + " using step " + step);
}
@@ -121,10 +121,10 @@ public final class IntegerRange extends
if (obj == this) {
return true;
}
- if (!(obj instanceof IntegerRange)) {
+ if (!(obj instanceof IntegerGenerator)) {
return false;
}
- IntegerRange that = (IntegerRange) obj;
+ IntegerGenerator that = (IntegerGenerator) obj;
return this.from == that.from && this.to == that.to && this.step == that.step;
}
Copied: commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/LongGenerator.java (from r1373171, commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java)
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/LongGenerator.java?p2=commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/LongGenerator.java&p1=commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java&r1=1373171&r2=1373984&rev=1373984&view=diff
==============================================================================
--- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/main/java/org/apache/commons/functor/generator/util/LongGenerator.java Thu Aug 16 19:09:10 2012
@@ -23,7 +23,7 @@ import org.apache.commons.functor.genera
* @since 1.0
* @version $Revision$ $Date$
*/
-public final class LongRange extends BaseGenerator<Long> {
+public final class LongGenerator extends BaseGenerator<Long> {
// attributes
//---------------------------------------------------------------
@@ -49,7 +49,7 @@ public final class LongRange extends Bas
* @param from start
* @param to end
*/
- public LongRange(Number from, Number to) {
+ public LongGenerator(Number from, Number to) {
this(from.longValue(), to.longValue());
}
@@ -59,7 +59,7 @@ public final class LongRange extends Bas
* @param to end
* @param step increment
*/
- public LongRange(Number from, Number to, Number step) {
+ public LongGenerator(Number from, Number to, Number step) {
this(from.longValue(), to.longValue(), step.longValue());
}
@@ -68,7 +68,7 @@ public final class LongRange extends Bas
* @param from start
* @param to end
*/
- public LongRange(long from, long to) {
+ public LongGenerator(long from, long to) {
this(from, to, defaultStep(from, to));
}
@@ -78,7 +78,7 @@ public final class LongRange extends Bas
* @param to end
* @param step increment
*/
- public LongRange(long from, long to, long step) {
+ public LongGenerator(long from, long to, long step) {
if (from != to && signOf(step) != signOf(to - from)) {
throw new IllegalArgumentException("Will never reach " + to + " from " + from + " using step " + step);
}
@@ -120,10 +120,10 @@ public final class LongRange extends Bas
if (obj == this) {
return true;
}
- if (!(obj instanceof LongRange)) {
+ if (!(obj instanceof LongGenerator)) {
return false;
}
- LongRange that = (LongRange) obj;
+ LongGenerator that = (LongGenerator) obj;
return this.from == that.from && this.to == that.to && this.step == that.step;
}
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/TestAlgorithms.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/TestAlgorithms.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/TestAlgorithms.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/TestAlgorithms.java Thu Aug 16 19:09:10 2012
@@ -34,7 +34,7 @@ import org.apache.commons.functor.genera
import org.apache.commons.functor.generator.Generator;
import org.apache.commons.functor.generator.IteratorToGeneratorAdapter;
import org.apache.commons.functor.generator.TransformedGenerator;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -116,7 +116,7 @@ public class TestAlgorithms {
@Test
public void testApplyToGenerator() {
- Generator<Integer> gen = new IntegerRange(1,5);
+ Generator<Integer> gen = new IntegerGenerator(1,5);
Summer summer = new Summer();
new TransformedGenerator<Integer, Integer>(gen, new Doubler()).run(summer);
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java Thu Aug 16 19:09:10 2012
@@ -26,7 +26,7 @@ import org.apache.commons.functor.Predic
import org.apache.commons.functor.Procedure;
import org.apache.commons.functor.core.algorithm.RecursiveEvaluation;
import org.apache.commons.functor.core.algorithm.UntilDo;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.Test;
/**
@@ -102,7 +102,7 @@ public class TestBinaryChop {
assertEquals(-1, chopper.find(6, new int[] { 1, 3, 5, 7 }));
assertEquals(-1, chopper.find(8, new int[] { 1, 3, 5, 7 }));
- List<Integer> largeList = (List<Integer>) (new IntegerRange(0, 100001).toCollection());
+ List<Integer> largeList = (List<Integer>) (new IntegerGenerator(0, 100001).toCollection());
assertEquals(-1, chopper.find(new Integer(-5), largeList));
assertEquals(100000, chopper.find(new Integer(100000), largeList));
assertEquals(0, chopper.find(new Integer(0), largeList));
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestFilteredGenerator.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestFilteredGenerator.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestFilteredGenerator.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestFilteredGenerator.java Thu Aug 16 19:09:10 2012
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.commons.functor.UnaryPredicate;
import org.apache.commons.functor.UnaryProcedure;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -39,7 +39,7 @@ public class TestFilteredGenerator
@Before
public void setUp() throws Exception {
- wrappedGenerator = new IntegerRange(1, 10);
+ wrappedGenerator = new IntegerGenerator(1, 10);
filteredGenerator = new FilteredGenerator<Integer>(wrappedGenerator, isEven);
}
@@ -70,13 +70,13 @@ public class TestFilteredGenerator
@Test
public void testEquals() {
- Generator<Integer> anotherGenerate = new FilteredGenerator<Integer>(new IntegerRange(1, 10), isEven);
+ Generator<Integer> anotherGenerate = new FilteredGenerator<Integer>(new IntegerGenerator(1, 10), isEven);
assertEquals(filteredGenerator, filteredGenerator);
assertEquals(filteredGenerator, anotherGenerate);
assertTrue(!filteredGenerator.equals((FilteredGenerator<Integer>)null));
Generator<Integer> aGenerateWithADifferentPredicate = new FilteredGenerator<Integer>(
- new IntegerRange(1, 10), new UnaryPredicate<Integer>() {
+ new IntegerGenerator(1, 10), new UnaryPredicate<Integer>() {
public boolean test(Integer obj) {
return obj % 2 == 0;
}
@@ -84,7 +84,7 @@ public class TestFilteredGenerator
assertTrue(!filteredGenerator.equals(aGenerateWithADifferentPredicate));
- Generator<Integer> aGenerateWithADifferentWrapped = new FilteredGenerator<Integer>(new IntegerRange(1,11), isEven);
+ Generator<Integer> aGenerateWithADifferentWrapped = new FilteredGenerator<Integer>(new IntegerGenerator(1,11), isEven);
assertTrue(!filteredGenerator.equals(aGenerateWithADifferentWrapped));
}
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateUntil.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateUntil.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateUntil.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateUntil.java Thu Aug 16 19:09:10 2012
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import org.apache.commons.functor.UnaryPredicate;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -34,7 +34,7 @@ public class TestGenerateUntil
@Before
public void setUp() throws Exception {
- wrappedGenerator = new IntegerRange(1, 10);
+ wrappedGenerator = new IntegerGenerator(1, 10);
generateUntil = new GenerateUntil<Integer>(wrappedGenerator, isMoreThanFive);
}
@@ -65,13 +65,13 @@ public class TestGenerateUntil
@Test
public void testEquals() {
- Generator<Integer> anotherGenerate = new GenerateUntil<Integer>(new IntegerRange(1, 10), isMoreThanFive);
+ Generator<Integer> anotherGenerate = new GenerateUntil<Integer>(new IntegerGenerator(1, 10), isMoreThanFive);
assertEquals(generateUntil, generateUntil);
assertEquals(generateUntil, anotherGenerate);
assertTrue(!generateUntil.equals((GenerateUntil<Integer>)null));
Generator<Integer> aGenerateWithADifferentPredicate = new GenerateUntil<Integer>(
- new IntegerRange(1, 10),
+ new IntegerGenerator(1, 10),
new UnaryPredicate<Integer>() {
public boolean test(Integer obj) {
return obj > FIVE;
@@ -79,7 +79,7 @@ public class TestGenerateUntil
});
assertTrue(!generateUntil.equals(aGenerateWithADifferentPredicate));
- Generator<Integer> aGenerateWithADifferentWrapped = new GenerateUntil<Integer>(new IntegerRange(1,2), isMoreThanFive);
+ Generator<Integer> aGenerateWithADifferentWrapped = new GenerateUntil<Integer>(new IntegerGenerator(1,2), isMoreThanFive);
assertTrue(!generateUntil.equals(aGenerateWithADifferentWrapped));
}
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateWhile.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateWhile.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateWhile.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestGenerateWhile.java Thu Aug 16 19:09:10 2012
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import org.apache.commons.functor.UnaryPredicate;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -34,7 +34,7 @@ public class TestGenerateWhile
@Before
public void setUp() throws Exception {
- wrappedGenerator = new IntegerRange(1, 10);
+ wrappedGenerator = new IntegerGenerator(1, 10);
generateWhile = new GenerateWhile<Integer>(wrappedGenerator, isLessThanFive);
}
@@ -65,13 +65,13 @@ public class TestGenerateWhile
@Test
public void testEquals() {
- Generator<Integer> anotherGenerate = new GenerateWhile<Integer>(new IntegerRange(1, 10), isLessThanFive);
+ Generator<Integer> anotherGenerate = new GenerateWhile<Integer>(new IntegerGenerator(1, 10), isLessThanFive);
assertEquals(generateWhile, generateWhile);
assertEquals(generateWhile, anotherGenerate);
assertTrue(!generateWhile.equals((GenerateWhile<Integer>)null));
Generator<Integer> aGenerateWithADifferentPredicate = new GenerateWhile<Integer>(
- new IntegerRange(1, 10), new UnaryPredicate<Integer>() {
+ new IntegerGenerator(1, 10), new UnaryPredicate<Integer>() {
public boolean test(Integer obj) {
return obj < FIVE;
}
@@ -79,7 +79,7 @@ public class TestGenerateWhile
assertTrue(!generateWhile.equals(aGenerateWithADifferentPredicate));
- Generator<Integer> aGenerateWithADifferentWrapped = new GenerateWhile<Integer>(new IntegerRange(1,11), isLessThanFive);
+ Generator<Integer> aGenerateWithADifferentWrapped = new GenerateWhile<Integer>(new IntegerGenerator(1,11), isLessThanFive);
assertTrue(!generateWhile.equals(aGenerateWithADifferentWrapped));
}
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestTransformedGenerator.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestTransformedGenerator.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestTransformedGenerator.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestTransformedGenerator.java Thu Aug 16 19:09:10 2012
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.commons.functor.UnaryFunction;
import org.apache.commons.functor.UnaryProcedure;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -36,7 +36,7 @@ public class TestTransformedGenerator
@Before
public void setUp() throws Exception {
- wrappedGenerator = new IntegerRange(1, 10);
+ wrappedGenerator = new IntegerGenerator(1, 10);
sumsTwoGenerator = new TransformedGenerator<Integer, Integer>(wrappedGenerator, sumsTwo);
}
@@ -82,7 +82,7 @@ public class TestTransformedGenerator
assertTrue( !sumsTwoGenerator.equals(aGenerateWithADifferentFunction));
TransformedGenerator<Integer, Integer> aTransformedGeneratorWithADifferentWrapped =
- new TransformedGenerator<Integer, Integer>(new IntegerRange(1,2), sumsTwo);
+ new TransformedGenerator<Integer, Integer>(new IntegerGenerator(1,2), sumsTwo);
assertTrue(!sumsTwoGenerator.equals(aTransformedGeneratorWithADifferentWrapped));
}
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestUntilGenerate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestUntilGenerate.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestUntilGenerate.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestUntilGenerate.java Thu Aug 16 19:09:10 2012
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.commons.functor.UnaryPredicate;
import org.apache.commons.functor.UnaryProcedure;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -39,7 +39,7 @@ public class TestUntilGenerate
@Before
public void setUp() throws Exception {
- wrappedGenerator = new IntegerRange(1, 10);
+ wrappedGenerator = new IntegerGenerator(1, 10);
untilGenerate = new UntilGenerate<Integer>(isLessThanFive, wrappedGenerator);
}
@@ -70,7 +70,7 @@ public class TestUntilGenerate
@Test
public void testEquals() {
- Generator<Integer> anotherGenerate = new UntilGenerate<Integer>(isLessThanFive, new IntegerRange(1, 10));
+ Generator<Integer> anotherGenerate = new UntilGenerate<Integer>(isLessThanFive, new IntegerGenerator(1, 10));
assertEquals(untilGenerate, untilGenerate);
assertEquals(untilGenerate, anotherGenerate);
assertTrue(!untilGenerate.equals((UntilGenerate<Integer>)null));
@@ -80,10 +80,10 @@ public class TestUntilGenerate
public boolean test(Integer obj) {
return obj < FIVE;
}
- }, new IntegerRange(1, 10));
+ }, new IntegerGenerator(1, 10));
assertTrue(!untilGenerate.equals(aGenerateWithADifferentPredicate));
- Generator<Integer> aGenerateWithADifferentWrapped = new UntilGenerate<Integer>(isLessThanFive, new IntegerRange(1,2));
+ Generator<Integer> aGenerateWithADifferentWrapped = new UntilGenerate<Integer>(isLessThanFive, new IntegerGenerator(1,2));
assertTrue(!untilGenerate.equals(aGenerateWithADifferentWrapped));
}
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestWhileGenerate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestWhileGenerate.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestWhileGenerate.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/TestWhileGenerate.java Thu Aug 16 19:09:10 2012
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.commons.functor.UnaryPredicate;
import org.apache.commons.functor.UnaryProcedure;
-import org.apache.commons.functor.generator.util.IntegerRange;
+import org.apache.commons.functor.generator.util.IntegerGenerator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -38,7 +38,7 @@ public class TestWhileGenerate {
@Before
public void setUp() throws Exception {
- wrappedGenerator = new IntegerRange(1, 10);
+ wrappedGenerator = new IntegerGenerator(1, 10);
whileGenerate = new WhileGenerate<Integer>(isLessThanFive, wrappedGenerator);
}
@@ -69,7 +69,7 @@ public class TestWhileGenerate {
@Test
public void testEquals() {
- Generator<Integer> anotherGenerate = new WhileGenerate<Integer>(isLessThanFive, new IntegerRange(1, 10));
+ Generator<Integer> anotherGenerate = new WhileGenerate<Integer>(isLessThanFive, new IntegerGenerator(1, 10));
assertEquals(whileGenerate, whileGenerate);
assertEquals(whileGenerate, anotherGenerate);
assertTrue(!whileGenerate.equals((WhileGenerate<Integer>)null));
@@ -79,10 +79,10 @@ public class TestWhileGenerate {
public boolean test(Integer obj) {
return obj < FIVE;
}
- }, new IntegerRange(1, 10));
+ }, new IntegerGenerator(1, 10));
assertTrue(!whileGenerate.equals(aGenerateWithADifferentPredicate));
- Generator<Integer> aGenerateWithADifferentWrapped = new WhileGenerate<Integer>(isLessThanFive, new IntegerRange(1,11));
+ Generator<Integer> aGenerateWithADifferentWrapped = new WhileGenerate<Integer>(isLessThanFive, new IntegerGenerator(1,11));
assertTrue(!whileGenerate.equals(aGenerateWithADifferentWrapped));
}
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java Thu Aug 16 19:09:10 2012
@@ -32,7 +32,7 @@ public class TestIntegerRange extends Ba
@Override
protected Object makeFunctor() throws Exception {
- return new IntegerRange(10, 20);
+ return new IntegerGenerator(10, 20);
}
// Tests
@@ -42,7 +42,7 @@ public class TestIntegerRange extends Ba
public void testGenerateListExample() {
// generates a collection of Integers from 0 (inclusive) to 10 (exclusive)
{
- List<? super Integer> list = (List<? super Integer>)(new IntegerRange(0,10).to(new ArrayList<Integer>()));
+ List<? super Integer> list = (List<? super Integer>)(new IntegerGenerator(0,10).to(new ArrayList<Integer>()));
for (int i=0;i<10;i++) {
assertEquals(new Integer(i),list.get(i));
}
@@ -50,7 +50,7 @@ public class TestIntegerRange extends Ba
// generates a collection of Integers from 10 (inclusive) to 0 (exclusive)
{
- List<? super Integer> list = (List<? super Integer>)(new IntegerRange(10,0).to(new ArrayList<Integer>()));
+ List<? super Integer> list = (List<? super Integer>)(new IntegerGenerator(10,0).to(new ArrayList<Integer>()));
for (int i=10;i>0;i--) {
assertEquals(new Integer(i),list.get(10-i));
}
@@ -60,34 +60,34 @@ public class TestIntegerRange extends Ba
@Test
public void testStepChecking() {
{
- new IntegerRange(2, 2, 0); // step of 0 is ok when range is empty
+ new IntegerGenerator(2, 2, 0); // step of 0 is ok when range is empty
}
{
- new IntegerRange(2, 2, 1); // positive step is ok when range is empty
+ new IntegerGenerator(2, 2, 1); // positive step is ok when range is empty
}
{
- new IntegerRange(2, 2, -1); // negative step is ok when range is empty
+ new IntegerGenerator(2, 2, -1); // negative step is ok when range is empty
}
{
- new IntegerRange(0, 1, 10); // big steps are ok
+ new IntegerGenerator(0, 1, 10); // big steps are ok
}
{
- new IntegerRange(1, 0, -10); // big steps are ok
+ new IntegerGenerator(1, 0, -10); // big steps are ok
}
try {
- new IntegerRange(0, 1, 0);
+ new IntegerGenerator(0, 1, 0);
fail("Expected IllegalArgumentException");
} catch(IllegalArgumentException e) {
// expected
}
try {
- new IntegerRange(0, 1, -1);
+ new IntegerGenerator(0, 1, -1);
fail("Expected IllegalArgumentException");
} catch(IllegalArgumentException e) {
// expected
}
try {
- new IntegerRange(0, -1, 1);
+ new IntegerGenerator(0, -1, 1);
fail("Expected IllegalArgumentException");
} catch(IllegalArgumentException e) {
// expected
@@ -96,59 +96,59 @@ public class TestIntegerRange extends Ba
@Test
public void testObjectConstructor() {
- IntegerRange range = new IntegerRange(new Integer(0), new Integer(5));
+ IntegerGenerator range = new IntegerGenerator(new Integer(0), new Integer(5));
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
- range = new IntegerRange(new Integer(0), new Integer(5), new Integer(1));
+ range = new IntegerGenerator(new Integer(0), new Integer(5), new Integer(1));
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
}
@Test
public void testReverseStep() {
- IntegerRange range = new IntegerRange(10, 0, -2);
+ IntegerGenerator range = new IntegerGenerator(10, 0, -2);
assertEquals("[10, 8, 6, 4, 2]", range.toCollection().toString());
assertEquals("[10, 8, 6, 4, 2]", range.toCollection().toString());
}
@Test
public void testStep() {
- IntegerRange range = new IntegerRange(0, 10, 2);
+ IntegerGenerator range = new IntegerGenerator(0, 10, 2);
assertEquals("[0, 2, 4, 6, 8]", range.toCollection().toString());
assertEquals("[0, 2, 4, 6, 8]", range.toCollection().toString());
}
@Test
public void testForwardRange() {
- IntegerRange range = new IntegerRange(0, 5);
+ IntegerGenerator range = new IntegerGenerator(0, 5);
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
}
@Test
public void testReverseRange() {
- IntegerRange range = new IntegerRange(5, 0);
+ IntegerGenerator range = new IntegerGenerator(5, 0);
assertEquals("[5, 4, 3, 2, 1]", range.toCollection().toString());
assertEquals("[5, 4, 3, 2, 1]", range.toCollection().toString());
}
@Test
public void testEdgeCase() {
- IntegerRange range = new IntegerRange(Integer.MAX_VALUE - 3, Integer.MAX_VALUE);
+ IntegerGenerator range = new IntegerGenerator(Integer.MAX_VALUE - 3, Integer.MAX_VALUE);
assertEquals("[2147483644, 2147483645, 2147483646]", range.toCollection().toString());
assertEquals("[2147483644, 2147483645, 2147483646]", range.toCollection().toString());
}
@Test
public void testEquals() {
- IntegerRange range = new IntegerRange(1, 5);
+ IntegerGenerator range = new IntegerGenerator(1, 5);
assertObjectsAreEqual(range, range);
- assertObjectsAreEqual(range, new IntegerRange(1, 5));
- assertObjectsAreEqual(range, new IntegerRange(1, 5, 1));
- assertObjectsAreEqual(range, new IntegerRange(new Long(1), new Long(5)));
- assertObjectsAreEqual(range, new IntegerRange(new Long(1), new Long(5), new Long(1)));
- assertObjectsAreNotEqual(range, new IntegerRange(2, 5));
- assertObjectsAreNotEqual(range, new IntegerRange(1, 6));
- assertObjectsAreNotEqual(range, new IntegerRange(1, 5, 2));
+ assertObjectsAreEqual(range, new IntegerGenerator(1, 5));
+ assertObjectsAreEqual(range, new IntegerGenerator(1, 5, 1));
+ assertObjectsAreEqual(range, new IntegerGenerator(new Long(1), new Long(5)));
+ assertObjectsAreEqual(range, new IntegerGenerator(new Long(1), new Long(5), new Long(1)));
+ assertObjectsAreNotEqual(range, new IntegerGenerator(2, 5));
+ assertObjectsAreNotEqual(range, new IntegerGenerator(1, 6));
+ assertObjectsAreNotEqual(range, new IntegerGenerator(1, 5, 2));
}
}
\ No newline at end of file
Modified: commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java?rev=1373984&r1=1373171&r2=1373984&view=diff
==============================================================================
--- commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java (original)
+++ commons/proper/functor/branches/generators-FUNCTOR-14/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java Thu Aug 16 19:09:10 2012
@@ -32,7 +32,7 @@ public class TestLongRange extends BaseF
@Override
protected Object makeFunctor() throws Exception {
- return new LongRange(10, 20);
+ return new LongGenerator(10, 20);
}
// Tests
@@ -42,7 +42,7 @@ public class TestLongRange extends BaseF
public void testGenerateListExample() {
// generates a collection of Integers from 0 (inclusive) to 10 (exclusive)
{
- List<? super Long> list = (List<? super Long>)(new LongRange(0,10).to(new ArrayList<Long>()));
+ List<? super Long> list = (List<? super Long>)(new LongGenerator(0,10).to(new ArrayList<Long>()));
for (int i=0;i<10;i++) {
assertEquals(new Long(i),list.get(i));
}
@@ -50,7 +50,7 @@ public class TestLongRange extends BaseF
// generates a collection of Integers from 10 (inclusive) to 0 (exclusive)
{
- List<? super Long> list = (List<? super Long>)(new LongRange(10,0).to(new ArrayList<Long>()));
+ List<? super Long> list = (List<? super Long>)(new LongGenerator(10,0).to(new ArrayList<Long>()));
for (int i=10;i>0;i--) {
assertEquals(new Long(i),list.get(10-i));
}
@@ -60,34 +60,34 @@ public class TestLongRange extends BaseF
@Test
public void testStepChecking() {
{
- new LongRange(2, 2, 0); // step of 0 is ok when range is empty
+ new LongGenerator(2, 2, 0); // step of 0 is ok when range is empty
}
{
- new LongRange(2, 2, 1); // positive step is ok when range is empty
+ new LongGenerator(2, 2, 1); // positive step is ok when range is empty
}
{
- new LongRange(2, 2, -1); // negative step is ok when range is empty
+ new LongGenerator(2, 2, -1); // negative step is ok when range is empty
}
{
- new LongRange(0, 1, 10); // big steps are ok
+ new LongGenerator(0, 1, 10); // big steps are ok
}
{
- new LongRange(1, 0, -10); // big steps are ok
+ new LongGenerator(1, 0, -10); // big steps are ok
}
try {
- new LongRange(0, 1, 0);
+ new LongGenerator(0, 1, 0);
fail("Expected IllegalArgumentException");
} catch(IllegalArgumentException e) {
// expected
}
try {
- new LongRange(0, 1, -1);
+ new LongGenerator(0, 1, -1);
fail("Expected IllegalArgumentException");
} catch(IllegalArgumentException e) {
// expected
}
try {
- new LongRange(0, -1, 1);
+ new LongGenerator(0, -1, 1);
fail("Expected IllegalArgumentException");
} catch(IllegalArgumentException e) {
// expected
@@ -96,59 +96,59 @@ public class TestLongRange extends BaseF
@Test
public void testObjectConstructor() {
- LongRange range = new LongRange(new Long(0), new Long(5));
+ LongGenerator range = new LongGenerator(new Long(0), new Long(5));
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
- range = new LongRange(new Integer(0), new Long(5), new Long(1));
+ range = new LongGenerator(new Integer(0), new Long(5), new Long(1));
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
}
@Test
public void testReverseStep() {
- LongRange range = new LongRange(10, 0, -2);
+ LongGenerator range = new LongGenerator(10, 0, -2);
assertEquals("[10, 8, 6, 4, 2]", range.toCollection().toString());
assertEquals("[10, 8, 6, 4, 2]", range.toCollection().toString());
}
@Test
public void testStep() {
- LongRange range = new LongRange(0, 10, 2);
+ LongGenerator range = new LongGenerator(0, 10, 2);
assertEquals("[0, 2, 4, 6, 8]", range.toCollection().toString());
assertEquals("[0, 2, 4, 6, 8]", range.toCollection().toString());
}
@Test
public void testForwardRange() {
- LongRange range = new LongRange(0, 5);
+ LongGenerator range = new LongGenerator(0, 5);
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
assertEquals("[0, 1, 2, 3, 4]", range.toCollection().toString());
}
@Test
public void testReverseRange() {
- LongRange range = new LongRange(5, 0);
+ LongGenerator range = new LongGenerator(5, 0);
assertEquals("[5, 4, 3, 2, 1]", range.toCollection().toString());
assertEquals("[5, 4, 3, 2, 1]", range.toCollection().toString());
}
@Test
public void testEdgeCase() {
- LongRange range = new LongRange(Long.MAX_VALUE - 3L, Long.MAX_VALUE);
+ LongGenerator range = new LongGenerator(Long.MAX_VALUE - 3L, Long.MAX_VALUE);
assertEquals("[9223372036854775804, 9223372036854775805, 9223372036854775806]", range.toCollection().toString());
assertEquals("[9223372036854775804, 9223372036854775805, 9223372036854775806]", range.toCollection().toString());
}
@Test
public void testEquals() {
- LongRange range = new LongRange(1, 5);
+ LongGenerator range = new LongGenerator(1, 5);
assertObjectsAreEqual(range, range);
- assertObjectsAreEqual(range, new LongRange(1, 5));
- assertObjectsAreEqual(range, new LongRange(1, 5, 1));
- assertObjectsAreEqual(range, new LongRange(new Integer(1), new Long(5)));
- assertObjectsAreEqual(range, new LongRange(new Long(1), new Short((short)5), new Long(1)));
- assertObjectsAreNotEqual(range, new LongRange(2, 5));
- assertObjectsAreNotEqual(range, new LongRange(1, 6));
- assertObjectsAreNotEqual(range, new LongRange(1, 5, 2));
+ assertObjectsAreEqual(range, new LongGenerator(1, 5));
+ assertObjectsAreEqual(range, new LongGenerator(1, 5, 1));
+ assertObjectsAreEqual(range, new LongGenerator(new Integer(1), new Long(5)));
+ assertObjectsAreEqual(range, new LongGenerator(new Long(1), new Short((short)5), new Long(1)));
+ assertObjectsAreNotEqual(range, new LongGenerator(2, 5));
+ assertObjectsAreNotEqual(range, new LongGenerator(1, 6));
+ assertObjectsAreNotEqual(range, new LongGenerator(1, 5, 2));
}
}
\ No newline at end of file