From 7da213429d39ddcbd281d293c632efb5e3bf5e94 Mon Sep 17 00:00:00 2001 From: mpaauw Date: Fri, 10 Apr 2020 23:34:50 -0700 Subject: [PATCH 1/7] Add starcraft resources file, complete with character and planet names. --- src/main/resources/en/starcraft.yml | 235 ++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 src/main/resources/en/starcraft.yml diff --git a/src/main/resources/en/starcraft.yml b/src/main/resources/en/starcraft.yml new file mode 100644 index 00000000..dfc7adda --- /dev/null +++ b/src/main/resources/en/starcraft.yml @@ -0,0 +1,235 @@ +en: + faker: + starcraft: + characters: [ + "Abathur", + "Alarak", + "Aldaris", + "Amon", + "Artanis", + "Daggoth", + "Carolina Davis", + "Dehaka", + "Gerard DuGalle", + "Edmund", + "Duke", + "Samir Duran", + "Emil Narud", + "Fenix", + "Tychus Findlay", + "Ariel Hanson", + "Matt Horner", + "Izsha", + "Karax", + "Sarah Kerrigan", + "Arcturus Mengsk", + "Valerian Mengsk", + "Overmind", + "Raszagal", + "Jim Raynor", + "Reigel", + "Rohana", + "Selendis", + "Egon Stetmann", + "Alexei Stukov", + "Rory Swann", + "Talandar", + "Tassadar", + "Nova Terra", + "Gabriel Tosh", + "Vorazun", + "Horace Warfield", + "Zagara", + "Zasz", + "Zeratul", + "Zurvan" + ] + planets: [ + "Abaddon", + "Adena", + "Aeneas", + "Agria", + "Aiur", + "Alamar", + "Albion", + "Aleun", + "Alpha Draconis", + "Altara", + "Altheon", + "Anselm", + "Antiga Prime", + "Aridas", + "Artesia Prime", + "Artika", + "Ash'Arak", + "Ashrigo", + "Aspar", + "Asteria", + "Astrid III", + "Atrias", + "Atticus Minor", + "Avernus", + "Bel'Shir", + "Bellum IV", + "Beta Saul", + "Bhekar Ro", + "Boone", + "Borea", + "Bountiful", + "Braken", + "Braxis", + "Braxis Alpha", + "Brokas Hur", + "Brontes", + "Brontes IV", + "Bukari V", + "Calus", + "Candore", + "Cantar", + "Castanar", + "Cavir", + "Char", + "Chau Sara", + "Chiron", + "Planet Christmas", + "Cirion", + "Cruxas III", + "Dannuth VII", + "Dark planet", + "Dead Man's Rock", + "Demon's Fair", + "Dylar IV", + "Earth", + "Eldersthine", + "Exgelia IV", + "Feronis", + "Formicia", + "G-2275", + "Gamma Dorian", + "Gantris VI", + "Gantuan VI", + "Garrxax", + "Gelgaris", + "Glacius", + "Gohbus", + "Goldilocks", + "Great Bend", + "Grissom IV", + "Grnaki Prime", + "Gyras", + "Gystt", + "Halcyon", + "Haven", + "Heimdall IV", + "Helioc III", + "Helios", + "Hydrax", + "Icarus IV", + "Ignus", + "J'larre", + "Jarban Minor", + "Jontur II", + "Jotun", + "Ketill IV", + "Korhal", + "Krydon", + "Lakius", + "Lerilak Crest", + "Lorcadia", + "Luria IV", + "LV-555", + "Maltair IV", + "Mar Sara", + "Marek V", + "Marlowe", + "Mehlus IV", + "Meinhoff", + "Melkora", + "Midr IV", + "Miranar", + "Mistaff IV", + "Moria", + "Nelyth", + "Nemaka", + "Nephor II", + "New Folsom", + "New Sydney", + "New Trinidad", + "Nidhogg", + "Nidhogg III", + "Norris VI", + "Old Faithful", + "Onuru Sigma", + "Orna III", + "Paralta", + "Parragos", + "Pegasus", + "Phaeton", + "Pho-Rekh", + "Pike's Peak", + "Port Zion", + "Pridewater", + "Raydin III", + "Raydin IV", + "Redstone III", + "Revan II", + "Revera", + "Reynif II", + "Roxara", + "Saluset", + "Samiku", + "Sammy", + "Scoria", + "Seti", + "Shakuras", + "Shi", + "Shiloh", + "Sigmaris Prime", + "Sirocco", + "Slayn", + "Sonyan", + "Sorona", + "Sutur V", + "Swampus", + "Tal Qirat", + "Talvaria", + "TarKossia", + "Tarsonis", + "Tashai", + "Taurus IV", + "Tepperus", + "Thalon VII", + "Thanix III", + "Thys", + "Timul IV", + "Tiria", + "Torenis Prime", + "Torus", + "Turaxis II", + "Typhon XI", + "Tyrador VIII", + "Tyrador III", + "Tyrador IX", + "Uilel IV", + "Uilila IV", + "Ullalah II", + "Umoja", + "Urona Sigma", + "Van Osten's Moon", + "Vanass", + "Vardona", + "Veridia Prime", + "Vyctor 5", + "Vygoire", + "Warrant VI", + "Wotan II", + "Xil", + "XT39323", + "Ynoth", + "Zanadar Prime", + "Zenn", + "Zeph III", + "Zerus", + "Zhakul", + "Zz'gash" + ] From d9a2cec55b5e72238e8625841f3291df7bfcf1a1 Mon Sep 17 00:00:00 2001 From: mpaauw Date: Sun, 12 Apr 2020 09:49:11 -0700 Subject: [PATCH 2/7] Add units, buildings to resource file. --- src/main/resources/en/starcraft.yml | 117 ++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/src/main/resources/en/starcraft.yml b/src/main/resources/en/starcraft.yml index dfc7adda..22c890ac 100644 --- a/src/main/resources/en/starcraft.yml +++ b/src/main/resources/en/starcraft.yml @@ -1,6 +1,123 @@ en: faker: starcraft: + units: [ + "Archon", + "Carrier", + "Colossus", + "Dark Templar", + "High Templar", + "Immortal", + "Mothership", + "Observer", + "Phoenix", + "Probe", + "Sentry", + "Stalker", + "Void Ray", + "Warp Prism", + "Zealot", + "Oracle", + "Tempest", + "Mothership Core", + "Adept", + "Disruptor", + "Banshee", + "Battlecruiser", + "Ghost", + "Hellion", + "Marauder", + "Marine", + "Medivac Dropship", + "MULE", + "Raven", + "Reaper", + "SCV", + "Siege Tank", + "Thor", + "Viking", + "Auto-Turret", + "Point Defense Drone", + "Hellbat", + "Widow Mine", + "Liberator", + "Cyclone", + "Corruptor", + "Brood lord", + "Drone", + "Hydralisk", + "Infestor", + "Larva", + "Mutalisk", + "Overlord", + "Overseer", + "Queen", + "Roach", + "Ultralisk", + "Zergling", + "Baneling", + "Broodling", + "Changeling", + "Infested terran", + "Swarm Host", + "Viper", + "Lurker", + "Ravager" + ] + buildings: [ + "Assimilator", + "Cybernetics Core", + "Dark Shrine", + "Fleet Beacon", + "Forge", + "Gateway", + "Nexus", + "Photon Cannon", + "Pylon", + "Robotics Facility", + "Robotics Bay", + "Shield Battery", + "Stargate", + "Templar Archives", + "Twilight Council", + "Warp Gate", + "Armory", + "Barracks", + "Bunker", + "Command Center", + "Orbital Command", + "Planetary Fortress", + "Engineering Bay", + "Factory", + "Fusion Core", + "Ghost Academy", + "Missile turret", + "Refinery", + "Sensor Tower", + "Starport", + "Supply Depot", + "Reactor", + "Tech Lab", + "Baneling Nest", + "Creep Tumor", + "Evolution Chamber", + "Extractor", + "Hatchery", + "Lair", + "Hive", + "Hydralisk Den", + "Infestation Pit", + "Nydus Network", + "Nydus Worm", + "Roach Warren", + "Spawning Pool", + "Spine Crawler", + "Spire", + "Greater Spire", + "Spore Crawler", + "Ultralisk Cavern", + "Lurker Den" + ] characters: [ "Abathur", "Alarak", From 13434940d328e71917ec344da6e064399f15c791 Mon Sep 17 00:00:00 2001 From: mpaauw Date: Sun, 12 Apr 2020 09:49:39 -0700 Subject: [PATCH 3/7] Add starcraft.yml resource file reference. --- src/main/java/com/github/javafaker/service/files/EnFile.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/github/javafaker/service/files/EnFile.java b/src/main/java/com/github/javafaker/service/files/EnFile.java index 71c72cd5..6e9221cc 100644 --- a/src/main/java/com/github/javafaker/service/files/EnFile.java +++ b/src/main/java/com/github/javafaker/service/files/EnFile.java @@ -147,6 +147,7 @@ public class EnFile { "source.yml", "south_park.yml", "space.yml", + "starcraft.yml", "star_trek.yml", "star_wars.yml", "stargate.yml", From f32790fda746d730eeca50cefbe1d74899323c87 Mon Sep 17 00:00:00 2001 From: mpaauw Date: Sun, 12 Apr 2020 09:50:39 -0700 Subject: [PATCH 4/7] Add StarCraft content class, add utility methods to Faker. --- src/main/java/com/github/javafaker/Faker.java | 6 +++++ .../java/com/github/javafaker/StarCraft.java | 27 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 src/main/java/com/github/javafaker/StarCraft.java diff --git a/src/main/java/com/github/javafaker/Faker.java b/src/main/java/com/github/javafaker/Faker.java index 8942ee82..b952c13c 100644 --- a/src/main/java/com/github/javafaker/Faker.java +++ b/src/main/java/com/github/javafaker/Faker.java @@ -97,6 +97,7 @@ public class Faker { private final AquaTeenHungerForce aquaTeenHungerForce; private final ProgrammingLanguage programmingLanguage; private final Kaamelott kaamelott; + private final StarCraft starCraft; public Faker() { this(Locale.ENGLISH); @@ -203,6 +204,7 @@ public class Faker { this.aquaTeenHungerForce = new AquaTeenHungerForce(this); this.programmingLanguage = new ProgrammingLanguage(this); this.kaamelott = new Kaamelott(this); + this.starCraft = new StarCraft(this); } /** @@ -641,6 +643,10 @@ public class Faker { return kaamelott; } + public StarCraft starCraft() { + return starCraft; + } + public String resolve(String key) { return this.fakeValuesService.resolve(key, this, this); } diff --git a/src/main/java/com/github/javafaker/StarCraft.java b/src/main/java/com/github/javafaker/StarCraft.java new file mode 100644 index 00000000..e2a6fe05 --- /dev/null +++ b/src/main/java/com/github/javafaker/StarCraft.java @@ -0,0 +1,27 @@ +package com.github.javafaker; + +public class StarCraft { + + private final Faker faker; + + protected StarCraft(final Faker faker) { + this.faker = faker; + } + + public String unit() { + return faker.fakeValuesService().resolve("starcraft.units", this, faker); + } + + public String building() { + return faker.fakeValuesService().resolve("starcraft.buildings", this, faker); + } + + public String character() { + return faker.fakeValuesService().resolve("starcraft.characters", this, faker); + } + + public String planet() { + return faker.fakeValuesService().resolve("starcraft.planets", this, faker); + } + +} From 9050336b4431ee675493ffdb941225a394120228 Mon Sep 17 00:00:00 2001 From: mpaauw Date: Sun, 12 Apr 2020 09:50:57 -0700 Subject: [PATCH 5/7] Add unit tests for StarCraft fakes. --- .../com/github/javafaker/StarCraftTest.java | 43 +++++++++++++++++++ .../github/javafaker/integration/FakerIT.java | 1 + 2 files changed, 44 insertions(+) create mode 100644 src/test/java/com/github/javafaker/StarCraftTest.java diff --git a/src/test/java/com/github/javafaker/StarCraftTest.java b/src/test/java/com/github/javafaker/StarCraftTest.java new file mode 100644 index 00000000..1586dfa4 --- /dev/null +++ b/src/test/java/com/github/javafaker/StarCraftTest.java @@ -0,0 +1,43 @@ +package com.github.javafaker; + +import org.junit.Test; + +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; + +public class StarCraftTest extends AbstractFakerTest { + + private final String noLeadingTrailingWhitespaceRegex = "^(?! )[A-Za-z0-9 ]*(? Date: Sun, 12 Apr 2020 09:51:15 -0700 Subject: [PATCH 6/7] Update README.md with StarCraft into. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 607ae4a0..e71d9574 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ Fakers * Shakespeare * SlackEmoji * Space +* StarCraft * StarTrek * Stock * Superhero From e09c6d4d31b373f8e68fc6c8d00353b77d472730 Mon Sep 17 00:00:00 2001 From: mpaauw Date: Sun, 12 Apr 2020 09:55:37 -0700 Subject: [PATCH 7/7] Cleanup. --- src/test/java/com/github/javafaker/StarCraftTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/com/github/javafaker/StarCraftTest.java b/src/test/java/com/github/javafaker/StarCraftTest.java index 1586dfa4..a267356d 100644 --- a/src/test/java/com/github/javafaker/StarCraftTest.java +++ b/src/test/java/com/github/javafaker/StarCraftTest.java @@ -29,7 +29,6 @@ public class StarCraftTest extends AbstractFakerTest { String character = faker.starCraft().character(); assertThat(character, not(isEmptyOrNullString())); assertThat(character, matchesRegularExpression(noLeadingTrailingWhitespaceRegex)); - } @Test @@ -37,7 +36,6 @@ public class StarCraftTest extends AbstractFakerTest { String planet = faker.starCraft().planet(); assertThat(planet, not(isEmptyOrNullString())); assertThat(planet, matchesRegularExpression(noLeadingTrailingWhitespaceRegex)); - } }