From f292ca1770cd9330a0a5866ff623ccbc5f2e22e4 Mon Sep 17 00:00:00 2001 From: David Ogar Date: Thu, 3 Mar 2022 15:38:12 +0100 Subject: [PATCH 1/5] added Nigeria to the list --- README.md | 1 + nigeria.yml | 0 src/main/java/net/datafaker/Nigeria.java | 35 ++++++++++++++++++++ src/test/java/net/datafaker/NigeriaTest.java | 20 +++++++++++ 4 files changed, 56 insertions(+) create mode 100644 nigeria.yml create mode 100644 src/main/java/net/datafaker/Nigeria.java create mode 100644 src/test/java/net/datafaker/NigeriaTest.java diff --git a/README.md b/README.md index 426336610..391adb828 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,7 @@ Providers * Music * Name * Nation +* Nigeria * Number * Options * Overwatch diff --git a/nigeria.yml b/nigeria.yml new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/java/net/datafaker/Nigeria.java b/src/main/java/net/datafaker/Nigeria.java new file mode 100644 index 000000000..019bd6df1 --- /dev/null +++ b/src/main/java/net/datafaker/Nigeria.java @@ -0,0 +1,35 @@ +package net.datafaker.service; + +import net.datafaker.Faker; + +public class Nigeria { + + private final Faker faker; + + public Nigeria(Faker faker) { + this.faker = faker; + } + + public String places() { + return faker.resolve("nigeria.places"); + } + + public String name() { + return faker.resolve("nigeria.name"); + } + + public String food() { + return faker.resolve("nigeria.food"); + } + + public String schools() { + return faker.resolve("nigeria.schools"); + } + + public String celebrities(){ + return faker.resolve("nigeria.celebrities"); + } +} + + + diff --git a/src/test/java/net/datafaker/NigeriaTest.java b/src/test/java/net/datafaker/NigeriaTest.java new file mode 100644 index 000000000..c0cfea7b0 --- /dev/null +++ b/src/test/java/net/datafaker/NigeriaTest.java @@ -0,0 +1,20 @@ +package net.datafaker.service; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class NigeriaTest { + + @Test + void location() { + } + + @Test + void food() { + } + + @Test + void names() { + } +} From 8862cf189fce5f763a85833e69c1f9304d7d4fde Mon Sep 17 00:00:00 2001 From: David Ogar Date: Thu, 3 Mar 2022 15:40:01 +0100 Subject: [PATCH 2/5] Added Nigeria to the list of providers --- nigeria.yml | 0 src/main/java/net/datafaker/Faker.java | 4 ++++ src/main/java/net/datafaker/Nigeria.java | 20 +++++++++------- .../java/net/datafaker/AustraliaTest.java | 3 +-- src/test/java/net/datafaker/NigeriaTest.java | 24 +++++++++++++++---- 5 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 nigeria.yml diff --git a/nigeria.yml b/nigeria.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/java/net/datafaker/Faker.java b/src/main/java/net/datafaker/Faker.java index 2623ba4e0..87697f567 100644 --- a/src/main/java/net/datafaker/Faker.java +++ b/src/main/java/net/datafaker/Faker.java @@ -536,6 +536,10 @@ public NatoPhoneticAlphabet natoPhoneticAlphabet() { return getProvider(NatoPhoneticAlphabet.class, () -> new NatoPhoneticAlphabet(this)); } + public Nigeria nigeria() { + return getProvider(Nigeria.class, () -> new Nigeria(this)); + } + public Number number() { return getProvider(Number.class, () -> new Number(this)); } diff --git a/src/main/java/net/datafaker/Nigeria.java b/src/main/java/net/datafaker/Nigeria.java index 019bd6df1..ccf82518c 100644 --- a/src/main/java/net/datafaker/Nigeria.java +++ b/src/main/java/net/datafaker/Nigeria.java @@ -1,33 +1,35 @@ -package net.datafaker.service; +package net.datafaker; -import net.datafaker.Faker; +import java.nio.file.Paths; +import java.util.Locale; public class Nigeria { - + private static final String KEY = "nigeria"; private final Faker faker; - public Nigeria(Faker faker) { + protected Nigeria(Faker faker) { this.faker = faker; + faker.fakeValuesService().addPath(Locale.ENGLISH, Paths.get("target/classes/en/nigeria.yml")); } public String places() { - return faker.resolve("nigeria.places"); + return faker.fakeValuesService().resolve("nigeria.places", this, faker); } public String name() { - return faker.resolve("nigeria.name"); + return faker.fakeValuesService().resolve("nigeria.name", this, faker); } public String food() { - return faker.resolve("nigeria.food"); + return faker.fakeValuesService().resolve("nigeria.food", this, faker); } public String schools() { - return faker.resolve("nigeria.schools"); + return faker.fakeValuesService().resolve("nigeria.schools", this, faker); } public String celebrities(){ - return faker.resolve("nigeria.celebrities"); + return faker.fakeValuesService().resolve("nigeria.celebrities", this, faker); } } diff --git a/src/test/java/net/datafaker/AustraliaTest.java b/src/test/java/net/datafaker/AustraliaTest.java index 0f7645519..d2e28c6b3 100644 --- a/src/test/java/net/datafaker/AustraliaTest.java +++ b/src/test/java/net/datafaker/AustraliaTest.java @@ -9,8 +9,7 @@ public class AustraliaTest extends AbstractFakerTest { @Test - public void locations() { - assertThat(faker.australia().locations(), not(is(emptyOrNullString()))); + public void locations() { assertThat(faker.australia().locations(), not(is(emptyOrNullString()))); } @Test diff --git a/src/test/java/net/datafaker/NigeriaTest.java b/src/test/java/net/datafaker/NigeriaTest.java index c0cfea7b0..4422d8983 100644 --- a/src/test/java/net/datafaker/NigeriaTest.java +++ b/src/test/java/net/datafaker/NigeriaTest.java @@ -1,20 +1,36 @@ -package net.datafaker.service; +package net.datafaker; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; -class NigeriaTest { + +class NigeriaTest extends AbstractFakerTest{ @Test - void location() { + public void places() { + assertThat(faker.nigeria().places(), not(is(emptyOrNullString()))); } + @Test void food() { + assertThat(faker.nigeria().food(), not(is(emptyOrNullString()))); } @Test void names() { + assertThat(faker.nigeria().name(), not(is(emptyOrNullString()))); + } + + @Test + void schools() { + assertThat(faker.nigeria().celebrities(), not(is(emptyOrNullString()))); + } + + @Test + void celebrities() { + assertThat(faker.nigeria().celebrities(), not(is(emptyOrNullString()))); } } From 7e148153fcf5e57a4fe667faf75781c329c4a5e3 Mon Sep 17 00:00:00 2001 From: David Ogar Date: Thu, 3 Mar 2022 18:48:53 +0100 Subject: [PATCH 3/5] added suggested changes --- src/main/java/net/datafaker/Nigeria.java | 2 +- src/main/resources/en/nigeria.yml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/en/nigeria.yml diff --git a/src/main/java/net/datafaker/Nigeria.java b/src/main/java/net/datafaker/Nigeria.java index ccf82518c..9740a3ca1 100644 --- a/src/main/java/net/datafaker/Nigeria.java +++ b/src/main/java/net/datafaker/Nigeria.java @@ -9,7 +9,7 @@ public class Nigeria { protected Nigeria(Faker faker) { this.faker = faker; - faker.fakeValuesService().addPath(Locale.ENGLISH, Paths.get("target/classes/en/nigeria.yml")); + faker.fakeValuesService().addPath(Locale.ENGLISH, Paths.get("src/main/resources/en/nigeria.yml")); } public String places() { diff --git a/src/main/resources/en/nigeria.yml b/src/main/resources/en/nigeria.yml new file mode 100644 index 000000000..7a6558711 --- /dev/null +++ b/src/main/resources/en/nigeria.yml @@ -0,0 +1,8 @@ +en: + faker: + nigeria: + places: ["Lagos", "Warri", "Enugu", "Abuja", "Calabar", "Ogoja", "Ogun", "Uyo", "Abia", "Illorin", "Ediba", "Ikot-ekpene", "Abak", "Itu", "Yala", "Sokoto", "Kaduna", "Kano", "kastina"] + name: ["Bayo", "Akpan", "Itunu", "Kevwe", "Oteri", "Ogun", "Imaobong", "Okon", "Uwem", "Eze", "Lovina", "Rekpene", "Uduak", "Ada", "Abasifreke", "Odachi", "Bello", "Dangote", "Buhari"] + food: ["Rice", "Bean", "Edikan-Ikong", "Banga-soup", "Ewedu and Amala", "Afang", "Oha-soup", "Atama", "Bitter-leaf soup", "Garri", "Kuli-Kuli"] + schools: ["FUPRE", "UNI-UYO", "UNICAL", "UNIPORT", "UNIABUJA", "DELSU", "MADONNA", "CRUTECH", "UNILAG", "UNIBEN", "AKSU", "UNN", "EBSU", "COVENANT", "LANDMARK"] + celebrities: ["Davido", "Wizkid", "Burnaboy", "Skibii", "Adekunle Gold", "Nse-Ikpe Etim", "The Lady Motara", "HackSultan", "David Hundeyi", "Tunde", "El-rufai", "Goodluck Jonathan", "Buhari", "Obasanjo"] From e4b3f28d16914af9fd1796e90609d39e4c19b945 Mon Sep 17 00:00:00 2001 From: Davidhero Date: Thu, 3 Mar 2022 18:56:23 +0100 Subject: [PATCH 4/5] Made format changes --- src/test/java/net/datafaker/AustraliaTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/net/datafaker/AustraliaTest.java b/src/test/java/net/datafaker/AustraliaTest.java index d2e28c6b3..6669e9e78 100644 --- a/src/test/java/net/datafaker/AustraliaTest.java +++ b/src/test/java/net/datafaker/AustraliaTest.java @@ -13,13 +13,11 @@ public class AustraliaTest extends AbstractFakerTest { } @Test - public void animals() { - assertThat(faker.australia().animals(), not(is(emptyOrNullString()))); + public void animals() { assertThat(faker.australia().animals(), not(is(emptyOrNullString()))); } @Test - public void states() { - assertThat(faker.australia().states(), not(is(emptyOrNullString()))); + public void states() { assertThat(faker.australia().states(), not(is(emptyOrNullString()))); } } From 7eecee766564df375cc2e413cf0a899a5cf1b91f Mon Sep 17 00:00:00 2001 From: David Ogar Date: Thu, 3 Mar 2022 19:00:55 +0100 Subject: [PATCH 5/5] corrected format changes --- src/test/java/net/datafaker/AustraliaTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/net/datafaker/AustraliaTest.java b/src/test/java/net/datafaker/AustraliaTest.java index d2e28c6b3..de2128151 100644 --- a/src/test/java/net/datafaker/AustraliaTest.java +++ b/src/test/java/net/datafaker/AustraliaTest.java @@ -13,8 +13,7 @@ public class AustraliaTest extends AbstractFakerTest { } @Test - public void animals() { - assertThat(faker.australia().animals(), not(is(emptyOrNullString()))); + public void animals() { assertThat(faker.australia().animals(), not(is(emptyOrNullString()))); } @Test