fix missing max value of bounded

toxyduck · toxyduck · commit fe19604e9685 · 2019-11-03T16:03:31.000+03:00
diff --git a/core/src/main/java/fj/data/Enumerator.java b/core/src/main/java/fj/data/Enumerator.java
@@ -190,7 +190,7 @@ public Stream<A> toStream(final A a) {
    */
   public Stream<A> toStream(final Bounded<A> bounded) {
     final F<A, A> id = identity();
-    return Stream.fromFunction(this, id, bounded.min()).takeWhile(item -> !item.equals(bounded.max()));
+    return Stream.fromFunction(this, id, bounded.min()).takeWhile(item -> order.isLessThanOrEqualTo(item, bounded.max()));
   }
 
   /**
diff --git a/core/src/test/java/fj/MonoidTest.java b/core/src/test/java/fj/MonoidTest.java
@@ -29,7 +29,7 @@ public void intersection_monoid_test() {
     assertThat(actual, is(Set.set(Ord.intOrd, 3, 4)));
   }
 
-  @Test
+    @Test
   public void union_monoid_test() {
     Monoid<Set<Integer>> unionMonoid = Monoid.setMonoid(Ord.intOrd);
     Set<Integer> first = Set.set(Ord.intOrd, 1, 2, 3, 4);
@@ -42,7 +42,7 @@ public void union_monoid_test() {
   public void intersection_monoid_zero_test() {
     Bounded<Integer> integersBounded = Bounded.bounded(0, 10);
     Monoid<Set<Integer>> monoid = Monoid.setIntersectionMonoid(integersBounded, Enumerator.intEnumerator);
-    Set<Integer> set = Set.set(Ord.intOrd, 1, 2, 3, 4);
+    Set<Integer> set = Set.set(Ord.intOrd, 7, 8, 9, 10);
     Set<Integer> zero = monoid.zero();
     assertThat(monoid.sum(zero, set), is(set));
   }

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public Stream<A> toStream(final A a) {`
`190`	`190`	`*/`
`191`	`191`	`public Stream<A> toStream(final Bounded<A> bounded) {`
`192`	`192`	`final F<A, A> id = identity();`
`193`		`- return Stream.fromFunction(this, id, bounded.min()).takeWhile(item -> !item.equals(bounded.max()));`
	`193`	`+ return Stream.fromFunction(this, id, bounded.min()).takeWhile(item -> order.isLessThanOrEqualTo(item, bounded.max()));`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`/**`