Merge pull request #1606 from datafaker-net/refactoring/base-faker-test

Author: kingthorin

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

@@ -19,7 +19,6 @@ protected LanguageCode(BaseProviders faker) {
      * @return a random 2-letter language code
      */
     public String iso639() {
-        int index = faker.random().nextInt(languages.length);
-        return languages[index];
+        return faker.options().option(languages);
     }
 }

src/test/java/net/datafaker/AbstractFakerTest.java

@@ -30,7 +30,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.reflections.scanners.Scanners.SubTypes;
 
-class FakerTest extends AbstractFakerTest {
+class FakerTest {
+    private final Faker faker = new Faker();
 
     @Test
     void examplifyUppercaseLetters() {
@@ -141,7 +142,7 @@ void badExpressionTooFewArgs() {
     }
 
     @Test
-    void badExpressionCouldntCoerce() {
+    void badExpressionCouldNotCoerce() {
         assertThatThrownBy(() -> faker.expression("#{number.number_between 'x','10'}"))
             .isInstanceOf(RuntimeException.class);
     }

src/test/java/net/datafaker/FakerTest.java

@@ -1,6 +1,5 @@
 package net.datafaker.formats;
 
-import net.datafaker.AbstractFakerTest;
 import net.datafaker.providers.base.BaseFaker;
 import net.datafaker.providers.base.Name;
 import net.datafaker.sequence.FakeSequence;
@@ -17,7 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-class CsvTest extends AbstractFakerTest {
+class CsvTest {
 
     @Test
     void csvTestNew() {

src/test/java/net/datafaker/formats/CsvTest.java

@@ -1,6 +1,5 @@
 package net.datafaker.idnumbers;
 
-import net.datafaker.AbstractFakerTest;
 import net.datafaker.providers.base.BaseFaker;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -10,7 +9,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class ChineseIdNumberTest extends AbstractFakerTest {
+class ChineseIdNumberTest {
     private final BaseFaker faker = new BaseFaker(new Locale("zh", "CN"));
 
     @RepeatedTest(10)

src/test/java/net/datafaker/idnumbers/ChineseIdNumberTest.java

@@ -1,14 +1,13 @@
 package net.datafaker.idnumbers;
 
-import net.datafaker.AbstractFakerTest;
 import net.datafaker.Faker;
 import org.junit.jupiter.api.RepeatedTest;
 
 import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class PortugueseIdNumberTest extends AbstractFakerTest {
+class PortugueseIdNumberTest {
     private final Faker ptFaker = new Faker(new Locale("pt", "PT"));
 
     @RepeatedTest(100)

src/test/java/net/datafaker/idnumbers/PortugueseIdNumberTest.java

@@ -22,9 +22,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-class AddressTest extends BaseFakerTest<BaseFaker> {
+class AddressTest {
 
-    private final char decimalSeparator = new DecimalFormatSymbols(getFaker().getContext().getLocale()).getDecimalSeparator();
+    private final Faker faker = new Faker();
+    private final char decimalSeparator = new DecimalFormatSymbols(faker.getContext().getLocale()).getDecimalSeparator();
     private static final Faker US_FAKER = new Faker(new Locale("en", "US"));
     private static final Faker NL_FAKER = new Faker(new Locale("nl", "NL"));
     private static final Faker BELGIAN_FAKER = new Faker(new Locale("nl", "BE"));
@@ -174,7 +175,7 @@ void fullAddress_estonia() {
     }
 
     @Test
-    void eircode_ireland() {
+    void eirCode_ireland() {
         BaseFaker f = new BaseFaker(new Locale("en", "IE"));
         assertThat(f.address().eircode()).isNotEmpty();
     }
@@ -197,7 +198,7 @@ void testCountyByZipCode() {
         assertThat(localFaker.address().countyByZipCode("47732")).isNotEmpty();
     }
 
-    Collection<String> argentineZipCodesSource() {
+    static Collection<String> argentineZipCodesSource() {
         return Stream.generate(() -> new BaseFaker(Locale.forLanguageTag("es-AR")).address().zipCode())
             .distinct().limit(4025)
             .collect(Collectors.toSet());

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

@@ -1,11 +1,9 @@
 package net.datafaker.providers.base;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Nested;
 
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 
 class AncientTest extends BaseFakerTest<BaseFaker> {
@@ -28,14 +26,9 @@ protected Collection<TestSpec> providerListTest() {
     @Nested
     class AncientInGreekTest extends BaseFakerTest<BaseFaker> {
 
-        @BeforeAll
-        void setup() {
-            this.setFaker(new BaseFaker(new Locale("el", "GR")));
-        }
-
-        @AfterAll
-        void reset() {
-            this.setFaker(this.getFaker());
+        @Override
+        protected BaseFaker getFaker() {
+            return new BaseFaker(new Locale("el", "GR"));
         }
 
         @Override

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

@@ -58,7 +58,9 @@ void testRegion() {
     @Override
     protected Collection<TestSpec> providerListTest() {
         Aws aws = faker.aws();
-        return List.of(TestSpec.of(aws::service, "aws.services"));
+        return List.of(
+            TestSpec.of(aws::region, "aws.regions"),
+            TestSpec.of(aws::service, "aws.services")
+        );
     }
-
 }

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

@@ -1,10 +1,12 @@
 package net.datafaker.providers.base;
 
+import net.datafaker.Faker;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class AzureTest extends BaseFakerTest<BaseFaker> {
+class AzureTest {
+    private final Faker faker = new Faker();
 
     @Test
     void testRegion() {
@@ -161,7 +163,7 @@ void testKeyVault() {
     void testLogAnalytics() {
         assertThat(faker.azure().logAnalytics()).matches("^log-[0-9a-f]{16}$");
     }
-    
+
     @Test
     void testSpringApps() {
         assertThat(faker.azure().springApps()).matches("^sa-[0-9a-f]{16}$");