Merge 3ac95c9 into 1850b03

DiUS · May 27, 2020 · d135325 · d135325
2 parents 1850b03 + 3ac95c9
commit d135325
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/src/test/java/com/github/javafaker/DateAndTimeTest.java b/src/test/java/com/github/javafaker/DateAndTimeTest.java
@@ -11,7 +11,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 /**
  * @author pmiklos
@@ -80,7 +80,16 @@ public void testBetween() {
             assertThat("before lower bound", date.getTime(), greaterThanOrEqualTo(now.getTime()));
         }
     }
-
+    @Test
+    public void testBetweenThenLargerThanNow(){
+        try{
+        Date now = new Date();
+        Date then = new Date(now.getTime() + 1000);
+        Date date =faker.date().between(then,now);
+        fail("Should be exception");}catch (IllegalArgumentException e){
+            assertEquals("Invalid date range, the upper bound date is before the lower bound.", e.getMessage());
+        }
+    }
     @Test
     public void testBirthday() {
         int currentYear = Calendar.getInstance().get(Calendar.YEAR);

diff --git a/src/test/java/com/github/javafaker/InternetTest.java b/src/test/java/com/github/javafaker/InternetTest.java
@@ -13,16 +13,7 @@
 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.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.startsWith;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
 
 public class InternetTest extends AbstractFakerTest {
@@ -301,4 +292,10 @@ public void testUserAgent() {
         //Test faker.internet().userAgentAny() for random user_agent retrieval.
         assertThat(faker.internet().userAgentAny(), not(isEmptyOrNullString()));
     }
+
+    @Test
+    public void testSlugWithNull(){
+        Faker f=new Faker();
+        assertThat(f.internet().slug(null,"_"),notNullValue());
+    }
 }
diff --git a/src/test/java/com/github/javafaker/service/FakeValuesServiceTest.java b/src/test/java/com/github/javafaker/service/FakeValuesServiceTest.java
@@ -301,7 +301,16 @@ public void resolveUsingTheSameKeyTwice() {
         assertThat(actual, is("1 2"));
         verifyZeroInteractions(faker);
     }
-
+    @Test
+    public void FakeValuesServiceWithNullLocaleTest(){
+        try{
+            RandomService r=new RandomService();
+            FakeValuesService f=new FakeValuesService(null,r);
+            fail("Should catch IllegalArgumentException");
+        }catch (IllegalArgumentException e){
+            assertThat(e.getMessage(),is("locale is required"));
+        }
+    }
     public static class DummyService {
         public String firstName() {
             return "John";

diff --git a/src/test/java/com/github/javafaker/service/FakeValuesTest.java b/src/test/java/com/github/javafaker/service/FakeValuesTest.java
@@ -57,4 +57,5 @@ public void getAValueFromALocaleThatCantBeLoaded() {
         FakeValues fakeValues = new FakeValues(new Locale("nothing"));
         assertThat(fakeValues.get(PATH), is(nullValue()));
     }
+
 }
diff --git a/src/test/java/com/github/javafaker/service/RandomServiceTest.java b/src/test/java/com/github/javafaker/service/RandomServiceTest.java
@@ -68,4 +68,8 @@ public void testIntInRange() {
     public void testHex() {
         assertThat(randomService.hex(8), matchesRegularExpression("^[0-9A-F]{8}$"));
     }
+    @Test
+    public void testDefaultHex() {
+        assertThat(randomService.hex(), matchesRegularExpression("^[0-9A-F]{8}$"));
+    }
 }