GP-39 fun-prime-numbers

* update task description
* fix tests

Author: tboychuk

5-0-functional-programming/5-4-1-fun-prime-numbers/src/main/java/com/bobocode/fp/OOSumOfPrimes.java

@@ -2,9 +2,9 @@
 
 /**
  * This examples demonstrates how to calculate the sum of prime numbers using Object-Oriented approach.
- * Please note that that in order to perform this calculation in OOP-style we have to use mutable variables
- * (e.g. sumOfPrimes, i, primes). I'll also notice that implementing the same functionality in a functional style
- * using Steam API and lambdas, you will not create and modify variables.
+ * Please note that in order to perform this calculation in OOP-style we have to use mutable variables
+ * (e.g. sumOfPrimes, i, primes). Implementing the same functionality in a functional style using Steam API and lambdas,
+ * you will not create and/or modify variables.
  */
 public class OOSumOfPrimes {
     public static void main(String[] args) {

5-0-functional-programming/5-4-1-fun-prime-numbers/src/main/java/com/bobocode/fp/PrimeNumbers.java

@@ -6,7 +6,8 @@
 import java.util.function.IntConsumer;
 
 /**
- * {@link PrimeNumbers} provides an API to work with prime numbers. It is using a stream of prime numbers.
+ * {@link PrimeNumbers} provides an API to work with prime numbers. The implementation is based on the
+ * {@link java.util.stream.IntStream} of prime numbers. That stream is used in all public methods on this class.
  * <p>
  * See {@link OOSumOfPrimes} for a reference
  */
@@ -38,7 +39,7 @@ public static List<Integer> collect(int n) {
     /**
      * Find a prime number by index and then applies a provided consumer passing found prime number
      *
-     * @param idx      the position of a prime number (index)
+     * @param idx      the position of a prime number (index), starting from 0
      * @param consumer a logic that should be applied to the found prime number
      */
     public static void processByIndex(int idx, IntConsumer consumer) {

5-0-functional-programming/5-4-1-fun-prime-numbers/src/test/java/com/bobocode/fp/PrimeNumbersTest.java

@@ -1,5 +1,8 @@
 package com.bobocode.fp;
 
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -12,16 +15,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class PrimeNumbersTest {
 
+    @Order(1)
     @ParameterizedTest
-    @CsvSource({"0,0", "1,2", "2,5", "3,10", "4,17", "5,28", "10,129", "20,639"})
+    @CsvSource({"0, 0", "1, 2", "2, 5", "3, 10", "4, 17", "5, 28", "10, 129", "20, 639"})
     void sum(int n, int sumOfPrimes) {
         int result = PrimeNumbers.sum(n);
 
         assertThat(result).isEqualTo(sumOfPrimes);
     }
 
+    @Order(2)
     @ParameterizedTest
     @MethodSource("collectArgs")
     void collect(int n, List<Integer> primeNumbersList) {
@@ -30,9 +36,9 @@ void collect(int n, List<Integer> primeNumbersList) {
         assertThat(result).isEqualTo(primeNumbersList);
     }
 
-
+    @Order(3)
     @ParameterizedTest
-    @CsvSource({"1,1", "2,2", "3,3", "4,5", "5,7", "10,23", "20,67"})
+    @CsvSource({"0, 2", "1, 3", "2, 5", "3, 7", "10, 31", "20, 73", "279, 1811"})
     void processByIndexFindsCorrectPrimeNumber(int index, int primeNumber) {
         var list = new ArrayList<>();
 
@@ -43,12 +49,12 @@ void processByIndexFindsCorrectPrimeNumber(int index, int primeNumber) {
 
     static Stream<Arguments> collectArgs() {
         return Stream.of(
-                arguments(1, List.of(1)),
-                arguments(2, List.of(1, 2)),
-                arguments(3, List.of(1, 2, 3)),
-                arguments(4, List.of(1, 2, 3, 5)),
-                arguments(5, List.of(1, 2, 3, 5, 7)),
-                arguments(10, List.of(1, 2, 3, 5, 7, 11, 13, 17, 19, 23))
+                arguments(1, List.of(2)),
+                arguments(2, List.of(2, 3)),
+                arguments(3, List.of(2, 3, 5)),
+                arguments(4, List.of(2, 3, 5, 7)),
+                arguments(5, List.of(2, 3, 5, 7, 11)),
+                arguments(10, List.of(2, 3, 5, 7, 11, 13, 17, 19, 23, 29))
         );
     }
 }