add tests

repozoo · Sep 12, 2023 · d7208b3 · d7208b3
1 parent 4564227
commit d7208b3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/main/java/org/repozoo/commons/range/RangeSet.java b/src/main/java/org/repozoo/commons/range/RangeSet.java
@@ -19,14 +19,7 @@ default Stream<T> streamValues() {
     }
 
     default void forEachValue(Consumer<T> valueConsumer) {
-        streamRanges().forEach(r -> {
-            Value<T> max = r.maxValue();
-            Value<T> current = r.minValue();
-            while (current.compareTo(max) <= 0) {
-                valueConsumer.accept(current.value());
-                current = current.next();
-            }
-        });
+        streamValues().forEach(valueConsumer::accept);
     }
 
 

diff --git a/src/test/java/org/repozoo/commons/range/impl/LocalDateRangeTest.java b/src/test/java/org/repozoo/commons/range/impl/LocalDateRangeTest.java
@@ -6,6 +6,7 @@
 import org.repozoo.commons.range.factories.LocalDateRange;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -20,11 +21,25 @@ void streamValues_givesExpectedElements() {
         Range<LocalDate> vacationBayern = LocalDateRange.between(LocalDate.parse("2024-07-29"), LocalDate.parse("2024-09-09"));
         RangeSet<LocalDate> intersection = vacationBerlin.intersection(vacationBayern);
 
-        List<String> list = intersection.streamValues().map(LocalDate::toString).toList();
+        List<LocalDate> list = intersection.streamValues().toList();
 
         assertThat(list).hasSize(33);
-        assertThat(list).first().isEqualTo("2024-07-29");
-        assertThat(list).last().isEqualTo("2024-08-30");
+        assertThat(list).first().isEqualTo(LocalDate.parse("2024-07-29"));
+        assertThat(list).last().isEqualTo(LocalDate.parse("2024-08-30"));
+    }
+
+    @Test
+    void forEachValue_givesExpectedElements() {
+        Range<LocalDate> vacationBerlin = LocalDateRange.between(LocalDate.parse("2024-07-18"), LocalDate.parse("2024-08-30"));
+        Range<LocalDate> vacationBayern = LocalDateRange.between(LocalDate.parse("2024-07-29"), LocalDate.parse("2024-09-09"));
+        RangeSet<LocalDate> intersection = vacationBerlin.intersection(vacationBayern);
+        List<LocalDate> list = new ArrayList<>();
+
+        intersection.forEachValue(list::add);
+
+        assertThat(list).hasSize(33);
+        assertThat(list).first().isEqualTo(LocalDate.parse("2024-07-29"));
+        assertThat(list).last().isEqualTo(LocalDate.parse("2024-08-30"));
     }
 
     @Test