fix for numbers

Author: codingricky

src/main/java/com/github/javafaker/Number.java

@@ -27,7 +27,10 @@ public int randomDigitNotZero() {
      * @see Number#numberBetween(long, long) 
      */
     public int numberBetween(int min, int max) {
-        return decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
+        if (min == max) return min;
+
+        int value = decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
+        return value == max ? value - 1 : value;
     }
 
     /**
@@ -39,7 +42,10 @@ public int numberBetween(int min, int max) {
      * @param max exclusive (unless min == max)
      */
     public long numberBetween(long min, long max) {
-        return decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).longValue();
+        if (min == max) return min;
+
+        long value = decimalBetween(min, max).setScale(0, BigDecimal.ROUND_HALF_DOWN).longValue();
+        return value == max ? value - 1 : value;
     }
 
     /**

src/test/java/com/github/javafaker/FakerTest.java

@@ -1,5 +1,6 @@
 package com.github.javafaker;
 
+import com.github.javafaker.repeating.Repeat;
 import org.junit.Test;
 
 import java.util.Locale;
@@ -133,6 +134,12 @@ public void expression() {
         assertThat(faker.expression("#{color.name}"), matchesRegularExpression("[a-z\\s]+"));
     }
 
+    @Test
+    @Repeat(times = 100)
+    public void numberBetweenRepeated() {
+        assertThat(faker.expression("#{number.number_between '1','10'}"), matchesRegularExpression("[1-9]"));
+    }
+
     @Test
     public void regexifyShouldGenerateSameValueForFakerWithSameSeed() {
         long seed = 1L;

src/test/java/com/github/javafaker/NumberTest.java

@@ -1,5 +1,6 @@
 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;
@@ -120,6 +121,26 @@ public void testNumberBetween() {
         assertThat(v1, is(lessThan(980000000L)));
     }
 
+    @Test
+    @Repeat(times = 100)
+    public void testLongNumberBetweenRepeated() {
+        long low = 1;
+        long high = 10;
+        long v = faker.number().numberBetween(low, high);
+        assertThat(v, is(lessThan(high)));
+        assertThat(v, is(greaterThanOrEqualTo(low)));
+    }
+
+    @Test
+    @Repeat(times = 100)
+    public void testIntNumberBetweenRepeated() {
+        int low = 1;
+        int high = 10;
+        int v = faker.number().numberBetween(low, high);
+        assertThat(v, is(lessThan(high)));
+        assertThat(v, is(greaterThanOrEqualTo(low)));
+    }
+
     @Test
     public void testNumberBetweenOneAndThree() {
         Set<Integer> nums = Sets.newHashSet();