fix tests

jartysiewicz · Sep 11, 2015 · 66e67db · 66e67db
1 parent a1eadfd
commit 66e67db
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/cyclops-sequence-api/src/main/java/com/aol/cyclops/sequence/Monoid.java b/cyclops-sequence-api/src/main/java/com/aol/cyclops/sequence/Monoid.java
@@ -76,7 +76,7 @@ default T mapReduce(Stream toReduce){
 		return reduce(mapToType(toReduce));
 	}
 	default T reduce(Stream<T> toReduce){
-		return toReduce.reduce(reducer()).orElse(zero());
+		return toReduce.reduce(zero(),reducer());
 	}
 
 	public static <T> Monoid<T> of(T zero, Function<T,Function<T,T>> combiner,Function<?,T> mapToType){

diff --git a/cyclops-streams/src/main/java/com/aol/cyclops/streams/operators/BatchWhileOperator.java b/cyclops-streams/src/main/java/com/aol/cyclops/streams/operators/BatchWhileOperator.java
@@ -41,10 +41,19 @@ public C next() {
 				C list = factory.get();
 				if(value!=UNSET)
 					list.add(value);
-				while(it.hasNext() && predicate.test(value=it.next())){
-					list.add(value);
-					value=(T)UNSET;
-				}
+				T value;
+
+label:					while(it.hasNext()) {
+							value=it.next();
+							list.add(value);
+
+							if(!predicate.test(value)){
+								value=(T)UNSET;
+								break label;
+							}
+							value=(T)UNSET;
+
+					}
 				return list;
 			}
 

diff --git a/cyclops-streams/src/test/java/com/aol/cyclops/streams/BatchingTest.java b/cyclops-streams/src/test/java/com/aol/cyclops/streams/BatchingTest.java
@@ -45,7 +45,7 @@ public void batchWhile(){
 				.size(),equalTo(2));
 		assertThat(SequenceM.of(1,2,3,4,5,6)
 				.batchWhile(i->i%3!=0)
-				.toList(),equalTo(Arrays.asList(1,2,3)));
+				.toList(),equalTo(Arrays.asList(Arrays.asList(1,2,3),Arrays.asList(4,5,6))));
 	}
 	@Test
 	public void batchUntilCollection(){
@@ -63,7 +63,7 @@ public void batchWhileCollection(){
 				.toList().size(),equalTo(2));
 		assertThat(SequenceM.of(1,2,3,4,5,6)
 				.batchWhile(i->i%3!=0,()->new ArrayList<>())
-				.toList(),equalTo(Arrays.asList(1,2,3)));
+				.toList(),equalTo(Arrays.asList(Arrays.asList(1,2,3),Arrays.asList(4,5,6))));
 	}
 	@Test
 	public void batchByTime2(){

diff --git a/cyclops-streams/src/test/java/com/aol/cyclops/streams/FlatMapSequenceMTest.java b/cyclops-streams/src/test/java/com/aol/cyclops/streams/FlatMapSequenceMTest.java
@@ -29,7 +29,7 @@ public void flatMapCollection(){
 	}
 	@Test
 	public void flatMapCollectionAnyM(){
-	assertThat(	anyM(Optional.of(20)).flatMapCollection(i->Arrays.asList(1,2,i) ).asSequence().toList(),equalTo(Arrays.asList(1,2,20)));
+	assertThat(	anyM(Optional.of(20)).flatMapCollection(i->Arrays.asList(1,2,i) ).toSequence().toList(),equalTo(Arrays.asList(1,2,20)));
 	}
 	@Test
 	public void flatMapToSeq(){