Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

StarCraft Faker #491

Merged
merged 8 commits into from
Aug 19, 2020
Merged

StarCraft Faker #491

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7da2134
Add starcraft resources file, complete with character and planet names.
mpaauw Apr 11, 2020
d9a2cec
Add units, buildings to resource file.
mpaauw Apr 12, 2020
1343494
Add starcraft.yml resource file reference.
mpaauw Apr 12, 2020
f32790f
Add StarCraft content class, add utility methods to Faker.
mpaauw Apr 12, 2020
9050336
Add unit tests for StarCraft fakes.
mpaauw Apr 12, 2020
699d2e5
Update README.md with StarCraft into.
mpaauw Apr 12, 2020
e09c6d4
Cleanup.
mpaauw Apr 12, 2020
aaaf8d9
Merge branch 'master' into starcraft-faker
codingricky Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch "master" into starcraft-faker
  • Loading branch information
@codingricky
codingricky authored Aug 19, 2020
commit aaaf8d9e4783a7e5a2d693f5b870fd2a3756238c
16 changes: 16 additions & 0 deletions src/main/java/com/github/javafaker/Faker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ public class Faker {
private final ProgrammingLanguage programmingLanguage;
private final Kaamelott kaamelott;
private final StarCraft starCraft;
private final BojackHorseman bojackHorseman;
private final Disease disease;
private final Basketball basketball;
private final Barcode barcode;

public Faker() {
this(Locale.ENGLISH);
Expand Down Expand Up @@ -207,6 +211,10 @@ public Faker(FakeValuesService fakeValuesService, RandomService random) {
this.programmingLanguage = new ProgrammingLanguage(this);
this.kaamelott = new Kaamelott(this);
this.starCraft = new StarCraft(this);
this.bojackHorseman = new BojackHorseman(this);
this.disease = new Disease(this);
this.basketball = new Basketball(this);
this.barcode = new Barcode(this);
}

/**
Expand Down Expand Up @@ -657,6 +665,14 @@ public StarCraft starCraft() {
return starCraft;
}

public BojackHorseman bojackHorseman() { return bojackHorseman; }

public Disease disease() {return disease; }

public Basketball basketball() { return basketball; }

public Barcode barcode() { return barcode; }

public String resolve(String key) {
return this.fakeValuesService.resolve(key, this, this);
}
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/com/github/javafaker/integration/FakerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ public void testAllFakerMethodsThatReturnStrings() throws Exception {
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.programmingLanguage());
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.kaamelott());
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.starCraft());
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.bojackHorseman());
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.disease());
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.basketball());
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.barcode());
}

private void testAllMethodsThatReturnStringsActuallyReturnStrings(Object object) throws Exception {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.