Parameterized tests for BasicFactorsMap

Author: ref-humbold

src/test/java/com/github/refhumbold/algolib/text/BasicFactorsMapTest.java

@@ -1,14 +1,13 @@
 package com.github.refhumbold.algolib.text;
 
-import java.util.List;
-import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import com.github.refhumbold.algolib.tuples.Pair;
 
 // Tests: Structure of basic factors map using Karp-Miller-Rosenberg algorithm.
@@ -23,7 +22,7 @@ public void setUp()
     }
 
     @ParameterizedTest
-    @MethodSource("paramsFor_GetCode_WhenRange")
+    @MethodSource("paramsFor_getCode_WhenRange")
     public void getCode_WhenRange_ThenCode(
             int startIndex,
             Integer endIndex,
@@ -52,33 +51,35 @@ public void getCode_WhenStartIndexGreaterThanEndIndex_ThenIllegalArgumentExcepti
                   .isInstanceOf(IllegalArgumentException.class);
     }
 
-    @Test
-    public void getCode_WhenInvalidStartIndex_ThenIndexOutOfRangeException()
+    @ParameterizedTest
+    @ValueSource(ints = { -1, 22 })
+    public void getCode_WhenInvalidStartIndex_ThenIndexOutOfRangeException(int index)
     {
-        Assertions.assertThatThrownBy(() -> testObject.getCode(-1))
+        Assertions.assertThatThrownBy(() -> testObject.getCode(index))
                   .isInstanceOf(IndexOutOfBoundsException.class);
     }
 
-    @Test
-    public void getCode_WhenInvalidEndIndex_ThenIndexOutOfRangeException()
+    @ParameterizedTest
+    @MethodSource("paramsFor_getCode_WhenInvalidStartAndEndIndices")
+    public void getCode_WhenInvalidStartAndEndIndices_ThenIndexOutOfRangeException(
+            int startIndex,
+            int endIndex)
     {
-        Assertions.assertThatThrownBy(() -> testObject.getCode(5, 15))
+        Assertions.assertThatThrownBy(() -> testObject.getCode(startIndex, endIndex))
                   .isInstanceOf(IndexOutOfBoundsException.class);
     }
 
-    private static Stream<Arguments> paramsFor_GetCode_WhenRange()
+    private static Stream<Arguments> paramsFor_getCode_WhenInvalidStartAndEndIndices()
     {
-        Integer[][] indices = {
-                { 0, 1 }, { 0, 3 }, { 0, null }, { 1, 2 }, { 3, 4 }, { 3, 7 }, { 4, 6 },
-                { 7, null }, { 8, 9 }, { 8, 10 }
-        };
-        List<Pair<Integer, Integer>> expectedResults =
-                Stream.of(Pair.of(2, 0), Pair.of(7, 6), Pair.of(20, 21), Pair.of(1, 0),
-                        Pair.of(4, 0), Pair.of(16, 0), Pair.of(6, 0), Pair.of(12, 0), Pair.of(3, 0),
-                        Pair.of(9, 0)).toList();
+        return Stream.of(Arguments.of(5, 15), Arguments.of(18, 28), Arguments.of(-3, 3));
+    }
 
-        return IntStream.range(0, indices.length)
-                        .mapToObj(i -> Arguments.of(indices[i][0], indices[i][1],
-                                expectedResults.get(i)));
+    private static Stream<Arguments> paramsFor_getCode_WhenRange()
+    {
+        return Stream.of(Arguments.of(0, 1, Pair.of(2, 0)), Arguments.of(0, 3, Pair.of(7, 6)),
+                Arguments.of(0, null, Pair.of(20, 21)), Arguments.of(1, 2, Pair.of(1, 0)),
+                Arguments.of(3, 4, Pair.of(4, 0)), Arguments.of(3, 7, Pair.of(16, 0)),
+                Arguments.of(4, 6, Pair.of(6, 0)), Arguments.of(7, null, Pair.of(12, 0)),
+                Arguments.of(8, 9, Pair.of(3, 0)), Arguments.of(8, 10, Pair.of(9, 0)));
     }
 }