Refactoring (#1569)

* [refactor] simplify CommerceTest

the `decimalSeparator` is always '.' - by inlining it, we make the regex in test much simpler.

* [refactor] fix IDE warnings in ProviderGenerator

* [refactor] remove redundant suppression in Range.java

* [refactor] Use FileSystems.getSeparator() instead of 'System.getProperty'

* [refactor] mark test fields final

to avoid the potential risk that some test might modify the field value thus affecting other tests.

* [refactor] simplify FakeValuesGroupingTest

initialize test fields right in the field declaration line. The makes unneeded `@BeforeEach` method.

Author: asolntsev

src/main/java/net/datafaker/providers/base/File.java

@@ -1,5 +1,7 @@
 package net.datafaker.providers.base;
 
+import java.nio.file.FileSystems;
+
 /**
  * @since 0.8.0
  */
@@ -22,7 +24,7 @@ public String fileName() {
     }
 
     public String fileName(String dirOrNull, String nameOrNull, String extensionOrNull, String separatorOrNull) {
-        final String sep = separatorOrNull == null ? System.getProperty("file.separator") : separatorOrNull;
+        final String sep = separatorOrNull == null ? FileSystems.getDefault().getSeparator() : separatorOrNull;
         final String dir = dirOrNull == null ? faker.internet().slug() : dirOrNull;
         final String name = nameOrNull == null ? faker.lorem().word().toLowerCase(faker.getContext().getLocale()) : nameOrNull;
         final String ext = extensionOrNull == null ? extension() : extensionOrNull;

src/main/java/net/datafaker/service/FakeValuesGrouping.java

@@ -9,7 +9,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-public class FakeValuesGrouping implements FakeValuesInterface {
+public final class FakeValuesGrouping implements FakeValuesInterface {
     private static final FakeValuesGrouping ENGLISH_FAKE_VALUE_GROUPING = new FakeValuesGrouping();
     private final Map<String, Collection<FakeValuesInterface>> fakeValues = new HashMap<>();
 
@@ -19,6 +19,13 @@ public class FakeValuesGrouping implements FakeValuesInterface {
         });
     }
 
+    public FakeValuesGrouping() {
+    }
+
+    public FakeValuesGrouping(FakeValues values) {
+        add(values);
+    }
+
     public void add(FakeValuesInterface fakeValue) {
         if (fakeValue instanceof FakeValues) {
             ((FakeValues) fakeValue).getPaths().forEach(p ->

src/main/java/net/datafaker/service/Range.java

@@ -58,7 +58,6 @@ public static <T extends Comparable<T>> Range<T> exclusiveInclusive(T from, T to
         return new Range<>(new Bound<>(from, End.EXCLUSIVE), new Bound<>(to, End.INCLUSIVE));
     }
 
-    @SuppressWarnings("unchecked")
     public <V extends Comparable<V>> Range<V> cast(Function<T, V> caster) {
         return new Range<>(
             new Bound<>(caster.apply(from.value), from.end),

src/test/java/net/datafaker/providers/base/CommerceTest.java

@@ -2,16 +2,14 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.text.DecimalFormatSymbols;
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 
+import static java.lang.Float.parseFloat;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class CommerceTest extends BaseFakerTest<BaseFaker> {
 
-    private final char decimalSeparator = new DecimalFormatSymbols(getFaker().getContext().getLocale()).getDecimalSeparator();
-
     private static final String CAPITALIZED_WORD_REGEX = "[A-Z][a-z]+";
 
     private static final String PROMOTION_CODE_REGEX = CAPITALIZED_WORD_REGEX + "(-" + CAPITALIZED_WORD_REGEX + ")*";
@@ -37,12 +35,20 @@ protected Collection<TestSpec> providerListTest() {
 
     @Test
     void testPrice() {
-        assertThat(commerce.price()).matches("\\d{1,3}\\" + decimalSeparator + "\\d{2}");
+        String price = commerce.price();
+        assertThat(price)
+            .as("random price between 0.00 and 100.00")
+            .matches("\\d{1,3}\\.\\d{2}");
+        assertThat(parseFloat(price)).isBetween(0f, 100f);
     }
 
     @Test
     void testPriceMinMax() {
-        assertThat(commerce.price(100, 1000)).matches("\\d{3,4}\\" + decimalSeparator + "\\d{2}");
+        String price = commerce.price(100, 1000);
+        assertThat(price)
+            .as("random price between 100.00 and 1000.00")
+            .matches("\\d{3,4}\\.\\d{2}");
+        assertThat(parseFloat(price)).isBetween(100f, 1000f);
     }
 
     @Test

src/test/java/net/datafaker/providers/base/ComputerTest.java

@@ -9,7 +9,7 @@
 
 class ComputerTest extends BaseFakerTest<BaseFaker> {
 
-    Computer computer = faker.computer();
+    private final Computer computer = faker.computer();
 
     @Test
     void testOperatingSystem() {

src/test/java/net/datafaker/providers/base/CountryTest.java

@@ -10,7 +10,7 @@
 
 class CountryTest extends BaseFakerTest<BaseFaker> {
 
-    Country country = faker.country();
+    private final Country country = faker.country();
 
     @RepeatedTest(10)
     void testFlag() {

src/test/java/net/datafaker/providers/base/NationTest.java

@@ -6,7 +6,7 @@
 
 class NationTest extends BaseFakerTest<BaseFaker> {
 
-    Nation nation = faker.nation();
+    private final Nation nation = faker.nation();
 
     @Test
     void nationality() {

src/test/java/net/datafaker/providers/base/RandomFakerTest.java

@@ -1,6 +1,5 @@
 package net.datafaker.providers.base;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.Random;
@@ -10,14 +9,8 @@
 class RandomFakerTest extends BaseFakerTest<BaseFaker> {
 
     private static final int CONSTANT_SEED_VALUE = 10;
-    private BaseFaker faker;
-    private Random random;
-
-    @BeforeEach
-    final void before() {
-        random = new Random();
-        faker = new BaseFaker(random);
-    }
+    private final Random random = new Random();
+    private final BaseFaker faker = new BaseFaker(random);
 
     @Test
     void testNumerifyRandomnessCanBeControlled() {

src/test/java/net/datafaker/providers/base/ScienceTest.java

@@ -9,7 +9,7 @@
 
 class ScienceTest extends BaseFakerTest<BaseFaker> {
 
-    Science science = faker.science();
+    private final Science science = faker.science();
 
     @Override
     protected Collection<TestSpec> providerListTest() {

src/test/java/net/datafaker/providers/base/SipTest.java

@@ -6,7 +6,7 @@
 
 class SipTest extends BaseFakerTest<BaseFaker> {
 
-    Sip sip = faker.sip();
+    private final Sip sip = faker.sip();
 
     @Test
     void method_returnUpperCaseWithMinimum3Chars() {