Merge RandomInt and RandomLong to RandomNumber

Resolves #56
mkutz · Sep 6, 2024 · 9512c2f · 9512c2f
1 parent ca879ad
commit 9512c2f
Show file tree

Hide file tree

Showing 12 changed files with 336 additions and 343 deletions.
diff --git a/manual/src/docs/asciidoc/chapters/03-random.adoc b/manual/src/docs/asciidoc/chapters/03-random.adoc
@@ -3,9 +3,9 @@
 The Random module contains a collection of builders and utility functions to generate random data.
 
 
-== Random Integer/Long
+== Random Number
 
-The link:{javadoc-url}/random/org/stubit/random/RandomInt.html[`RandomInt`] and link:{javadoc-url}/random/org/stubit/random/RandomLong.html[`RandomLong`] classes allow to generate random Integer/Long values within a defined min and max range (both inclusive).
+The link:{javadoc-url}/random/org/stubit/random/RandomNumber.html[`RandomNumber`] class allows to generate random Integer/Long values within a defined min and max range (both inclusive).
 
 For simple integers/longs there are several static methods available.
 More complex integers/long can be defined with Builder classes that's returned by the `anInt`/`aLong` methods.

diff --git a/manual/src/test/java/org/stubit/random/RandomDocTest.java b/manual/src/test/java/org/stubit/random/RandomDocTest.java
@@ -7,17 +7,17 @@
 import static org.stubit.random.RandomChoice.anyOf;
 import static org.stubit.random.RandomDuration.aDuration;
 import static org.stubit.random.RandomDuration.aDurationBetween;
-import static org.stubit.random.RandomInt.aNegativeInt;
-import static org.stubit.random.RandomInt.aPositiveInt;
-import static org.stubit.random.RandomInt.anInt;
-import static org.stubit.random.RandomInt.anIntBetween;
 import static org.stubit.random.RandomLocalDate.aLocalDate;
 import static org.stubit.random.RandomLocalDate.aLocalDateBetween;
 import static org.stubit.random.RandomLocalDate.aLocalDateInRange;
-import static org.stubit.random.RandomLong.aLong;
-import static org.stubit.random.RandomLong.aLongBetween;
-import static org.stubit.random.RandomLong.aNegativeLong;
-import static org.stubit.random.RandomLong.aPositiveLong;
+import static org.stubit.random.RandomNumber.aLong;
+import static org.stubit.random.RandomNumber.aLongBetween;
+import static org.stubit.random.RandomNumber.aNegativeInt;
+import static org.stubit.random.RandomNumber.aNegativeLong;
+import static org.stubit.random.RandomNumber.aPositiveInt;
+import static org.stubit.random.RandomNumber.aPositiveLong;
+import static org.stubit.random.RandomNumber.anInt;
+import static org.stubit.random.RandomNumber.anIntBetween;
 import static org.stubit.random.RandomString.aLetterFrom;
 import static org.stubit.random.RandomString.aStringStartingWith;
 import static org.stubit.random.RandomString.arabicDigits;

diff --git a/modules/random/src/main/java/org/stubit/random/RandomInt.java b/modules/random/src/main/java/org/stubit/random/RandomInt.java
diff --git a/modules/random/src/main/java/org/stubit/random/RandomLong.java b/modules/random/src/main/java/org/stubit/random/RandomLong.java