Update README and libraries.

Author: sdsantos

README.md

@@ -46,7 +46,6 @@ We have tried to keep the operations as close as possible.
  - Commerce
  - Company
  - Date
- - Food
  - Internet
  - Lorem
  - Name
@@ -65,25 +64,7 @@ We have tried to keep the operations as close as possible.
 
 ## TODO
 
- - Implement remaining components:
-   - Beer
-   - Bitcoin
-   - Cat
-   - ChuckNorris
-   - Code
-   - Crypto
-   - Educator
-   - Finance
-   - GameOfThrones
-   - Hacker
-   - Hipster
-   - IDNumber
-   - Pokemon
-   - Shakespeare
-   - Space
-   - Superhero
-   - StarWars
-   - Vehicle
+ - Implement remaining components of the [Faker ruby gem](https://github.com/stympy/faker/).
 
 ## Proguard
 

build.gradle

@@ -13,9 +13,10 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.bmoliveira:snake-yaml:v1.18-android'
-    compile "joda-time:joda-time:2.9.1"
-    testCompile "junit:junit:4.11"
-    testCompile "org.hamcrest:hamcrest-junit:2.0.0.0"
-    testCompile "org.mockito:mockito-core:2.0.+"
+    implementation 'com.github.bmoliveira:snake-yaml:v1.18-android'
+    implementation 'joda-time:joda-time:2.9.1'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.13.0'
+    testImplementation 'org.hamcrest:hamcrest-core:1.3'
+    testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

src/main/java/io/bloco/faker/Faker.java

@@ -112,11 +112,12 @@ private InputStream getDataInputStream(String locale) {
                 .getResourceAsStream("locales/" + locale + ".yml");
 
         try {
-            assert input != null && input.available() != 0;
-        } catch (AssertionError|IOException e) {
-            throw new IllegalArgumentException("Unavailable locale \'" + locale + "\'");
+            if (input != null && input.available() != 0) {
+                return input;
+            }
+        } catch (IOException e) {
         }
 
-        return input;
+        throw new IllegalArgumentException("Unavailable locale \'" + locale + "\'");
     }
 }

src/test/java/io/bloco/faker/FakerComponentTest.java

@@ -34,13 +34,13 @@ public String test() {
     private FakerComponent fakerComponent;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         fakerData = mock(FakerData.class);
         fakerComponent = new TestComponent(fakerData);
     }
 
     @Test
-    public void testFetch() throws Exception {
+    public void testFetch() {
         String componentKey = "wtv";
 
         List<String> options = Arrays.asList("John", "Mary");
@@ -52,7 +52,7 @@ public void testFetch() throws Exception {
     }
 
     @Test
-    public void testFetchComposed() throws Exception {
+    public void testFetchComposed() {
         String componentKey = "wtv";
 
         List<String> options = Arrays.asList("John", "Mary");
@@ -66,7 +66,7 @@ public void testFetchComposed() throws Exception {
     }
 
     @Test
-    public void testSampleNestedLists() throws Exception {
+    public void testSampleNestedLists() {
         String componentKey = "wtv";
 
         List<String> options = Arrays.asList("John", "Mary");
@@ -78,7 +78,7 @@ public void testSampleNestedLists() throws Exception {
     }
 
     @Test
-    public void testNumerify() throws Exception {
+    public void testNumerify() {
         String digit = "#";
         assertThat(fakerComponent.numerify(digit), matchesPattern("\\d"));
 
@@ -93,7 +93,7 @@ public void testNumerify() throws Exception {
     }
 
     @Test
-    public void testParse() throws Exception {
+    public void testParse() {
         when(fakerData.getComponentByKey(anyString())).thenReturn(fakerComponent);
 
         assertThat(fakerComponent.parse("#{test}"), is(equalTo("ok")));
@@ -104,23 +104,15 @@ public void testParse() throws Exception {
     }
 
     @Test
-    public void testCall() throws Exception {
+    public void testCall() {
         when(fakerData.getComponentByKey(anyString())).thenReturn(fakerComponent);
         assertThat(fakerComponent.call("test"), is(equalTo("ok")));
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testCallInvalid() throws Exception {
+    public void testCallInvalid() {
         when(fakerData.getComponentByKey(anyString())).thenReturn(fakerComponent);
         fakerComponent.call("invalid");
     }
 
-    // Helpers
-
-    private Map<String, Object> newComponentData(String componentKey,
-                                                 Map<String, Object> internalData) {
-        Map<String, Object> data = new HashMap<>();
-        data.put(componentKey, internalData);
-        return data;
-    }
 }

src/test/java/io/bloco/faker/FakerTest.java

@@ -9,19 +9,19 @@
 
 public class FakerTest {
     @Test
-    public void testLoadComponents() throws Exception {
+    public void testLoadComponents() {
         Faker faker = new Faker();
         assertNotNull(faker.app);
     }
 
     @Test
-    public void testLocaleDefault() throws Exception {
+    public void testLocaleDefault() {
         Faker faker = new Faker();
         assertThat(faker.getLocale(), is(equalTo(Faker.DEFAULT_LOCALE)));
     }
 
     @Test
-    public void testLocaleProvided() throws Exception {
+    public void testLocaleProvided() {
         Faker faker = new Faker("nl");
         assertThat(faker.getLocale(), is(equalTo("nl")));
     }
@@ -32,7 +32,7 @@ public void testLocaleInvalid() {
     }
 
     @Test
-    public void testLocaleFallback() throws Exception {
+    public void testLocaleFallback() {
         // Dutch doesn't have App.name, but English (the default) has
         Faker faker = new Faker("nl");
         assertNotNull(faker.app.name());

src/test/java/io/bloco/faker/components/AddressTest.java

@@ -12,81 +12,81 @@ public class AddressTest {
     private Faker faker;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         faker = new Faker();
     }
 
     @Test
-    public void testCityPrefix() throws Exception {
+    public void testCityPrefix() {
         assertNotNull(faker.address.cityPrefix());
     }
 
     @Test
-    public void citySuffix() throws Exception {
+    public void citySuffix() {
         assertNotNull(faker.address.citySuffix());
     }
 
     @Test
-    public void country() throws Exception {
+    public void country() {
         assertNotNull(faker.address.country());
     }
 
     @Test
-    public void countryCode() throws Exception {
+    public void countryCode() {
         assertNotNull(faker.address.countryCode());
     }
 
     @Test
-    public void buildingNumber() throws Exception {
+    public void buildingNumber() {
         assertNotNull(faker.address.buildingNumber());
     }
     @Test
-    public void streetSuffix() throws Exception {
+    public void streetSuffix() {
         assertNotNull(faker.address.streetSuffix());
     }
 
     @Test
-    public void secondaryAddress() throws Exception {
+    public void secondaryAddress() {
         assertNotNull(faker.address.secondaryAddress());
     }
 
     @Test
-    public void postcode() throws Exception {
+    public void postcode() {
         assertNotNull(faker.address.postcode());
     }
 
     @Test
-    public void state() throws Exception {
+    public void state() {
         assertNotNull(faker.address.state());
     }
 
     @Test
-    public void stateAbbr() throws Exception {
+    public void stateAbbr() {
         assertNotNull(faker.address.stateAbbr());
     }
 
     @Test
-    public void timeZone() throws Exception {
+    public void timeZone() {
         assertNotNull(faker.address.timeZone());
     }
 
     @Test
-    public void city() throws Exception {
+    public void city() {
         assertNotNull(faker.address.city());
     }
 
     @Test
-    public void streetName() throws Exception {
+    public void streetName() {
         assertNotNull(faker.address.streetName());
     }
 
     @Test
-    public void streetAddress() throws Exception {
+    public void streetAddress() {
         assertNotNull(faker.address.streetAddress());
     }
 
     @Test
-    public void defaultCountry() throws Exception {
+    public void defaultCountry() {
         assertNotNull(faker.address.defaultCountry());
     }
 }

src/test/java/io/bloco/faker/components/AppTest.java

@@ -12,22 +12,22 @@ public class AppTest {
     private Faker faker;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         faker = new Faker();
     }
 
     @Test
-    public void name() throws Exception {
+    public void name() {
         assertNotNull(faker.app.name());
     }
 
     @Test
-    public void version() throws Exception {
+    public void version() {
         assertNotNull(faker.app.version());
     }
 
     @Test
-    public void author() throws Exception {
+    public void author() {
         assertNotNull(faker.app.author());
     }
 }

src/test/java/io/bloco/faker/components/AvatarTest.java

@@ -14,12 +14,12 @@ public class AvatarTest {
     private Faker faker;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         faker = new Faker();
     }
 
     @Test
-    public void imageDefault() throws Exception {
+    public void imageDefault() {
         String defaultUrl = faker.avatar.image();
         assertThat(defaultUrl, containsString("robohash.org"));
         assertThat(defaultUrl, containsString("image"));
@@ -30,7 +30,7 @@ public void imageDefault() throws Exception {
     }
 
     @Test
-    public void imageParams() throws Exception {
+    public void imageParams() {
         String specificUrl = faker.avatar.image("my-slug", "80x80", "bmp", "set2", "bgset1");
         assertThat(specificUrl, containsString("robohash.org"));
         assertThat(specificUrl, containsString("my-slug"));

src/test/java/io/bloco/faker/components/BookTest.java

@@ -12,27 +12,27 @@ public class BookTest {
     private Faker faker;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         faker = new Faker();
     }
 
     @Test
-    public void title() throws Exception {
+    public void title() {
         assertNotNull(faker.book.title());
     }
 
     @Test
-    public void author() throws Exception {
+    public void author() {
         assertNotNull(faker.book.author());
     }
 
     @Test
-    public void publisher() throws Exception {
+    public void publisher() {
         assertNotNull(faker.book.publisher());
     }
 
     @Test
-    public void genre() throws Exception {
+    public void genre() {
         assertNotNull(faker.book.genre());
     }
 }

src/test/java/io/bloco/faker/components/BoolTest.java

@@ -12,12 +12,12 @@ public class BoolTest {
     private Faker faker;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         faker = new Faker();
     }
 
     @Test
-    public void bool() throws Exception {
+    public void bool() {
         float trueRatio = Math.round(Math.random() * 10f) / 10f;
         int times = 1000;
         int trueCounter = 0;