From 6990f9812bd5a632141089d21523121e19b4daaa Mon Sep 17 00:00:00 2001 From: "Ivan Milosavljevic (TheJavaGuy)" Date: Thu, 18 Dec 2025 18:54:47 +0100 Subject: [PATCH] use java 11 constructs and optimize imports --- execution-flow-trace.md | 123 ++++++++++++++++++ overview.md | 56 ++++++++ .../java/com/github/javafaker/Barcode.java | 2 +- src/main/java/com/github/javafaker/Code.java | 6 +- .../java/com/github/javafaker/Disease.java | 2 +- .../java/com/github/javafaker/Finance.java | 2 +- .../java/com/github/javafaker/Internet.java | 2 +- .../java/com/github/javafaker/Nation.java | 3 +- .../com/github/javafaker/PhoneNumber.java | 6 +- src/main/java/com/github/javafaker/Sip.java | 2 +- .../javafaker/idnumbers/SvSEIdNumber.java | 4 +- .../github/javafaker/service/FakeValues.java | 18 +-- .../javafaker/service/FakeValuesGrouping.java | 5 +- .../javafaker/service/FakeValuesService.java | 3 +- .../github/javafaker/service/FakerIDN.java | 2 +- .../github/javafaker/AbstractFakerTest.java | 13 +- .../com/github/javafaker/AddressTest.java | 17 ++- .../com/github/javafaker/AncientTest.java | 4 +- .../java/com/github/javafaker/AnimalTest.java | 4 +- .../javafaker/AquaTeenHungerForceTest.java | 4 +- .../java/com/github/javafaker/ArtistTest.java | 4 +- .../java/com/github/javafaker/AvatarTest.java | 7 +- .../com/github/javafaker/AviationTest.java | 4 +- .../github/javafaker/BackToTheFutureTest.java | 6 +- .../com/github/javafaker/BarcodeTest.java | 4 +- .../com/github/javafaker/BasketballTest.java | 7 +- .../java/com/github/javafaker/BeerTest.java | 4 +- .../github/javafaker/BojackHorsemanTest.java | 8 +- .../java/com/github/javafaker/BookTest.java | 4 +- .../java/com/github/javafaker/BoolTest.java | 6 +- .../java/com/github/javafaker/BuffyTest.java | 4 +- .../com/github/javafaker/BusinessTest.java | 4 +- .../java/com/github/javafaker/CatTest.java | 4 +- .../com/github/javafaker/ChuckNorrisTest.java | 6 +- .../java/com/github/javafaker/CodeTest.java | 24 ++-- .../java/com/github/javafaker/CoinTest.java | 2 +- .../java/com/github/javafaker/ColorTest.java | 4 +- .../com/github/javafaker/CommerceTest.java | 6 +- .../com/github/javafaker/CompanyTest.java | 4 +- .../com/github/javafaker/CountryTest.java | 7 +- .../com/github/javafaker/DateAndTimeTest.java | 13 +- .../com/github/javafaker/DiseaseTest.java | 9 +- .../java/com/github/javafaker/DogTest.java | 4 +- .../com/github/javafaker/DragonBallTest.java | 4 +- .../java/com/github/javafaker/DuneTest.java | 7 +- .../com/github/javafaker/EducatorTest.java | 4 +- .../github/javafaker/ElderScrollsTest.java | 6 +- .../github/javafaker/EnglandFootBallTest.java | 8 +- .../com/github/javafaker/EsportsTest.java | 4 +- .../java/com/github/javafaker/FakerTest.java | 15 ++- .../java/com/github/javafaker/FileTest.java | 11 +- .../com/github/javafaker/FinanceTest.java | 8 +- .../java/com/github/javafaker/FoodTest.java | 4 +- .../com/github/javafaker/FriendsTest.java | 6 +- .../com/github/javafaker/FunnyNameTest.java | 4 +- .../github/javafaker/GameOfThronesTest.java | 2 +- .../java/com/github/javafaker/GenderTest.java | 4 +- .../java/com/github/javafaker/HackerTest.java | 4 +- .../com/github/javafaker/HarryPotterTest.java | 6 +- .../com/github/javafaker/HipsterTest.java | 4 +- .../HitchhikersGuideToTheGalaxyTest.java | 6 +- .../java/com/github/javafaker/HobbitTest.java | 6 +- .../javafaker/HowIMetYourMotherTest.java | 6 +- .../com/github/javafaker/IdNumberTest.java | 6 +- .../com/github/javafaker/InternetTest.java | 39 ++++-- .../java/com/github/javafaker/JobTest.java | 4 +- .../github/javafaker/LeagueOfLegendsTest.java | 6 +- .../com/github/javafaker/LebowskiTest.java | 4 +- .../github/javafaker/LordOfTheRingsTest.java | 4 +- .../java/com/github/javafaker/LoremTest.java | 5 +- .../java/com/github/javafaker/MatzTest.java | 6 +- .../com/github/javafaker/MedicalTest.java | 4 +- .../com/github/javafaker/MountainTest.java | 6 +- .../java/com/github/javafaker/MusicTest.java | 4 +- .../java/com/github/javafaker/NameTest.java | 11 +- .../java/com/github/javafaker/NationTest.java | 6 +- .../java/com/github/javafaker/NumberTest.java | 85 +++++------- .../com/github/javafaker/OptionsTest.java | 10 +- .../com/github/javafaker/OverwatchTest.java | 6 +- .../com/github/javafaker/PhoneNumberTest.java | 6 +- .../com/github/javafaker/PhotographyTest.java | 11 +- .../github/javafaker/PrincessBrideTest.java | 6 +- .../javafaker/ProgrammingLanguageTest.java | 5 +- .../com/github/javafaker/RandomFakerTest.java | 8 +- .../github/javafaker/RelationshipTest.java | 6 +- .../github/javafaker/RickAndMortyTest.java | 6 +- .../java/com/github/javafaker/RobinTest.java | 4 +- .../com/github/javafaker/RockBandTest.java | 4 +- .../com/github/javafaker/ShakespeareTest.java | 6 +- .../java/com/github/javafaker/SipTest.java | 8 +- .../com/github/javafaker/SlackEmojiTest.java | 4 +- .../com/github/javafaker/StarCraftTest.java | 7 +- .../com/github/javafaker/StarTrekTest.java | 4 +- .../java/com/github/javafaker/StockTest.java | 2 +- .../com/github/javafaker/SuperheroTest.java | 4 +- .../java/com/github/javafaker/TeamTest.java | 8 +- .../com/github/javafaker/TwinPeaksTest.java | 6 +- .../com/github/javafaker/UniversityTest.java | 4 +- .../com/github/javafaker/WeatherTest.java | 8 +- .../com/github/javafaker/WitcherTest.java | 4 +- .../java/com/github/javafaker/YodaTest.java | 6 +- .../java/com/github/javafaker/ZeldaTest.java | 4 +- 102 files changed, 535 insertions(+), 344 deletions(-) create mode 100644 execution-flow-trace.md create mode 100644 overview.md diff --git a/execution-flow-trace.md b/execution-flow-trace.md new file mode 100644 index 0000000..9502177 --- /dev/null +++ b/execution-flow-trace.md @@ -0,0 +1,123 @@ +# Execution Flow: `faker.name().fullName()` + +``` +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 1. faker.name() │ +│ Faker.java:374-376 │ +│ Returns the pre-instantiated Name object (created in constructor:142) │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 2. name.fullName() │ +│ Name.java:53-55 │ +│ Simply delegates to name() method │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 3. name.name() │ +│ Name.java:28-30 │ +│ Calls: faker.fakeValuesService().resolve("name.name", this, faker) │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 4. FakeValuesService.resolve("name.name", ...) │ +│ FakeValuesService.java:304-312 │ +│ - Calls safeFetch("name.name", null) to get expression from YAML │ +│ - Returns one of these patterns (randomly chosen): │ +│ "#{prefix} #{first_name} #{last_name}" │ +│ "#{first_name} #{last_name} #{suffix}" │ +│ "#{first_name} #{last_name}" (4 times - more likely) │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 5. FakeValuesService.resolveExpression(expression, current, root) │ +│ FakeValuesService.java:343-367 │ +│ - Uses regex EXPRESSION_PATTERN: #\{([a-z0-9A-Z_.]+)\s?((?:,?'([^']+)')*)│ +│ - Finds each #{...} directive in the expression │ +│ - For "#{first_name}": resolves to Name.firstName() method │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 6. Resolving #{first_name} directive │ +│ FakeValuesService.java:380-421 │ +│ Search order: │ +│ a) Try method on current object (Name) → Name.firstName() ✓ │ +│ b) If not found: try YAML key "name.first_name" │ +│ c) If not found: try method on Faker root object │ +│ d) If not found: try lowercase YAML lookup │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 7. Name.firstName() is invoked via reflection │ +│ FakeValuesService.java:468-481 (resolveFromMethodOn) │ +│ - Uses accessor() to find method ignoring case │ +│ - Invokes method.invoke(obj, args) │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 8. Name.firstName() │ +│ Name.java:61-63 │ +│ Calls: faker.fakeValuesService().resolve("name.first_name", this, faker) │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 9. safeFetch("name.first_name") │ +│ FakeValuesService.java:159-173 │ +│ - Gets list from YAML: ["#{female_first_name}", "#{male_first_name}"] │ +│ - Randomly selects one → e.g., "#{male_first_name}" │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 10. resolveExpression("#{male_first_name}", ...) │ +│ - Looks up "name.male_first_name" in YAML │ +│ - Gets array of 1000+ male names │ +│ - RandomService.nextInt() picks one → e.g., "James" │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 11. Same process for #{last_name} │ +│ - Name.lastName() → resolve("name.last_name") │ +│ - safeFetch gets array of 400+ last names │ +│ - RandomService picks one → e.g., "Smith" │ +└────────────────────────────────────┬────────────────────────────────────────┘ + ▼ +┌─────────────────────────────────────────────────────────────────────────────┐ +│ 12. Final result: "James Smith" │ +│ Expression "#{first_name} #{last_name}" becomes "James Smith" │ +└─────────────────────────────────────────────────────────────────────────────┘ +``` + +## Key Components Summary + +| Step | Class | Method | Purpose | +|------|-------|--------|---------| +| 1 | `Faker` | `name()` | Returns cached `Name` instance | +| 2-3 | `Name` | `fullName()` → `name()` | Delegates to resolve | +| 4-6 | `FakeValuesService` | `resolve()` → `resolveExpression()` | Parses `#{...}` expressions | +| 7 | `FakeValuesService` | `resolveFromMethodOn()` | Reflection-based method invocation | +| 8-11 | `FakeValuesService` | `safeFetch()` → `fetchObject()` | YAML data lookup + random selection | + +## Data Flow + +``` +en/name.yml Code +───────────────────────────────── ────────────────────────── +name: + name: ← resolve("name.name") + - "#{first_name} #{last_name}" + + first_name: ← resolve("name.first_name") + - "#{male_first_name}" + - "#{female_first_name}" + + male_first_name: [James, ...] ← fetch("name.male_first_name") + last_name: [Smith, ...] ← fetch("name.last_name") +``` + +## Key Insight + +The `FakeValuesService` recursively resolves `#{...}` expressions, which can reference either: + +1. **Methods on the current object** (like `firstName()` on `Name`) +2. **Other YAML keys** (like `male_first_name`) +3. **Methods on `Faker` object** (like `regexify()`) diff --git a/overview.md b/overview.md new file mode 100644 index 0000000..194f309 --- /dev/null +++ b/overview.md @@ -0,0 +1,56 @@ +# Java Faker Codebase Overview + +This is **Java Faker**, a data generation library for creating realistic fake data (names, addresses, phone numbers, etc.) for testing and development. It's a Java port of Ruby's Faker gem. + +## Project Info +- **Version**: 1.0.3-SNAPSHOT +- **Build**: Maven (with wrapper) +- **Java**: 11+ +- **License**: Apache 2.0 + +## Structure +``` +src/main/java/com/github/javafaker/ +├── Faker.java # Main entry point (facade) +├── *.java # 93 data provider classes +├── service/ # Core infrastructure +│ ├── FakeValuesService # Resolves YAML data, expressions +│ ├── FakeValues # Loads locale YAML files +│ └── RandomService # Random number generation +└── idnumbers/ # ID generators (SSN, Swedish IDs) + +src/main/resources/ +└── *.yml # 59 locale data files (en, de, fr, ja, etc.) + +src/test/java/ # 111 test files +``` + +## Key Components + +| Component | Purpose | +|-----------|---------| +| **Faker** | Central facade with 93+ provider instances | +| **FakeValuesService** | Resolves YAML expressions, handles locale chains | +| **RandomService** | Random numbers, hex, UUIDs | +| **Data Providers** | Name, Address, Internet, Company, Lorem, GameOfThrones, Pokemon, etc. | + +## Dependencies +- **Guava** (33.5.0) - Utilities +- **Commons Lang3** (3.20.0) - String utils +- **SnakeYAML** (2.5) - YAML parsing +- **Generex** (1.0.2) - Regex-to-string generation + +## How It Works +1. `Faker` instantiates all provider classes +2. Providers call `faker.fakeValuesService().resolve("key")` +3. `FakeValuesService` looks up data in locale YAML files +4. YAML expressions like `#{Name.first_name}` are evaluated dynamically +5. Results can be transformed with `numerify`, `letterify`, `regexify` + +## Testing +- 111 test classes using JUnit 4 + Mockito +- Custom `@Repeat` annotation for multi-run tests +- Integration tests in `integration/` subdirectory +- JaCoCo coverage with Coveralls integration + +The codebase is well-organized with clear separation between data providers and the service layer that handles data loading and expression evaluation. diff --git a/src/main/java/com/github/javafaker/Barcode.java b/src/main/java/com/github/javafaker/Barcode.java index 95f7eaa..c8a4175 100644 --- a/src/main/java/com/github/javafaker/Barcode.java +++ b/src/main/java/com/github/javafaker/Barcode.java @@ -2,7 +2,7 @@ public class Barcode { - private Faker faker; + private final Faker faker; public Barcode(Faker faker) { this.faker = faker; diff --git a/src/main/java/com/github/javafaker/Code.java b/src/main/java/com/github/javafaker/Code.java index a36bde7..b13b3c3 100644 --- a/src/main/java/com/github/javafaker/Code.java +++ b/src/main/java/com/github/javafaker/Code.java @@ -119,7 +119,7 @@ public String isbn13(boolean separator) { return separator ? isbn13.toString() : stripIsbnSeparator(isbn13); } - private final int isbn10CheckDigit(CharSequence t) { + private int isbn10CheckDigit(CharSequence t) { String value = stripIsbnSeparator(t); int sum = 0; for (int i = 0; i < value.length(); i++) { @@ -128,7 +128,7 @@ private final int isbn10CheckDigit(CharSequence t) { return sum % 11; } - private final int isbn13CheckDigit(CharSequence t) { + private int isbn13CheckDigit(CharSequence t) { String value = stripIsbnSeparator(t); int sum = 0; int multiplier = 0; @@ -140,7 +140,7 @@ private final int isbn13CheckDigit(CharSequence t) { return (10 - sum % 10) % 10; } - private final String stripIsbnSeparator(CharSequence t) { + private String stripIsbnSeparator(CharSequence t) { return t.toString().replaceAll("-",""); } diff --git a/src/main/java/com/github/javafaker/Disease.java b/src/main/java/com/github/javafaker/Disease.java index a7b5b8d..efb61a5 100644 --- a/src/main/java/com/github/javafaker/Disease.java +++ b/src/main/java/com/github/javafaker/Disease.java @@ -39,7 +39,7 @@ public String surgery() { } /** - * Generate random paediattics disease + * Generate random paediatrics disease * @return A paediatrics disease */ public String paediatrics() { diff --git a/src/main/java/com/github/javafaker/Finance.java b/src/main/java/com/github/javafaker/Finance.java index 7179aea..18081c8 100644 --- a/src/main/java/com/github/javafaker/Finance.java +++ b/src/main/java/com/github/javafaker/Finance.java @@ -74,7 +74,7 @@ private static int sum(String[] string) { int sum = 0; for (String s : string) { if (!s.isEmpty()) { - sum += Integer.valueOf(s); + sum += Integer.parseInt(s); } } return sum; diff --git a/src/main/java/com/github/javafaker/Internet.java b/src/main/java/com/github/javafaker/Internet.java index a4170a2..1f19368 100644 --- a/src/main/java/com/github/javafaker/Internet.java +++ b/src/main/java/com/github/javafaker/Internet.java @@ -147,7 +147,7 @@ public String password(int minimumLength, int maximumLength, boolean includeUppe */ public String macAddress(String prefix) { final String tmp = (prefix == null) ? "" : prefix; - final int prefixLength = tmp.trim().length() == 0 + final int prefixLength = tmp.trim().isEmpty() ? 0 : tmp.split(":").length; diff --git a/src/main/java/com/github/javafaker/Nation.java b/src/main/java/com/github/javafaker/Nation.java index 35f0897..d747b79 100644 --- a/src/main/java/com/github/javafaker/Nation.java +++ b/src/main/java/com/github/javafaker/Nation.java @@ -3,11 +3,12 @@ import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.List; public class Nation { - private static final Charset UTF8_CHARSET = Charset.forName("UTF-8"); + private static final Charset UTF8_CHARSET = StandardCharsets.UTF_8; private final Faker faker; diff --git a/src/main/java/com/github/javafaker/PhoneNumber.java b/src/main/java/com/github/javafaker/PhoneNumber.java index 0381246..5c24758 100644 --- a/src/main/java/com/github/javafaker/PhoneNumber.java +++ b/src/main/java/com/github/javafaker/PhoneNumber.java @@ -20,11 +20,7 @@ public String extension() { } public String subscriberNumber(int length) { - StringBuilder subscriberNumber = new StringBuilder(); - for (int i = 0; i < length; i++) { - subscriberNumber.append("#"); - } - return faker.numerify(subscriberNumber.toString()); + return faker.numerify("#".repeat(Math.max(0, length))); } public String subscriberNumber() { diff --git a/src/main/java/com/github/javafaker/Sip.java b/src/main/java/com/github/javafaker/Sip.java index 3c59e8d..be03a7c 100644 --- a/src/main/java/com/github/javafaker/Sip.java +++ b/src/main/java/com/github/javafaker/Sip.java @@ -13,7 +13,7 @@ public final class Sip { private final Faker faker; private final ArrayList portPool; - protected Sip(final Faker faker) { + Sip(final Faker faker) { this.faker = faker; int port = 40000; portPool = new ArrayList<>(); diff --git a/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java b/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java index 637289f..69fb4bb 100644 --- a/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java +++ b/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java @@ -8,9 +8,9 @@ /** * Implementation based on the definition at - * https://www.skatteverket.se/privat/folkbokforing/personnummer.4.3810a01c150939e893f18c29.html + * ... * and the description at - * https://en.wikipedia.org/wiki/Personal_identity_number_(Sweden) + * ... */ public class SvSEIdNumber { private static final String[] validPatterns = {"######-####", "######+####"}; diff --git a/src/main/java/com/github/javafaker/service/FakeValues.java b/src/main/java/com/github/javafaker/service/FakeValues.java index 043a264..27eea11 100644 --- a/src/main/java/com/github/javafaker/service/FakeValues.java +++ b/src/main/java/com/github/javafaker/service/FakeValues.java @@ -13,7 +13,7 @@ public class FakeValues implements FakeValuesInterface { private final Locale locale; private final String filename; private final String path; - private Map values; + private Map values; FakeValues(Locale locale) { this(locale, getFilename(locale), getFilename(locale)); @@ -21,7 +21,7 @@ public class FakeValues implements FakeValuesInterface { private static String getFilename(Locale locale) { final StringBuilder filename = new StringBuilder(language(locale)); - if (!"".equals(locale.getCountry())) { + if (!locale.getCountry().isEmpty()) { filename.append("-").append(locale.getCountry()); } return filename.toString(); @@ -45,15 +45,15 @@ private static String language(Locale l) { } @Override - public Map get(String key) { + public Map get(String key) { if (values == null) { values = loadValues(); } - return values == null ? null : (Map) values.get(key); + return values == null ? null : (Map) values.get(key); } - private Map loadValues() { + private Map loadValues() { String pathWithLocaleAndFilename = "/" + locale.getLanguage() + "/" + this.filename; String pathWithFilename = "/" + filename + ".yml"; String pathWithLocale = "/" + locale.getLanguage() + ".yml"; @@ -71,17 +71,17 @@ private Map loadValues() { return null; } - final Map valuesMap = new Yaml().loadAs(stream, Map.class); - Map localeBased = (Map) valuesMap.get(locale.getLanguage()); + final Map valuesMap = new Yaml().loadAs(stream, Map.class); + Map localeBased = (Map) valuesMap.get(locale.getLanguage()); if (localeBased == null) { - localeBased = (Map) valuesMap.get(filename); + localeBased = (Map) valuesMap.get(filename); } try { stream.close(); } catch (IOException ex){ return null; } - return (Map) localeBased.get("faker"); + return (Map) localeBased.get("faker"); } private InputStream findStream(String filename) { diff --git a/src/main/java/com/github/javafaker/service/FakeValuesGrouping.java b/src/main/java/com/github/javafaker/service/FakeValuesGrouping.java index e1ccc37..8d74362 100644 --- a/src/main/java/com/github/javafaker/service/FakeValuesGrouping.java +++ b/src/main/java/com/github/javafaker/service/FakeValuesGrouping.java @@ -13,9 +13,8 @@ public void add(FakeValues fakeValues) { } @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public Map get(String key) { - Map result = null; + public Map get(String key) { + Map result = null; for (FakeValues fakeValues : fakeValuesList) { if (fakeValues.supportsPath(key)) { if (result != null) { diff --git a/src/main/java/com/github/javafaker/service/FakeValuesService.java b/src/main/java/com/github/javafaker/service/FakeValuesService.java index 7fa1509..e4179bd 100644 --- a/src/main/java/com/github/javafaker/service/FakeValuesService.java +++ b/src/main/java/com/github/javafaker/service/FakeValuesService.java @@ -539,8 +539,7 @@ private MethodAndCoercedArgs accessor(Object onObject, String name, List * Coerce arguments in args into the appropriate types (if possible) for the parameter arguments * to accessor. * - * @return array of coerced values if successful, null otherwise - * @throws Exception if unable to coerce + * @return list of coerced values if successful, null otherwise */ private List coerceArguments(Method accessor, List args) { final List coerced = new ArrayList<>(); diff --git a/src/main/java/com/github/javafaker/service/FakerIDN.java b/src/main/java/com/github/javafaker/service/FakerIDN.java index 5ce05e9..42d2cd8 100644 --- a/src/main/java/com/github/javafaker/service/FakerIDN.java +++ b/src/main/java/com/github/javafaker/service/FakerIDN.java @@ -11,7 +11,7 @@ public class FakerIDN { * he.yml as they're Bidi languages and something was causing them to die. This is kind of a brute force * fix but it appears to fix the issue. */ - public static final String toASCII(String in) { + public static String toASCII(String in) { try { return IDN.toASCII(in); } catch (Exception e) { diff --git a/src/test/java/com/github/javafaker/AbstractFakerTest.java b/src/test/java/com/github/javafaker/AbstractFakerTest.java index fb4621f..6cc2e09 100644 --- a/src/test/java/com/github/javafaker/AbstractFakerTest.java +++ b/src/test/java/com/github/javafaker/AbstractFakerTest.java @@ -1,15 +1,16 @@ package com.github.javafaker; -import com.github.javafaker.repeating.RepeatRule; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; + import org.junit.Before; import org.junit.Rule; import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogManager; -import java.util.logging.Logger; +import com.github.javafaker.repeating.RepeatRule; public class AbstractFakerTest { @@ -22,7 +23,7 @@ public class AbstractFakerTest { @Before public void before() { MockitoAnnotations.initMocks(this); - + Logger rootLogger = LogManager.getLogManager().getLogger(""); Handler[] handlers = rootLogger.getHandlers(); rootLogger.setLevel(Level.INFO); diff --git a/src/test/java/com/github/javafaker/AddressTest.java b/src/test/java/com/github/javafaker/AddressTest.java index ba7ac94..cffd75f 100644 --- a/src/test/java/com/github/javafaker/AddressTest.java +++ b/src/test/java/com/github/javafaker/AddressTest.java @@ -1,16 +1,21 @@ package com.github.javafaker; -import org.junit.Test; +import static com.github.javafaker.matchers.IsANumber.isANumber; +import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.lessThanOrEqualTo; +import static org.hamcrest.Matchers.not; import java.text.DecimalFormatSymbols; import java.util.Locale; import java.util.Random; -import static com.github.javafaker.matchers.IsANumber.isANumber; -import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; public class AddressTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/AncientTest.java b/src/test/java/com/github/javafaker/AncientTest.java index 2fc8b47..07d1572 100644 --- a/src/test/java/com/github/javafaker/AncientTest.java +++ b/src/test/java/com/github/javafaker/AncientTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class AncientTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/AnimalTest.java b/src/test/java/com/github/javafaker/AnimalTest.java index 0d125a8..a66f587 100644 --- a/src/test/java/com/github/javafaker/AnimalTest.java +++ b/src/test/java/com/github/javafaker/AnimalTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class AnimalTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java b/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java index 48981ed..20788d7 100644 --- a/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java +++ b/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class AquaTeenHungerForceTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/ArtistTest.java b/src/test/java/com/github/javafaker/ArtistTest.java index d6f5877..0f74c38 100644 --- a/src/test/java/com/github/javafaker/ArtistTest.java +++ b/src/test/java/com/github/javafaker/ArtistTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class ArtistTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/AvatarTest.java b/src/test/java/com/github/javafaker/AvatarTest.java index f138ffc..1032b51 100644 --- a/src/test/java/com/github/javafaker/AvatarTest.java +++ b/src/test/java/com/github/javafaker/AvatarTest.java @@ -1,11 +1,12 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; + public class AvatarTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/AviationTest.java b/src/test/java/com/github/javafaker/AviationTest.java index 1f9901f..1705cee 100644 --- a/src/test/java/com/github/javafaker/AviationTest.java +++ b/src/test/java/com/github/javafaker/AviationTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class AviationTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/BackToTheFutureTest.java b/src/test/java/com/github/javafaker/BackToTheFutureTest.java index 466a044..9888c5d 100644 --- a/src/test/java/com/github/javafaker/BackToTheFutureTest.java +++ b/src/test/java/com/github/javafaker/BackToTheFutureTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class BackToTheFutureTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/BarcodeTest.java b/src/test/java/com/github/javafaker/BarcodeTest.java index 6305140..1f1657c 100644 --- a/src/test/java/com/github/javafaker/BarcodeTest.java +++ b/src/test/java/com/github/javafaker/BarcodeTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class BarcodeTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/BasketballTest.java b/src/test/java/com/github/javafaker/BasketballTest.java index 4518487..2cdd635 100644 --- a/src/test/java/com/github/javafaker/BasketballTest.java +++ b/src/test/java/com/github/javafaker/BasketballTest.java @@ -1,11 +1,10 @@ package com.github.javafaker; -import com.github.javafaker.AbstractFakerTest; -import com.github.javafaker.Faker; -import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; + +import org.junit.Test; public class BasketballTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BeerTest.java b/src/test/java/com/github/javafaker/BeerTest.java index 8733360..66ee329 100644 --- a/src/test/java/com/github/javafaker/BeerTest.java +++ b/src/test/java/com/github/javafaker/BeerTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class BeerTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/BojackHorsemanTest.java b/src/test/java/com/github/javafaker/BojackHorsemanTest.java index 7cbd17e..1a89840 100644 --- a/src/test/java/com/github/javafaker/BojackHorsemanTest.java +++ b/src/test/java/com/github/javafaker/BojackHorsemanTest.java @@ -1,12 +1,10 @@ package com.github.javafaker; -import com.github.javafaker.AbstractFakerTest; -import com.github.javafaker.Faker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; public class BojackHorsemanTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BookTest.java b/src/test/java/com/github/javafaker/BookTest.java index 1f5f94f..aa6eef3 100644 --- a/src/test/java/com/github/javafaker/BookTest.java +++ b/src/test/java/com/github/javafaker/BookTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class BookTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/BoolTest.java b/src/test/java/com/github/javafaker/BoolTest.java index aa1d062..39e48ac 100644 --- a/src/test/java/com/github/javafaker/BoolTest.java +++ b/src/test/java/com/github/javafaker/BoolTest.java @@ -1,9 +1,9 @@ package com.github.javafaker; -import org.junit.Test; - -import static org.hamcrest.Matchers.isOneOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.isOneOf; + +import org.junit.Test; public class BoolTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BuffyTest.java b/src/test/java/com/github/javafaker/BuffyTest.java index 620f040..dd6e460 100644 --- a/src/test/java/com/github/javafaker/BuffyTest.java +++ b/src/test/java/com/github/javafaker/BuffyTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class BuffyTest extends AbstractFakerTest { @Test public void testCharacters() { diff --git a/src/test/java/com/github/javafaker/BusinessTest.java b/src/test/java/com/github/javafaker/BusinessTest.java index 3e33486..11a25e0 100644 --- a/src/test/java/com/github/javafaker/BusinessTest.java +++ b/src/test/java/com/github/javafaker/BusinessTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class BusinessTest extends AbstractFakerTest { @Test public void creditCardNumber() { diff --git a/src/test/java/com/github/javafaker/CatTest.java b/src/test/java/com/github/javafaker/CatTest.java index e35d24c..0210b77 100644 --- a/src/test/java/com/github/javafaker/CatTest.java +++ b/src/test/java/com/github/javafaker/CatTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class CatTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/ChuckNorrisTest.java b/src/test/java/com/github/javafaker/ChuckNorrisTest.java index 3ce69c6..5b11025 100644 --- a/src/test/java/com/github/javafaker/ChuckNorrisTest.java +++ b/src/test/java/com/github/javafaker/ChuckNorrisTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class ChuckNorrisTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/CodeTest.java b/src/test/java/com/github/javafaker/CodeTest.java index 2f8c533..e764f51 100644 --- a/src/test/java/com/github/javafaker/CodeTest.java +++ b/src/test/java/com/github/javafaker/CodeTest.java @@ -1,16 +1,20 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; + +import java.util.Locale; + import org.apache.commons.validator.routines.ISBNValidator; import org.apache.commons.validator.routines.checkdigit.EAN13CheckDigit; import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit; import org.junit.Test; -import java.util.Locale; - -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.MatcherAssert.assertThat; +import com.github.javafaker.repeating.Repeat; public class CodeTest extends AbstractFakerTest { @@ -80,12 +84,12 @@ public void testOverrides() { final String isbn10Sep = faker.code().isbn10(true); final String isbn13Sep = faker.code().isbn13(true); - assertThat("Uses overridden expressions from test.yml", - isbn10Sep, + assertThat("Uses overridden expressions from test.yml", + isbn10Sep, matchesRegularExpression("9971-\\d-\\d{4}-(\\d|X)")); - + assertThat("Uses overridden expressions from test.yml", - isbn13Sep, + isbn13Sep, matchesRegularExpression("(333|444)-9971-\\d-\\d{4}-\\d")); } diff --git a/src/test/java/com/github/javafaker/CoinTest.java b/src/test/java/com/github/javafaker/CoinTest.java index f676fba..523339d 100644 --- a/src/test/java/com/github/javafaker/CoinTest.java +++ b/src/test/java/com/github/javafaker/CoinTest.java @@ -1,7 +1,7 @@ package com.github.javafaker; -import static org.hamcrest.MatcherAssert.assertThat; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/ColorTest.java b/src/test/java/com/github/javafaker/ColorTest.java index f5c5676..abe95f3 100644 --- a/src/test/java/com/github/javafaker/ColorTest.java +++ b/src/test/java/com/github/javafaker/ColorTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class ColorTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/CommerceTest.java b/src/test/java/com/github/javafaker/CommerceTest.java index 0344a88..2f43feb 100644 --- a/src/test/java/com/github/javafaker/CommerceTest.java +++ b/src/test/java/com/github/javafaker/CommerceTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import java.text.DecimalFormatSymbols; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; public class CommerceTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/CompanyTest.java b/src/test/java/com/github/javafaker/CompanyTest.java index d6f2399..d49806f 100644 --- a/src/test/java/com/github/javafaker/CompanyTest.java +++ b/src/test/java/com/github/javafaker/CompanyTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class CompanyTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/CountryTest.java b/src/test/java/com/github/javafaker/CountryTest.java index 5e77812..4aadd2f 100644 --- a/src/test/java/com/github/javafaker/CountryTest.java +++ b/src/test/java/com/github/javafaker/CountryTest.java @@ -1,12 +1,13 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; + public class CountryTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/DateAndTimeTest.java b/src/test/java/com/github/javafaker/DateAndTimeTest.java index 5c17f16..569fd91 100644 --- a/src/test/java/com/github/javafaker/DateAndTimeTest.java +++ b/src/test/java/com/github/javafaker/DateAndTimeTest.java @@ -1,13 +1,18 @@ package com.github.javafaker; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; +import static org.junit.Assert.*; + import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.concurrent.TimeUnit; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; /** * @author pmiklos diff --git a/src/test/java/com/github/javafaker/DiseaseTest.java b/src/test/java/com/github/javafaker/DiseaseTest.java index d744360..9248dd9 100644 --- a/src/test/java/com/github/javafaker/DiseaseTest.java +++ b/src/test/java/com/github/javafaker/DiseaseTest.java @@ -1,12 +1,13 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; public class DiseaseTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/DogTest.java b/src/test/java/com/github/javafaker/DogTest.java index 977b0ba..3537dc3 100644 --- a/src/test/java/com/github/javafaker/DogTest.java +++ b/src/test/java/com/github/javafaker/DogTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class DogTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/DragonBallTest.java b/src/test/java/com/github/javafaker/DragonBallTest.java index eda7337..f4b5da8 100644 --- a/src/test/java/com/github/javafaker/DragonBallTest.java +++ b/src/test/java/com/github/javafaker/DragonBallTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class DragonBallTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/DuneTest.java b/src/test/java/com/github/javafaker/DuneTest.java index b320490..cf86606 100644 --- a/src/test/java/com/github/javafaker/DuneTest.java +++ b/src/test/java/com/github/javafaker/DuneTest.java @@ -1,11 +1,12 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; + public class DuneTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/EducatorTest.java b/src/test/java/com/github/javafaker/EducatorTest.java index 96243b8..c82836c 100644 --- a/src/test/java/com/github/javafaker/EducatorTest.java +++ b/src/test/java/com/github/javafaker/EducatorTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class EducatorTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/ElderScrollsTest.java b/src/test/java/com/github/javafaker/ElderScrollsTest.java index 641c53b..4655de4 100644 --- a/src/test/java/com/github/javafaker/ElderScrollsTest.java +++ b/src/test/java/com/github/javafaker/ElderScrollsTest.java @@ -2,11 +2,11 @@ package com.github.javafaker; -import org.junit.Test; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class ElderScrollsTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/EnglandFootBallTest.java b/src/test/java/com/github/javafaker/EnglandFootBallTest.java index 2b97806..07d5479 100644 --- a/src/test/java/com/github/javafaker/EnglandFootBallTest.java +++ b/src/test/java/com/github/javafaker/EnglandFootBallTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - - -import static org.hamcrest.Matchers.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.not; + +import org.junit.Test; public class EnglandFootBallTest extends AbstractFakerTest{ diff --git a/src/test/java/com/github/javafaker/EsportsTest.java b/src/test/java/com/github/javafaker/EsportsTest.java index 6929088..c84307c 100644 --- a/src/test/java/com/github/javafaker/EsportsTest.java +++ b/src/test/java/com/github/javafaker/EsportsTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class EsportsTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/FakerTest.java b/src/test/java/com/github/javafaker/FakerTest.java index 6910559..15af35a 100644 --- a/src/test/java/com/github/javafaker/FakerTest.java +++ b/src/test/java/com/github/javafaker/FakerTest.java @@ -1,14 +1,19 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; import java.util.Locale; import java.util.Random; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; public class FakerTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/FileTest.java b/src/test/java/com/github/javafaker/FileTest.java index 1abd5c4..39bf794 100644 --- a/src/test/java/com/github/javafaker/FileTest.java +++ b/src/test/java/com/github/javafaker/FileTest.java @@ -1,11 +1,12 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; + public class FileTest extends AbstractFakerTest { @Test @@ -29,7 +30,7 @@ public void testFileName() { @Test public void testFileNameSpecifyExtension() { - assertThat(faker.file().fileName(null, null, "txt", null), + assertThat(faker.file().fileName(null, null, "txt", null), matchesRegularExpression("([a-z\\-_]+)(\\\\|\\/)([a-z\\-_]+)\\.txt")); } @@ -41,7 +42,7 @@ public void testFileNameSpecifyDir() { @Test public void testFileNameSpecifySeparator() { - assertThat(faker.file().fileName(null,null,null,"\\"), + assertThat(faker.file().fileName(null,null,null,"\\"), matchesRegularExpression("([a-z\\-_]+)\\\\([a-z\\-_]+)\\.([a-z0-9]+)")); } diff --git a/src/test/java/com/github/javafaker/FinanceTest.java b/src/test/java/com/github/javafaker/FinanceTest.java index d389819..6e43d42 100644 --- a/src/test/java/com/github/javafaker/FinanceTest.java +++ b/src/test/java/com/github/javafaker/FinanceTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit; +import org.junit.Test; public class FinanceTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/FoodTest.java b/src/test/java/com/github/javafaker/FoodTest.java index 7f697d6..21c0cdd 100644 --- a/src/test/java/com/github/javafaker/FoodTest.java +++ b/src/test/java/com/github/javafaker/FoodTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class FoodTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/FriendsTest.java b/src/test/java/com/github/javafaker/FriendsTest.java index 5376c51..862084d 100644 --- a/src/test/java/com/github/javafaker/FriendsTest.java +++ b/src/test/java/com/github/javafaker/FriendsTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class FriendsTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/FunnyNameTest.java b/src/test/java/com/github/javafaker/FunnyNameTest.java index 07e2eca..f09e597 100644 --- a/src/test/java/com/github/javafaker/FunnyNameTest.java +++ b/src/test/java/com/github/javafaker/FunnyNameTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class FunnyNameTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/GameOfThronesTest.java b/src/test/java/com/github/javafaker/GameOfThronesTest.java index 7657aa8..3210004 100644 --- a/src/test/java/com/github/javafaker/GameOfThronesTest.java +++ b/src/test/java/com/github/javafaker/GameOfThronesTest.java @@ -1,9 +1,9 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/GenderTest.java b/src/test/java/com/github/javafaker/GenderTest.java index a8ac5b8..79d7b7b 100644 --- a/src/test/java/com/github/javafaker/GenderTest.java +++ b/src/test/java/com/github/javafaker/GenderTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class GenderTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/HackerTest.java b/src/test/java/com/github/javafaker/HackerTest.java index 133b6cb..357b1d6 100644 --- a/src/test/java/com/github/javafaker/HackerTest.java +++ b/src/test/java/com/github/javafaker/HackerTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class HackerTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/HarryPotterTest.java b/src/test/java/com/github/javafaker/HarryPotterTest.java index 364220f..27ade40 100644 --- a/src/test/java/com/github/javafaker/HarryPotterTest.java +++ b/src/test/java/com/github/javafaker/HarryPotterTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class HarryPotterTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/HipsterTest.java b/src/test/java/com/github/javafaker/HipsterTest.java index 175f080..ff9b68a 100644 --- a/src/test/java/com/github/javafaker/HipsterTest.java +++ b/src/test/java/com/github/javafaker/HipsterTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class HipsterTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java b/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java index 651bdbe..7095876 100644 --- a/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java +++ b/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; public class HitchhikersGuideToTheGalaxyTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/HobbitTest.java b/src/test/java/com/github/javafaker/HobbitTest.java index d40c408..e2b2d33 100644 --- a/src/test/java/com/github/javafaker/HobbitTest.java +++ b/src/test/java/com/github/javafaker/HobbitTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; public class HobbitTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/HowIMetYourMotherTest.java b/src/test/java/com/github/javafaker/HowIMetYourMotherTest.java index f087797..7caae08 100644 --- a/src/test/java/com/github/javafaker/HowIMetYourMotherTest.java +++ b/src/test/java/com/github/javafaker/HowIMetYourMotherTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; public class HowIMetYourMotherTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/IdNumberTest.java b/src/test/java/com/github/javafaker/IdNumberTest.java index c2cb906..0c583c7 100644 --- a/src/test/java/com/github/javafaker/IdNumberTest.java +++ b/src/test/java/com/github/javafaker/IdNumberTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import java.util.Locale; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; public class IdNumberTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/InternetTest.java b/src/test/java/com/github/javafaker/InternetTest.java index d5a5e01..3d4c050 100644 --- a/src/test/java/com/github/javafaker/InternetTest.java +++ b/src/test/java/com/github/javafaker/InternetTest.java @@ -1,20 +1,31 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import org.apache.commons.validator.routines.EmailValidator; -import org.hamcrest.Matchers; -import org.junit.Test; - -import java.util.List; -import java.util.Locale; - import static com.github.javafaker.matchers.CountOfCharactersMatcher.countOf; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static java.lang.Integer.parseInt; -import static org.hamcrest.Matchers.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.both; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.startsWith; + +import java.util.List; +import java.util.Locale; + +import org.apache.commons.validator.routines.EmailValidator; +import org.hamcrest.Matchers; +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; public class InternetTest extends AbstractFakerTest { @@ -186,7 +197,7 @@ public void testIpV4Address() { public void testIpV4Cidr() { assertThat(faker.internet().ipV4Cidr(), countOf('.', is(3))); assertThat(faker.internet().ipV4Cidr(), countOf('/', is(1))); - + for (int i = 0; i < 1000; i++) { assertThat(parseInt(faker.internet().ipV4Cidr().split("/")[1]), both(greaterThanOrEqualTo(1)).and(lessThan(32))); @@ -201,7 +212,7 @@ public void testPrivateIpV4Address() { String oneNineTwo = "^192\\.168\\..+"; String oneSevenTwo = "^172\\.(16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)\\..+"; - + for (int i = 0; i < 1000; i++) { String addr = faker.internet().privateIpV4Address(); assertThat(addr, anyOf(matchesRegularExpression(tenDot), @@ -232,7 +243,7 @@ public void testPublicIpV4Address() { @Test public void testIpV6() { assertThat(faker.internet().ipV6Address(), countOf(':', is(7))); - + for (int i = 0; i < 1000; i++) { assertThat( "Is valid ipv6 format", diff --git a/src/test/java/com/github/javafaker/JobTest.java b/src/test/java/com/github/javafaker/JobTest.java index 92191da..bf0cd19 100644 --- a/src/test/java/com/github/javafaker/JobTest.java +++ b/src/test/java/com/github/javafaker/JobTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class JobTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java b/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java index a05463a..9b42d50 100644 --- a/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java +++ b/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; public class LeagueOfLegendsTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/LebowskiTest.java b/src/test/java/com/github/javafaker/LebowskiTest.java index 59116c3..2ce532b 100644 --- a/src/test/java/com/github/javafaker/LebowskiTest.java +++ b/src/test/java/com/github/javafaker/LebowskiTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class LebowskiTest extends AbstractFakerTest { @Test public void actor() { diff --git a/src/test/java/com/github/javafaker/LordOfTheRingsTest.java b/src/test/java/com/github/javafaker/LordOfTheRingsTest.java index cbf01cc..a16ff09 100644 --- a/src/test/java/com/github/javafaker/LordOfTheRingsTest.java +++ b/src/test/java/com/github/javafaker/LordOfTheRingsTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + /** * @author Luka Obradovic (luka@vast.com) */ diff --git a/src/test/java/com/github/javafaker/LoremTest.java b/src/test/java/com/github/javafaker/LoremTest.java index f8e1f72..56d937b 100644 --- a/src/test/java/com/github/javafaker/LoremTest.java +++ b/src/test/java/com/github/javafaker/LoremTest.java @@ -1,15 +1,14 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; -import org.hamcrest.Matchers; import org.junit.Test; public class LoremTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/MatzTest.java b/src/test/java/com/github/javafaker/MatzTest.java index eac0bf4..748c75e 100644 --- a/src/test/java/com/github/javafaker/MatzTest.java +++ b/src/test/java/com/github/javafaker/MatzTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class MatzTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/MedicalTest.java b/src/test/java/com/github/javafaker/MedicalTest.java index 9cfc424..9eddffd 100644 --- a/src/test/java/com/github/javafaker/MedicalTest.java +++ b/src/test/java/com/github/javafaker/MedicalTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class MedicalTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/MountainTest.java b/src/test/java/com/github/javafaker/MountainTest.java index 2cc219d..8986a87 100644 --- a/src/test/java/com/github/javafaker/MountainTest.java +++ b/src/test/java/com/github/javafaker/MountainTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class MountainTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/MusicTest.java b/src/test/java/com/github/javafaker/MusicTest.java index 5ccbc63..30dfa8c 100644 --- a/src/test/java/com/github/javafaker/MusicTest.java +++ b/src/test/java/com/github/javafaker/MusicTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class MusicTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/NameTest.java b/src/test/java/com/github/javafaker/NameTest.java index 721b762..363d2d3 100644 --- a/src/test/java/com/github/javafaker/NameTest.java +++ b/src/test/java/com/github/javafaker/NameTest.java @@ -1,15 +1,16 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; + public class NameTest extends AbstractFakerTest{ @@ -74,7 +75,7 @@ public void testUsernameWithSpaces() { doReturn(name).when(faker).name(); assertThat(faker.name().username(), matchesRegularExpression("^(\\w+)\\.(\\w+)$")); } - + @Test public void testBloodGroup() { assertThat(faker.name().bloodGroup(), matchesRegularExpression("(A|B|AB|O)[+-]")); diff --git a/src/test/java/com/github/javafaker/NationTest.java b/src/test/java/com/github/javafaker/NationTest.java index c3cfbc7..682b7a3 100644 --- a/src/test/java/com/github/javafaker/NationTest.java +++ b/src/test/java/com/github/javafaker/NationTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class NationTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/NumberTest.java b/src/test/java/com/github/javafaker/NumberTest.java index b517df5..fa98528 100644 --- a/src/test/java/com/github/javafaker/NumberTest.java +++ b/src/test/java/com/github/javafaker/NumberTest.java @@ -1,13 +1,14 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import org.apache.commons.lang3.tuple.Pair; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import java.math.BigDecimal; import java.util.List; @@ -15,9 +16,15 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicLong; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.MatcherAssert.assertThat; +import org.apache.commons.lang3.tuple.Pair; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.github.javafaker.repeating.Repeat; +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; public class NumberTest extends AbstractFakerTest { @@ -201,19 +208,11 @@ public void numberBetweenLongLongZeroMinMax() { */ @Test public void randomDoubleRandomizationQuality() { - Function, Double> minMaxRangeToUniquePercentageFunction = new Function<>() { - @Override - public Double apply(Pair minMax) { - final int min = minMax.getLeft().intValue(), max = minMax.getRight().intValue(); - long numbersToGet = calculateNumbersToGet(min, max); - - return uniquePercentageOfResults(numbersToGet, new Callable() { - @Override - public Double call() throws Exception { - return faker.number().randomDouble(0, min, max); - } - }); - } + Function, Double> minMaxRangeToUniquePercentageFunction = minMax -> { + final int min = minMax.getLeft().intValue(), max = minMax.getRight().intValue(); + long numbersToGet = calculateNumbersToGet(min, max); + + return uniquePercentageOfResults(numbersToGet, () -> faker.number().randomDouble(0, min, max)); }; final double percentGreaterThan80Percent = randomizationQualityTest(individualRunGtPercentUnique, minMaxRangeToUniquePercentageFunction); @@ -238,20 +237,12 @@ public Double call() throws Exception { */ @Test public void numberBetweenIntIntRandomizationQuality() { - Function, Double> minMaxRangeToUniquePercentageFunction = new Function<>() { - @Override - public Double apply(Pair minMax) { - final int min = minMax.getLeft().intValue(); - final int max = minMax.getRight().intValue(); - long numbersToGet = calculateNumbersToGet(min, max); - - return uniquePercentageOfResults(numbersToGet, new Callable() { - @Override - public Integer call() throws Exception { - return faker.number().numberBetween(min, max); - } - }); - } + Function, Double> minMaxRangeToUniquePercentageFunction = minMax -> { + final int min = minMax.getLeft().intValue(); + final int max = minMax.getRight().intValue(); + long numbersToGet = calculateNumbersToGet(min, max); + + return uniquePercentageOfResults(numbersToGet, () -> faker.number().numberBetween(min, max)); }; final double percentGreaterThan80Percent = randomizationQualityTest(individualRunGtPercentUnique, minMaxRangeToUniquePercentageFunction); @@ -276,19 +267,11 @@ public Integer call() throws Exception { */ @Test public void numberBetweenLongLongRandomizationQuality() { - Function, Double> minMaxRangeToUniquePercentageFunction = new Function<>() { - @Override - public Double apply(Pair minMax) { - final long min = minMax.getLeft(), max = minMax.getRight(); - long numbersToGet = calculateNumbersToGet(min, max); - - return uniquePercentageOfResults(numbersToGet, new Callable() { - @Override - public Long call() throws Exception { - return faker.number().numberBetween(min, max); - } - }); - } + Function, Double> minMaxRangeToUniquePercentageFunction = minMax -> { + final long min = minMax.getLeft(), max = minMax.getRight(); + long numbersToGet = calculateNumbersToGet(min, max); + + return uniquePercentageOfResults(numbersToGet, () -> faker.number().numberBetween(min, max)); }; final double percentGreaterThan80Percent = randomizationQualityTest(individualRunGtPercentUnique, minMaxRangeToUniquePercentageFunction); diff --git a/src/test/java/com/github/javafaker/OptionsTest.java b/src/test/java/com/github/javafaker/OptionsTest.java index fa7996f..e9a065b 100644 --- a/src/test/java/com/github/javafaker/OptionsTest.java +++ b/src/test/java/com/github/javafaker/OptionsTest.java @@ -1,14 +1,14 @@ package com.github.javafaker; -import org.junit.Before; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.isIn; +import static org.hamcrest.Matchers.isOneOf; import java.util.Arrays; import java.util.List; -import static org.hamcrest.Matchers.isIn; -import static org.hamcrest.Matchers.isOneOf; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Before; +import org.junit.Test; public class OptionsTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/OverwatchTest.java b/src/test/java/com/github/javafaker/OverwatchTest.java index 2bc2fbb..97d1df6 100644 --- a/src/test/java/com/github/javafaker/OverwatchTest.java +++ b/src/test/java/com/github/javafaker/OverwatchTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; public class OverwatchTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/PhoneNumberTest.java b/src/test/java/com/github/javafaker/PhoneNumberTest.java index fb78239..d41fb29 100644 --- a/src/test/java/com/github/javafaker/PhoneNumberTest.java +++ b/src/test/java/com/github/javafaker/PhoneNumberTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import java.util.Locale; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; public class PhoneNumberTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/PhotographyTest.java b/src/test/java/com/github/javafaker/PhotographyTest.java index 0a03d50..90ff674 100644 --- a/src/test/java/com/github/javafaker/PhotographyTest.java +++ b/src/test/java/com/github/javafaker/PhotographyTest.java @@ -1,11 +1,12 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; + +import org.junit.Test; + +import com.github.javafaker.repeating.Repeat; public class PhotographyTest extends AbstractFakerTest{ @@ -65,7 +66,7 @@ public void iso() { assertThat(value, matchesRegularExpression("\\d{1,}")); } - private void assertNonNullOrEmpty(String value) { + private static void assertNonNullOrEmpty(String value) { assertNotNull(value); assertFalse(value.isEmpty()); } diff --git a/src/test/java/com/github/javafaker/PrincessBrideTest.java b/src/test/java/com/github/javafaker/PrincessBrideTest.java index 32d6433..8acc2a4 100644 --- a/src/test/java/com/github/javafaker/PrincessBrideTest.java +++ b/src/test/java/com/github/javafaker/PrincessBrideTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class PrincessBrideTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java b/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java index ca11d31..6534f39 100644 --- a/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java +++ b/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java @@ -1,11 +1,10 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class ProgrammingLanguageTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/RandomFakerTest.java b/src/test/java/com/github/javafaker/RandomFakerTest.java index e25f108..365074c 100644 --- a/src/test/java/com/github/javafaker/RandomFakerTest.java +++ b/src/test/java/com/github/javafaker/RandomFakerTest.java @@ -1,12 +1,12 @@ package com.github.javafaker; -import org.junit.Before; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import java.util.Random; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import org.junit.Before; +import org.junit.Test; public class RandomFakerTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/RelationshipTest.java b/src/test/java/com/github/javafaker/RelationshipTest.java index e23e18c..ee426cf 100644 --- a/src/test/java/com/github/javafaker/RelationshipTest.java +++ b/src/test/java/com/github/javafaker/RelationshipTest.java @@ -1,16 +1,16 @@ package com.github.javafaker; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; +import java.lang.reflect.InvocationTargetException; + import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import java.lang.reflect.InvocationTargetException; - public class RelationshipTest extends AbstractFakerTest { private Faker mockFaker; diff --git a/src/test/java/com/github/javafaker/RickAndMortyTest.java b/src/test/java/com/github/javafaker/RickAndMortyTest.java index 4df76c4..7a01d0e 100644 --- a/src/test/java/com/github/javafaker/RickAndMortyTest.java +++ b/src/test/java/com/github/javafaker/RickAndMortyTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class RickAndMortyTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/RobinTest.java b/src/test/java/com/github/javafaker/RobinTest.java index cf83b32..36d13f5 100644 --- a/src/test/java/com/github/javafaker/RobinTest.java +++ b/src/test/java/com/github/javafaker/RobinTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class RobinTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/RockBandTest.java b/src/test/java/com/github/javafaker/RockBandTest.java index 999deec..099bdcd 100644 --- a/src/test/java/com/github/javafaker/RockBandTest.java +++ b/src/test/java/com/github/javafaker/RockBandTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class RockBandTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/ShakespeareTest.java b/src/test/java/com/github/javafaker/ShakespeareTest.java index 1cc58dc..9a412f8 100644 --- a/src/test/java/com/github/javafaker/ShakespeareTest.java +++ b/src/test/java/com/github/javafaker/ShakespeareTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class ShakespeareTest extends AbstractFakerTest{ diff --git a/src/test/java/com/github/javafaker/SipTest.java b/src/test/java/com/github/javafaker/SipTest.java index 731f3f4..a27fd6a 100644 --- a/src/test/java/com/github/javafaker/SipTest.java +++ b/src/test/java/com/github/javafaker/SipTest.java @@ -1,15 +1,15 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class SipTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/SlackEmojiTest.java b/src/test/java/com/github/javafaker/SlackEmojiTest.java index d7e1d5a..4fedd53 100644 --- a/src/test/java/com/github/javafaker/SlackEmojiTest.java +++ b/src/test/java/com/github/javafaker/SlackEmojiTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class SlackEmojiTest extends AbstractFakerTest { private static final String EMOTICON_REGEX = ":([\\w-]+):"; diff --git a/src/test/java/com/github/javafaker/StarCraftTest.java b/src/test/java/com/github/javafaker/StarCraftTest.java index 32fdcb4..a9bc2ba 100644 --- a/src/test/java/com/github/javafaker/StarCraftTest.java +++ b/src/test/java/com/github/javafaker/StarCraftTest.java @@ -1,10 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.Matchers.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.not; + +import org.junit.Test; public class StarCraftTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/StarTrekTest.java b/src/test/java/com/github/javafaker/StarTrekTest.java index 51dd3da..cda79ce 100644 --- a/src/test/java/com/github/javafaker/StarTrekTest.java +++ b/src/test/java/com/github/javafaker/StarTrekTest.java @@ -1,12 +1,12 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; +import org.junit.Test; + public class StarTrekTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/StockTest.java b/src/test/java/com/github/javafaker/StockTest.java index 0f912e3..db24dd6 100644 --- a/src/test/java/com/github/javafaker/StockTest.java +++ b/src/test/java/com/github/javafaker/StockTest.java @@ -1,8 +1,8 @@ package com.github.javafaker; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/SuperheroTest.java b/src/test/java/com/github/javafaker/SuperheroTest.java index 9140677..0bcc3cf 100644 --- a/src/test/java/com/github/javafaker/SuperheroTest.java +++ b/src/test/java/com/github/javafaker/SuperheroTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class SuperheroTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/TeamTest.java b/src/test/java/com/github/javafaker/TeamTest.java index deb99e5..736b0d4 100644 --- a/src/test/java/com/github/javafaker/TeamTest.java +++ b/src/test/java/com/github/javafaker/TeamTest.java @@ -1,13 +1,13 @@ package com.github.javafaker; -import org.junit.Test; - -import java.util.Locale; - import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import java.util.Locale; + +import org.junit.Test; + public class TeamTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/TwinPeaksTest.java b/src/test/java/com/github/javafaker/TwinPeaksTest.java index 2961a29..9aefb82 100644 --- a/src/test/java/com/github/javafaker/TwinPeaksTest.java +++ b/src/test/java/com/github/javafaker/TwinPeaksTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class TwinPeaksTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/UniversityTest.java b/src/test/java/com/github/javafaker/UniversityTest.java index bc6af2e..9cae942 100644 --- a/src/test/java/com/github/javafaker/UniversityTest.java +++ b/src/test/java/com/github/javafaker/UniversityTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class UniversityTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/WeatherTest.java b/src/test/java/com/github/javafaker/WeatherTest.java index 4f298ca..26cb09e 100644 --- a/src/test/java/com/github/javafaker/WeatherTest.java +++ b/src/test/java/com/github/javafaker/WeatherTest.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.isEmptyOrNullString; + +import org.junit.Test; public class WeatherTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/WitcherTest.java b/src/test/java/com/github/javafaker/WitcherTest.java index e37df91..0b15f3e 100644 --- a/src/test/java/com/github/javafaker/WitcherTest.java +++ b/src/test/java/com/github/javafaker/WitcherTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class WitcherTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/YodaTest.java b/src/test/java/com/github/javafaker/YodaTest.java index 2095fbc..f3bd006 100644 --- a/src/test/java/com/github/javafaker/YodaTest.java +++ b/src/test/java/com/github/javafaker/YodaTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; /** * @author Luka Obradovic (luka@vast.com) diff --git a/src/test/java/com/github/javafaker/ZeldaTest.java b/src/test/java/com/github/javafaker/ZeldaTest.java index 3d78dbb..055f846 100644 --- a/src/test/java/com/github/javafaker/ZeldaTest.java +++ b/src/test/java/com/github/javafaker/ZeldaTest.java @@ -1,10 +1,10 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + public class ZeldaTest extends AbstractFakerTest { @Test