diff --git a/pom.xml b/pom.xml index c73752d..5085dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -146,8 +146,11 @@ maven-compiler-plugin 3.14.1 - 11 - 11 + 11 + + -Xlint:deprecation + -Xlint:unchecked + diff --git a/src/main/java/com/github/javafaker/Code.java b/src/main/java/com/github/javafaker/Code.java index e92517f..a36bde7 100644 --- a/src/main/java/com/github/javafaker/Code.java +++ b/src/main/java/com/github/javafaker/Code.java @@ -1,8 +1,9 @@ package com.github.javafaker; -import org.apache.commons.lang3.ArrayUtils; import static org.apache.commons.lang3.math.NumberUtils.toInt; +import org.apache.commons.lang3.ArrayUtils; + /** * ISBN Rules : https://en.wikipedia.org/wiki/International_Standard_Book_Number */ @@ -74,7 +75,7 @@ public String isbnRegistrant() { public String isbn10() { return isbn10(false); } - + /** * @param separator true if you want separators returned, false otherwise * @return a valid ISBN10 number with or without separators (ex. 9604250590, 960-425-059-0) @@ -185,7 +186,7 @@ public String imei() { return new String(str); } - private static final String [] REPORTING_BODY_IDENTIFIERS + private static final String [] REPORTING_BODY_IDENTIFIERS = {"01", "10", "30", "33", "35", "44", "45", "49", "50", "51", "52", "53", "54", "86", "91", "98", "99"}; public String ean8() { diff --git a/src/main/java/com/github/javafaker/Commerce.java b/src/main/java/com/github/javafaker/Commerce.java index c609b75..6bcf9e1 100644 --- a/src/main/java/com/github/javafaker/Commerce.java +++ b/src/main/java/com/github/javafaker/Commerce.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import org.apache.commons.lang3.StringUtils; - import java.text.DecimalFormat; import java.util.SortedSet; import java.util.TreeSet; +import org.apache.commons.lang3.StringUtils; + public class Commerce { private final Faker faker; @@ -19,7 +19,7 @@ public String color() { public String department() { int numberOfDepartments = Math.max(faker.random().nextInt(4), 1); - SortedSet departments = new TreeSet(); + SortedSet departments = new TreeSet<>(); while (departments.size() < numberOfDepartments) { departments.add(faker.fakeValuesService().resolve("commerce.department", this, faker)); } @@ -32,8 +32,8 @@ public String department() { } public String productName() { - return StringUtils.join(new String[] { - faker.fakeValuesService().resolve("commerce.product_name.adjective", this,faker), + return StringUtils.join(new String[] { + faker.fakeValuesService().resolve("commerce.product_name.adjective", this,faker), faker.fakeValuesService().resolve("commerce.product_name.material", this, faker), faker.fakeValuesService().resolve("commerce.product_name.product", this, faker) }, " "); } @@ -43,7 +43,7 @@ public String material() { } /** - * Generate a random price between 0.00 and 100.00 + * Generate a random price between 0.00 and 100.00 */ public String price() { return price(0, 100); diff --git a/src/main/java/com/github/javafaker/Company.java b/src/main/java/com/github/javafaker/Company.java index a82bb6c..732dc07 100644 --- a/src/main/java/com/github/javafaker/Company.java +++ b/src/main/java/com/github/javafaker/Company.java @@ -1,12 +1,13 @@ package com.github.javafaker; -import com.github.javafaker.service.FakerIDN; -import org.apache.commons.lang3.StringUtils; +import static org.apache.commons.lang3.StringUtils.join; import java.util.ArrayList; import java.util.List; -import static org.apache.commons.lang3.StringUtils.join; +import org.apache.commons.lang3.StringUtils; + +import com.github.javafaker.service.FakerIDN; public class Company { @@ -35,7 +36,7 @@ public String profession() { public String buzzword() { @SuppressWarnings("unchecked") List> buzzwordLists = (List>) faker.fakeValuesService().fetchObject("company.buzzwords"); - List buzzwords = new ArrayList(); + List buzzwords = new ArrayList<>(); for (List buzzwordList : buzzwordLists) { buzzwords.addAll(buzzwordList); } @@ -87,7 +88,7 @@ private String domainSuffix() { } private String joinSampleOfEachList(List> listOfLists, String separator) { - List words = new ArrayList(); + List words = new ArrayList<>(); for (List list : listOfLists) { words.add(list.get(faker.random().nextInt(list.size()))); } diff --git a/src/main/java/com/github/javafaker/Faker.java b/src/main/java/com/github/javafaker/Faker.java index 751fb77..f2a26ec 100644 --- a/src/main/java/com/github/javafaker/Faker.java +++ b/src/main/java/com/github/javafaker/Faker.java @@ -1,11 +1,11 @@ package com.github.javafaker; -import com.github.javafaker.service.FakeValuesService; -import com.github.javafaker.service.RandomService; - import java.util.Locale; import java.util.Random; +import com.github.javafaker.service.FakeValuesService; +import com.github.javafaker.service.RandomService; + /** * Provides utility methods for generating fake strings, such as names, phone * numbers, addresses. generate random strings with given patterns diff --git a/src/main/java/com/github/javafaker/Finance.java b/src/main/java/com/github/javafaker/Finance.java index c4eeddf..7179aea 100644 --- a/src/main/java/com/github/javafaker/Finance.java +++ b/src/main/java/com/github/javafaker/Finance.java @@ -1,13 +1,13 @@ package com.github.javafaker; -import org.apache.commons.lang3.StringUtils; - import java.math.BigInteger; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; + public class Finance { private final Faker faker; @@ -25,7 +25,7 @@ public String creditCard(CreditCardType creditCardType) { final String template = faker.numerify(value); String[] split = template.replaceAll("[^0-9]", "").split(""); - List reversedAsInt = new ArrayList(); + List reversedAsInt = new ArrayList<>(); for (int i = 0; i < split.length; i++) { final String current = split[split.length - 1 - i]; if (!current.isEmpty()) { @@ -55,7 +55,7 @@ public String bic() { } public String iban() { - List countryCodes = new ArrayList(countryCodeToBasicBankAccountNumberPattern.keySet()); + List countryCodes = new ArrayList<>(countryCodeToBasicBankAccountNumberPattern.keySet()); String randomCountryCode = countryCodes.get(faker.random().nextInt(countryCodes.size())); return iban(randomCountryCode); } @@ -99,7 +99,7 @@ private static String calculateIbanChecksum(String countryCode, String basicBank private static Map createCountryCodeToBasicBankAccountNumberPatternMap() { // source: https://www.swift.com/standards/data-standards/iban - Map ibanFormats = new HashMap(); + Map ibanFormats = new HashMap<>(); ibanFormats.put("AL", "\\d{8}[0-9A-Za-z]{16}"); ibanFormats.put("AD", "\\d{4}\\d{4}[0-9A-Za-z]{12}"); ibanFormats.put("AT", "\\d{5}\\d{11}"); diff --git a/src/main/java/com/github/javafaker/Internet.java b/src/main/java/com/github/javafaker/Internet.java index 163a072..a4170a2 100644 --- a/src/main/java/com/github/javafaker/Internet.java +++ b/src/main/java/com/github/javafaker/Internet.java @@ -1,15 +1,16 @@ package com.github.javafaker; -import com.github.javafaker.service.FakerIDN; -import com.github.javafaker.service.RandomService; -import org.apache.commons.lang3.StringUtils; +import static org.apache.commons.lang3.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.stripAccents; import java.util.Arrays; import java.util.List; import java.util.UUID; -import static org.apache.commons.lang3.StringUtils.join; -import static org.apache.commons.lang3.StringUtils.stripAccents; +import org.apache.commons.lang3.StringUtils; + +import com.github.javafaker.service.FakerIDN; +import com.github.javafaker.service.RandomService; public class Internet { private final Faker faker; @@ -138,7 +139,7 @@ public String password(int minimumLength, int maximumLength, boolean includeUppe return faker.lorem().characters(minimumLength, maximumLength, includeUppercase, includeDigit); } } - + /** *

Returns a MAC address in the following format: 6-bytes in MM:MM:MM:SS:SS:SS format.

* @return a correctly formatted MAC address @@ -146,10 +147,10 @@ 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 - ? 0 + final int prefixLength = tmp.trim().length() == 0 + ? 0 : tmp.split(":").length; - + final StringBuilder out = new StringBuilder(tmp); for (int i=0;i < 6 - prefixLength;i++) { if (out.length() > 0) { @@ -162,14 +163,14 @@ public String macAddress(String prefix) { } /** - * @see Internet#macAddress(String) + * @see Internet#macAddress(String) */ public String macAddress() { return macAddress(""); } /** - * returns an IPv4 address in dot separated octets. + * returns an IPv4 address in dot separated octets. * @return a correctly formatted IPv4 address. */ public String ipV4Address() { @@ -212,14 +213,14 @@ public String privateIpV4Address() { */ public String publicIpV4Address() { final RandomService r = faker.random(); - + final int[] PRIVATE_FIRST_OCTET = {10,127,169,192,172}; int first = r.nextInt(256), second = r.nextInt(256), third = r.nextInt(256), fourth = r.nextInt(256); - + while (Arrays.binarySearch(PRIVATE_FIRST_OCTET, first) > 0) { first = r.nextInt(256); } @@ -301,7 +302,7 @@ public String slug(List wordsOrNull, String glueOrNull) { public String uuid() { return UUID.randomUUID().toString(); } - + private T random(T[] src) { return src[faker.random().nextInt(src.length)]; } diff --git a/src/main/java/com/github/javafaker/Lorem.java b/src/main/java/com/github/javafaker/Lorem.java index 1158bce..5e72e62 100644 --- a/src/main/java/com/github/javafaker/Lorem.java +++ b/src/main/java/com/github/javafaker/Lorem.java @@ -1,12 +1,12 @@ package com.github.javafaker; -import org.apache.commons.lang3.StringUtils; +import static org.apache.commons.lang3.StringUtils.capitalize; +import static org.apache.commons.lang3.StringUtils.join; import java.util.ArrayList; import java.util.List; -import static org.apache.commons.lang3.StringUtils.capitalize; -import static org.apache.commons.lang3.StringUtils.join; +import org.apache.commons.lang3.StringUtils; public class Lorem { private final Faker faker; @@ -14,7 +14,7 @@ public class Lorem { protected Lorem(Faker faker) { this.faker = faker; } - + public char character() { return character(false); } @@ -74,7 +74,7 @@ public String characters(int fixedNumberOfCharacters, boolean includeUppercase, } public List words(int num) { - List returnList = new ArrayList(); + List returnList = new ArrayList<>(); for (int i = 0; i < num; i++) { returnList.add(word()); } @@ -108,7 +108,7 @@ public String sentence(int wordCount) { /** * Create a sentence with a random number of words within the range (wordCount+1)..(wordCount+randomWordsToAdd).

- * + * * Set {@code randomWordsToAdd} to 0 to generate sentences with a fixed number of words. * @param wordCount * @param randomWordsToAdd @@ -120,7 +120,7 @@ public String sentence(int wordCount, int randomWordsToAdd) { } public List sentences(int sentenceCount) { - List sentences = new ArrayList(sentenceCount); + List sentences = new ArrayList<>(sentenceCount); for (int i = 0; i < sentenceCount; i++) { sentences.add(sentence()); } @@ -136,7 +136,7 @@ public String paragraph() { } public List paragraphs(int paragraphCount) { - List paragraphs = new ArrayList(paragraphCount); + List paragraphs = new ArrayList<>(paragraphCount); for (int i = 0; i < paragraphCount; i++) { paragraphs.add(paragraph()); } diff --git a/src/main/java/com/github/javafaker/Number.java b/src/main/java/com/github/javafaker/Number.java index 3afa93c..115533b 100644 --- a/src/main/java/com/github/javafaker/Number.java +++ b/src/main/java/com/github/javafaker/Number.java @@ -1,6 +1,7 @@ package com.github.javafaker; import java.math.BigDecimal; +import java.math.RoundingMode; public class Number { private final Faker faker; @@ -24,17 +25,17 @@ public int randomDigitNotZero() { } /** - * @see Number#numberBetween(long, long) + * @see Number#numberBetween(long, long) */ public int numberBetween(int min, int max) { if (min == max) return min; - int value = decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue(); + int value = decimalBetween(min,max).setScale(0, RoundingMode.HALF_DOWN).intValue(); return value == max ? value - 1 : value; } /** - * Return a number between min and max. If + * Return a number between min and max. If * min == max, then min is returned. So numberBetween(2,2) will yield 2 even though * it doesn't make sense. * @@ -44,10 +45,10 @@ public int numberBetween(int min, int max) { public long numberBetween(long min, long max) { if (min == max) return min; - long value = decimalBetween(min, max).setScale(0, BigDecimal.ROUND_HALF_DOWN).longValue(); + long value = decimalBetween(min, max).setScale(0, RoundingMode.HALF_DOWN).longValue(); return value == max ? value - 1 : value; } - + /** * @param numberOfDigits the number of digits the generated value should have * @param strict whether or not the generated value should have exactly numberOfDigits @@ -82,7 +83,7 @@ public double randomDouble(int maxNumberOfDecimals, int min, int max) { */ public double randomDouble(int maxNumberOfDecimals, long min, long max) { return decimalBetween(min,max) - .setScale(maxNumberOfDecimals, BigDecimal.ROUND_HALF_DOWN) + .setScale(maxNumberOfDecimals, RoundingMode.HALF_DOWN) .doubleValue(); } @@ -99,13 +100,12 @@ private BigDecimal decimalBetween(long min, long max) { final long trueMax = Math.max(min, max); final double range = (double) trueMax - (double) trueMin; - + final double chunkCount = Math.sqrt(Math.abs(range)); - final double chunkSize = chunkCount; final long randomChunk = faker.random().nextLong((long) chunkCount); - final double chunkStart = trueMin + randomChunk * chunkSize; - final double adj = chunkSize * faker.random().nextDouble(); + final double chunkStart = trueMin + randomChunk * chunkCount; + final double adj = chunkCount * faker.random().nextDouble(); return new BigDecimal(chunkStart + adj); } diff --git a/src/main/java/com/github/javafaker/Sip.java b/src/main/java/com/github/javafaker/Sip.java index ab9ad57..3c59e8d 100644 --- a/src/main/java/com/github/javafaker/Sip.java +++ b/src/main/java/com/github/javafaker/Sip.java @@ -16,7 +16,7 @@ public final class Sip { protected Sip(final Faker faker) { this.faker = faker; int port = 40000; - portPool = new ArrayList(); + portPool = new ArrayList<>(); while (port <= 50000) { portPool.add(port); port = port + 2; diff --git a/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java b/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java index 8bd0d19..637289f 100644 --- a/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java +++ b/src/main/java/com/github/javafaker/idnumbers/SvSEIdNumber.java @@ -1,11 +1,11 @@ package com.github.javafaker.idnumbers; -import com.github.javafaker.Faker; - import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import com.github.javafaker.Faker; + /** * Implementation based on the definition at * https://www.skatteverket.se/privat/folkbokforing/personnummer.4.3810a01c150939e893f18c29.html @@ -105,4 +105,4 @@ private int calculateDigitSum(String numbers) { return sum; } -} \ No newline at end of file +} diff --git a/src/main/java/com/github/javafaker/service/FakeValues.java b/src/main/java/com/github/javafaker/service/FakeValues.java index 62fd19e..043a264 100644 --- a/src/main/java/com/github/javafaker/service/FakeValues.java +++ b/src/main/java/com/github/javafaker/service/FakeValues.java @@ -1,7 +1,5 @@ package com.github.javafaker.service; -import org.yaml.snakeyaml.Yaml; - import java.io.IOException; import java.io.InputStream; import java.util.Arrays; @@ -9,6 +7,8 @@ import java.util.Locale; import java.util.Map; +import org.yaml.snakeyaml.Yaml; + public class FakeValues implements FakeValuesInterface { private final Locale locale; private final 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 bd34d53..e1ccc37 100644 --- a/src/main/java/com/github/javafaker/service/FakeValuesGrouping.java +++ b/src/main/java/com/github/javafaker/service/FakeValuesGrouping.java @@ -6,7 +6,7 @@ public class FakeValuesGrouping implements FakeValuesInterface { - private List fakeValuesList = new ArrayList(); + private List fakeValuesList = new ArrayList<>(); public void add(FakeValues fakeValues) { fakeValuesList.add(fakeValues); diff --git a/src/main/java/com/github/javafaker/service/FakeValuesService.java b/src/main/java/com/github/javafaker/service/FakeValuesService.java index 13a75b0..7fa1509 100644 --- a/src/main/java/com/github/javafaker/service/FakeValuesService.java +++ b/src/main/java/com/github/javafaker/service/FakeValuesService.java @@ -1,13 +1,5 @@ package com.github.javafaker.service; -import com.github.javafaker.Address; -import com.github.javafaker.Faker; -import com.github.javafaker.Name; -import com.github.javafaker.service.files.EnFile; -import com.mifmif.common.regex.Generex; -import org.apache.commons.lang3.ClassUtils; -import org.apache.commons.lang3.StringUtils; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -21,6 +13,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.lang3.Strings; + +import com.github.javafaker.Address; +import com.github.javafaker.Faker; +import com.github.javafaker.Name; +import com.github.javafaker.service.files.EnFile; +import com.mifmif.common.regex.Generex; + public class FakeValuesService { private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?((?:,?'([^']+)')*)\\}"); @@ -93,9 +94,9 @@ protected List localeChain(Locale from) { final Locale normalized = normalizeLocale(from); - final List chain = new ArrayList(3); + final List chain = new ArrayList<>(3); chain.add(normalized); - if (!"".equals(normalized.getCountry()) && !Locale.ENGLISH.getLanguage().equals(normalized.getLanguage())) { + if (!normalized.getCountry().isEmpty() && !Locale.ENGLISH.getLanguage().equals(normalized.getLanguage())) { chain.add(new Locale(normalized.getLanguage())); } chain.add(Locale.ENGLISH); // default @@ -160,7 +161,7 @@ public String safeFetch(String key, String defaultIfNull) { if (o == null) return defaultIfNull; if (o instanceof List) { List values = (List) o; - if (values.size() == 0) { + if (values.isEmpty()) { return defaultIfNull; } return values.get(randomService.nextInt(values.size())); @@ -178,7 +179,6 @@ public String safeFetch(String key, String defaultIfNull) { * dot. E.g. name.first_name * @return */ - @SuppressWarnings("unchecked") public Object fetchObject(String key) { String[] path = key.split("\\."); @@ -188,7 +188,7 @@ public Object fetchObject(String key) { for (int p = 0; currentValue != null && p < path.length; p++) { String currentPath = path[p]; if (currentValue instanceof Map) { - currentValue = ((Map) currentValue).get(currentPath); + currentValue = ((Map) currentValue).get(currentPath); } else { currentValue = ((FakeValuesInterface) currentValue).get(currentPath); } @@ -349,7 +349,7 @@ protected String resolveExpression(String expression, Object current, Faker root final String directive = matcher.group(1); final String arguments = matcher.group(2); final Matcher argsMatcher = EXPRESSION_ARGUMENTS_PATTERN.matcher(arguments); - List args = new ArrayList(); + List args = new ArrayList<>(); while (argsMatcher.find()) { args.add(argsMatcher.group(1)); } @@ -361,7 +361,7 @@ protected String resolveExpression(String expression, Object current, Faker root } resolved = resolveExpression(resolved, current, root); - result = StringUtils.replaceOnce(result, escapedDirective, resolved); + result = Strings.CS.replaceOnce(result, escapedDirective, resolved); } return result; } @@ -543,7 +543,7 @@ private MethodAndCoercedArgs accessor(Object onObject, String name, List * @throws Exception if unable to coerce */ private List coerceArguments(Method accessor, List args) { - final List coerced = new ArrayList(); + final List coerced = new ArrayList<>(); for (int i = 0; i < accessor.getParameterTypes().length; i++) { Class toType = ClassUtils.primitiveToWrapper(accessor.getParameterTypes()[i]); diff --git a/src/main/java/com/github/javafaker/service/files/EnFile.java b/src/main/java/com/github/javafaker/service/files/EnFile.java index 4a77ac0..0bf6508 100644 --- a/src/main/java/com/github/javafaker/service/files/EnFile.java +++ b/src/main/java/com/github/javafaker/service/files/EnFile.java @@ -199,7 +199,7 @@ public String getPath() { public static List getFiles() { - List files = new ArrayList(); + List files = new ArrayList<>(); for (String file : FILES) { files.add(new EnFile(file)); } diff --git a/src/test/java/com/github/javafaker/AddressTest.java b/src/test/java/com/github/javafaker/AddressTest.java index 44c36e4..ba7ac94 100644 --- a/src/test/java/com/github/javafaker/AddressTest.java +++ b/src/test/java/com/github/javafaker/AddressTest.java @@ -10,7 +10,7 @@ import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class AddressTest extends AbstractFakerTest { @@ -35,7 +35,7 @@ public void testLatitude() { for (int i = 0; i < 100; i++) { latStr = faker.address().latitude().replace(decimalSeparator, '.'); assertThat(latStr, isANumber()); - lat = new Double(latStr); + lat = Double.valueOf(latStr); assertThat("Latitude is less then -90", lat, greaterThanOrEqualTo(-90.0)); assertThat("Latitude is greater than 90", lat, lessThanOrEqualTo(90.0)); } @@ -48,7 +48,7 @@ public void testLongitude() { for (int i = 0; i < 100; i++) { longStr = faker.address().longitude().replace(decimalSeparator, '.'); assertThat(longStr, isANumber()); - lon = new Double(longStr); + lon = Double.valueOf(longStr); assertThat("Longitude is less then -180", lon, greaterThanOrEqualTo(-180.0)); assertThat("Longitude is greater than 180", lon, lessThanOrEqualTo(180.0)); } diff --git a/src/test/java/com/github/javafaker/AncientTest.java b/src/test/java/com/github/javafaker/AncientTest.java index 7842cb5..2fc8b47 100644 --- a/src/test/java/com/github/javafaker/AncientTest.java +++ b/src/test/java/com/github/javafaker/AncientTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class AncientTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/AnimalTest.java b/src/test/java/com/github/javafaker/AnimalTest.java index 6f6ad6f..0d125a8 100644 --- a/src/test/java/com/github/javafaker/AnimalTest.java +++ b/src/test/java/com/github/javafaker/AnimalTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class AnimalTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/AppTest.java b/src/test/java/com/github/javafaker/AppTest.java index 6dc2ecd..1e13d51 100644 --- a/src/test/java/com/github/javafaker/AppTest.java +++ b/src/test/java/com/github/javafaker/AppTest.java @@ -1,9 +1,9 @@ package com.github.javafaker; -import org.junit.Test; - import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; public class AppTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java b/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java index 0f3a950..48981ed 100644 --- a/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java +++ b/src/test/java/com/github/javafaker/AquaTeenHungerForceTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class AquaTeenHungerForceTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/ArtistTest.java b/src/test/java/com/github/javafaker/ArtistTest.java index 13682e4..d6f5877 100644 --- a/src/test/java/com/github/javafaker/ArtistTest.java +++ b/src/test/java/com/github/javafaker/ArtistTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class ArtistTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/AvatarTest.java b/src/test/java/com/github/javafaker/AvatarTest.java index 68dfe43..f138ffc 100644 --- a/src/test/java/com/github/javafaker/AvatarTest.java +++ b/src/test/java/com/github/javafaker/AvatarTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class AvatarTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/AviationTest.java b/src/test/java/com/github/javafaker/AviationTest.java index 6f1ccc9..1f9901f 100644 --- a/src/test/java/com/github/javafaker/AviationTest.java +++ b/src/test/java/com/github/javafaker/AviationTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class AviationTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BackToTheFutureTest.java b/src/test/java/com/github/javafaker/BackToTheFutureTest.java index d28b223..466a044 100644 --- a/src/test/java/com/github/javafaker/BackToTheFutureTest.java +++ b/src/test/java/com/github/javafaker/BackToTheFutureTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BackToTheFutureTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BarcodeTest.java b/src/test/java/com/github/javafaker/BarcodeTest.java index b30b2da..6305140 100644 --- a/src/test/java/com/github/javafaker/BarcodeTest.java +++ b/src/test/java/com/github/javafaker/BarcodeTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BarcodeTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BasketballTest.java b/src/test/java/com/github/javafaker/BasketballTest.java index 2689579..4518487 100644 --- a/src/test/java/com/github/javafaker/BasketballTest.java +++ b/src/test/java/com/github/javafaker/BasketballTest.java @@ -4,7 +4,7 @@ import com.github.javafaker.Faker; import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; 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 2f3dbd0..8733360 100644 --- a/src/test/java/com/github/javafaker/BeerTest.java +++ b/src/test/java/com/github/javafaker/BeerTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BeerTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BojackHorsemanTest.java b/src/test/java/com/github/javafaker/BojackHorsemanTest.java index 5e47149..7cbd17e 100644 --- a/src/test/java/com/github/javafaker/BojackHorsemanTest.java +++ b/src/test/java/com/github/javafaker/BojackHorsemanTest.java @@ -6,6 +6,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; 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 fee76cc..1f5f94f 100644 --- a/src/test/java/com/github/javafaker/BookTest.java +++ b/src/test/java/com/github/javafaker/BookTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BookTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/BoolTest.java b/src/test/java/com/github/javafaker/BoolTest.java index 2c352d3..aa1d062 100644 --- a/src/test/java/com/github/javafaker/BoolTest.java +++ b/src/test/java/com/github/javafaker/BoolTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.isOneOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 8de8522..620f040 100644 --- a/src/test/java/com/github/javafaker/BuffyTest.java +++ b/src/test/java/com/github/javafaker/BuffyTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BuffyTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/BusinessTest.java b/src/test/java/com/github/javafaker/BusinessTest.java index c995570..3e33486 100644 --- a/src/test/java/com/github/javafaker/BusinessTest.java +++ b/src/test/java/com/github/javafaker/BusinessTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BusinessTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/CatTest.java b/src/test/java/com/github/javafaker/CatTest.java index ace0e97..e35d24c 100644 --- a/src/test/java/com/github/javafaker/CatTest.java +++ b/src/test/java/com/github/javafaker/CatTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CatTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/ChuckNorrisTest.java b/src/test/java/com/github/javafaker/ChuckNorrisTest.java index 9f5ffed..3ce69c6 100644 --- a/src/test/java/com/github/javafaker/ChuckNorrisTest.java +++ b/src/test/java/com/github/javafaker/ChuckNorrisTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 dd478df..2f8c533 100644 --- a/src/test/java/com/github/javafaker/CodeTest.java +++ b/src/test/java/com/github/javafaker/CodeTest.java @@ -10,7 +10,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CodeTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/CoinTest.java b/src/test/java/com/github/javafaker/CoinTest.java index feb976a..f676fba 100644 --- a/src/test/java/com/github/javafaker/CoinTest.java +++ b/src/test/java/com/github/javafaker/CoinTest.java @@ -1,6 +1,6 @@ package com.github.javafaker; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import org.junit.Test; @@ -11,4 +11,4 @@ public class CoinTest extends AbstractFakerTest { public void coinFlip() { assertThat(faker.coin().flip(), matchesRegularExpression("\\w+")); } -} \ No newline at end of file +} diff --git a/src/test/java/com/github/javafaker/ColorTest.java b/src/test/java/com/github/javafaker/ColorTest.java index 4222279..f5c5676 100644 --- a/src/test/java/com/github/javafaker/ColorTest.java +++ b/src/test/java/com/github/javafaker/ColorTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class ColorTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/CommerceTest.java b/src/test/java/com/github/javafaker/CommerceTest.java index 4b98296..0344a88 100644 --- a/src/test/java/com/github/javafaker/CommerceTest.java +++ b/src/test/java/com/github/javafaker/CommerceTest.java @@ -5,7 +5,7 @@ import java.text.DecimalFormatSymbols; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 7d88392..d6f2399 100644 --- a/src/test/java/com/github/javafaker/CompanyTest.java +++ b/src/test/java/com/github/javafaker/CompanyTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CompanyTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/CountryTest.java b/src/test/java/com/github/javafaker/CountryTest.java index 3afd7a0..5e77812 100644 --- a/src/test/java/com/github/javafaker/CountryTest.java +++ b/src/test/java/com/github/javafaker/CountryTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class CountryTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/CryptoTest.java b/src/test/java/com/github/javafaker/CryptoTest.java index 285e81c..8530be5 100644 --- a/src/test/java/com/github/javafaker/CryptoTest.java +++ b/src/test/java/com/github/javafaker/CryptoTest.java @@ -1,7 +1,7 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/CurrencyTest.java b/src/test/java/com/github/javafaker/CurrencyTest.java index 0c62082..e57db09 100644 --- a/src/test/java/com/github/javafaker/CurrencyTest.java +++ b/src/test/java/com/github/javafaker/CurrencyTest.java @@ -1,7 +1,7 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/DateAndTimeTest.java b/src/test/java/com/github/javafaker/DateAndTimeTest.java index 0caa27b..5c17f16 100644 --- a/src/test/java/com/github/javafaker/DateAndTimeTest.java +++ b/src/test/java/com/github/javafaker/DateAndTimeTest.java @@ -1,6 +1,3 @@ -/** - * - */ package com.github.javafaker; import org.junit.Test; @@ -10,6 +7,7 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; /** * @author pmiklos diff --git a/src/test/java/com/github/javafaker/DemographicTest.java b/src/test/java/com/github/javafaker/DemographicTest.java index 4b6ab14..7dee47c 100644 --- a/src/test/java/com/github/javafaker/DemographicTest.java +++ b/src/test/java/com/github/javafaker/DemographicTest.java @@ -1,7 +1,7 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/DiseaseTest.java b/src/test/java/com/github/javafaker/DiseaseTest.java index e44d044..d744360 100644 --- a/src/test/java/com/github/javafaker/DiseaseTest.java +++ b/src/test/java/com/github/javafaker/DiseaseTest.java @@ -6,6 +6,7 @@ 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; 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 248cc43..977b0ba 100644 --- a/src/test/java/com/github/javafaker/DogTest.java +++ b/src/test/java/com/github/javafaker/DogTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DogTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/DragonBallTest.java b/src/test/java/com/github/javafaker/DragonBallTest.java index 0e2595e..eda7337 100644 --- a/src/test/java/com/github/javafaker/DragonBallTest.java +++ b/src/test/java/com/github/javafaker/DragonBallTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DragonBallTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/DuneTest.java b/src/test/java/com/github/javafaker/DuneTest.java index beb6f71..b320490 100644 --- a/src/test/java/com/github/javafaker/DuneTest.java +++ b/src/test/java/com/github/javafaker/DuneTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DuneTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/EducatorTest.java b/src/test/java/com/github/javafaker/EducatorTest.java index 2cb8350..96243b8 100644 --- a/src/test/java/com/github/javafaker/EducatorTest.java +++ b/src/test/java/com/github/javafaker/EducatorTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class EducatorTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/ElderScrollsTest.java b/src/test/java/com/github/javafaker/ElderScrollsTest.java index d6c0da0..641c53b 100644 --- a/src/test/java/com/github/javafaker/ElderScrollsTest.java +++ b/src/test/java/com/github/javafaker/ElderScrollsTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class ElderScrollsTest extends AbstractFakerTest { @@ -49,4 +49,4 @@ public void testRegion() { public void testQuote() { assertThat(faker.elderScrolls().quote(), not(isEmptyOrNullString())); } -} \ No newline at end of file +} diff --git a/src/test/java/com/github/javafaker/EnglandFootBallTest.java b/src/test/java/com/github/javafaker/EnglandFootBallTest.java index b203265..2b97806 100644 --- a/src/test/java/com/github/javafaker/EnglandFootBallTest.java +++ b/src/test/java/com/github/javafaker/EnglandFootBallTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 8356d88..6929088 100644 --- a/src/test/java/com/github/javafaker/EsportsTest.java +++ b/src/test/java/com/github/javafaker/EsportsTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class EsportsTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/FakerTest.java b/src/test/java/com/github/javafaker/FakerTest.java index a822f2f..6910559 100644 --- a/src/test/java/com/github/javafaker/FakerTest.java +++ b/src/test/java/com/github/javafaker/FakerTest.java @@ -8,7 +8,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 0bab57f..1abd5c4 100644 --- a/src/test/java/com/github/javafaker/FileTest.java +++ b/src/test/java/com/github/javafaker/FileTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class FileTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/FinanceTest.java b/src/test/java/com/github/javafaker/FinanceTest.java index 3eca220..d389819 100644 --- a/src/test/java/com/github/javafaker/FinanceTest.java +++ b/src/test/java/com/github/javafaker/FinanceTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 0d5ce19..7f697d6 100644 --- a/src/test/java/com/github/javafaker/FoodTest.java +++ b/src/test/java/com/github/javafaker/FoodTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class FoodTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/FriendsTest.java b/src/test/java/com/github/javafaker/FriendsTest.java index 904db33..5376c51 100644 --- a/src/test/java/com/github/javafaker/FriendsTest.java +++ b/src/test/java/com/github/javafaker/FriendsTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 92a9b63..07e2eca 100644 --- a/src/test/java/com/github/javafaker/FunnyNameTest.java +++ b/src/test/java/com/github/javafaker/FunnyNameTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class FunnyNameTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/GameOfThronesTest.java b/src/test/java/com/github/javafaker/GameOfThronesTest.java index 5e56fc4..7657aa8 100644 --- a/src/test/java/com/github/javafaker/GameOfThronesTest.java +++ b/src/test/java/com/github/javafaker/GameOfThronesTest.java @@ -3,7 +3,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +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 c937c73..a8ac5b8 100644 --- a/src/test/java/com/github/javafaker/GenderTest.java +++ b/src/test/java/com/github/javafaker/GenderTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class GenderTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/HackerTest.java b/src/test/java/com/github/javafaker/HackerTest.java index dd18647..133b6cb 100644 --- a/src/test/java/com/github/javafaker/HackerTest.java +++ b/src/test/java/com/github/javafaker/HackerTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class HackerTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/HarryPotterTest.java b/src/test/java/com/github/javafaker/HarryPotterTest.java index 114fa53..364220f 100644 --- a/src/test/java/com/github/javafaker/HarryPotterTest.java +++ b/src/test/java/com/github/javafaker/HarryPotterTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 77421a1..175f080 100644 --- a/src/test/java/com/github/javafaker/HipsterTest.java +++ b/src/test/java/com/github/javafaker/HipsterTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class HipsterTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java b/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java index 86750f9..651bdbe 100644 --- a/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java +++ b/src/test/java/com/github/javafaker/HitchhikersGuideToTheGalaxyTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 82bb7d9..d40c408 100644 --- a/src/test/java/com/github/javafaker/HobbitTest.java +++ b/src/test/java/com/github/javafaker/HobbitTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 51f1444..f087797 100644 --- a/src/test/java/com/github/javafaker/HowIMetYourMotherTest.java +++ b/src/test/java/com/github/javafaker/HowIMetYourMotherTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 95c3120..c2cb906 100644 --- a/src/test/java/com/github/javafaker/IdNumberTest.java +++ b/src/test/java/com/github/javafaker/IdNumberTest.java @@ -5,7 +5,7 @@ import java.util.Locale; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 499993c..d5a5e01 100644 --- a/src/test/java/com/github/javafaker/InternetTest.java +++ b/src/test/java/com/github/javafaker/InternetTest.java @@ -14,7 +14,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static java.lang.Integer.parseInt; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class InternetTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/JobTest.java b/src/test/java/com/github/javafaker/JobTest.java index e86b52f..92191da 100644 --- a/src/test/java/com/github/javafaker/JobTest.java +++ b/src/test/java/com/github/javafaker/JobTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class JobTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/KaamelottTest.java b/src/test/java/com/github/javafaker/KaamelottTest.java index 4d2d729..51dce41 100644 --- a/src/test/java/com/github/javafaker/KaamelottTest.java +++ b/src/test/java/com/github/javafaker/KaamelottTest.java @@ -1,7 +1,7 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java b/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java index 0ff71b0..a05463a 100644 --- a/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java +++ b/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 6a73f77..59116c3 100644 --- a/src/test/java/com/github/javafaker/LebowskiTest.java +++ b/src/test/java/com/github/javafaker/LebowskiTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class LebowskiTest extends AbstractFakerTest { @Test diff --git a/src/test/java/com/github/javafaker/LordOfTheRingsTest.java b/src/test/java/com/github/javafaker/LordOfTheRingsTest.java index 0b61115..cbf01cc 100644 --- a/src/test/java/com/github/javafaker/LordOfTheRingsTest.java +++ b/src/test/java/com/github/javafaker/LordOfTheRingsTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * @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 8a56889..f8e1f72 100644 --- a/src/test/java/com/github/javafaker/LoremTest.java +++ b/src/test/java/com/github/javafaker/LoremTest.java @@ -7,7 +7,7 @@ import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/MatzTest.java b/src/test/java/com/github/javafaker/MatzTest.java index b6efb13..eac0bf4 100644 --- a/src/test/java/com/github/javafaker/MatzTest.java +++ b/src/test/java/com/github/javafaker/MatzTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 4efde2c..9cfc424 100644 --- a/src/test/java/com/github/javafaker/MedicalTest.java +++ b/src/test/java/com/github/javafaker/MedicalTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class MedicalTest extends AbstractFakerTest { @@ -28,4 +28,4 @@ public void testSymptom() { } -} \ No newline at end of file +} diff --git a/src/test/java/com/github/javafaker/MountainTest.java b/src/test/java/com/github/javafaker/MountainTest.java index 0eac022..2cc219d 100644 --- a/src/test/java/com/github/javafaker/MountainTest.java +++ b/src/test/java/com/github/javafaker/MountainTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 6015ae5..5ccbc63 100644 --- a/src/test/java/com/github/javafaker/MusicTest.java +++ b/src/test/java/com/github/javafaker/MusicTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class MusicTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/NameTest.java b/src/test/java/com/github/javafaker/NameTest.java index 6649fdd..721b762 100644 --- a/src/test/java/com/github/javafaker/NameTest.java +++ b/src/test/java/com/github/javafaker/NameTest.java @@ -6,7 +6,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/src/test/java/com/github/javafaker/NationTest.java b/src/test/java/com/github/javafaker/NationTest.java index febe5ff..c3cfbc7 100644 --- a/src/test/java/com/github/javafaker/NationTest.java +++ b/src/test/java/com/github/javafaker/NationTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 c4aae78..b517df5 100644 --- a/src/test/java/com/github/javafaker/NumberTest.java +++ b/src/test/java/com/github/javafaker/NumberTest.java @@ -17,7 +17,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class NumberTest extends AbstractFakerTest { @@ -185,7 +185,7 @@ public void numberBetweenLongLongZeroMinMax() { assertThat("Calling numberBetween with min==max yields min, with 0", faker.number().numberBetween(0L, 0L), is(0L)); - assertThat("Calling numberBetween with min==max yields min", + assertThat("Calling numberBetween with min==max yields min", faker.number().numberBetween(2L, 2L), is(2L)); } @@ -201,7 +201,7 @@ public void numberBetweenLongLongZeroMinMax() { */ @Test public void randomDoubleRandomizationQuality() { - Function, Double> minMaxRangeToUniquePercentageFunction = new Function, Double>() { + Function, Double> minMaxRangeToUniquePercentageFunction = new Function<>() { @Override public Double apply(Pair minMax) { final int min = minMax.getLeft().intValue(), max = minMax.getRight().intValue(); @@ -233,12 +233,12 @@ public Double call() throws Exception { * calculate the uniqueness for that given min/max range. * For all 'uniqueness' values * verify the percentage of 'uniqueness' ratios over 80% is 90%. - * + * * This isn't perfect but it ensures a pretty good degree of uniqueness in the random number generation. */ @Test public void numberBetweenIntIntRandomizationQuality() { - Function, Double> minMaxRangeToUniquePercentageFunction = new Function, Double>() { + Function, Double> minMaxRangeToUniquePercentageFunction = new Function<>() { @Override public Double apply(Pair minMax) { final int min = minMax.getLeft().intValue(); @@ -276,7 +276,7 @@ public Integer call() throws Exception { */ @Test public void numberBetweenLongLongRandomizationQuality() { - Function, Double> minMaxRangeToUniquePercentageFunction = new Function, Double>() { + Function, Double> minMaxRangeToUniquePercentageFunction = new Function<>() { @Override public Double apply(Pair minMax) { final long min = minMax.getLeft(), max = minMax.getRight(); @@ -290,7 +290,7 @@ public Long call() throws Exception { }); } }; - + final double percentGreaterThan80Percent = randomizationQualityTest(individualRunGtPercentUnique, minMaxRangeToUniquePercentageFunction); assertThat("Percentage of runs > 80% unique is gte 90%", percentGreaterThan80Percent, greaterThanOrEqualTo(percentRunsGtUniquePercentage)); @@ -329,14 +329,14 @@ public void testDigits() { * Over the series of numbers identified from RANDOMIZATION_QUALITY_RANGE_START to * RANDOMIZATION_QUALITY_RANGE_END, create a min/max range of -value/value and * with of those min/max values, call percentUniqueRunner. - * + * * Collect the number of calls to percentUniqueRunner that were * above the threshold and finally return that number divided by the total number of calls to * percentUniqueRunner. - * + * * @return percent of percentUniqueRunner's results greater than the threshold */ - private double randomizationQualityTest(final double threshold, + private double randomizationQualityTest(final double threshold, final Function,Double> percentUniqueRunner) { final int rangeEnd = RANDOMIZATION_QUALITY_RANGE_END; final int rangeStep = RANDOMIZATION_QUALITY_RANGE_STEP; @@ -357,7 +357,7 @@ private double randomizationQualityTest(final double threshold, return (double) greaterThanThreshold.get() / (double) total.get(); } - + /** * Given a number of iterations, calls callable 'iterations' times and collects the results, * then calculates the number of results that were unique and returns the percentage that where unique. diff --git a/src/test/java/com/github/javafaker/OptionsTest.java b/src/test/java/com/github/javafaker/OptionsTest.java index 67e9a17..fa7996f 100644 --- a/src/test/java/com/github/javafaker/OptionsTest.java +++ b/src/test/java/com/github/javafaker/OptionsTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.isIn; import static org.hamcrest.Matchers.isOneOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 8379649..2bc2fbb 100644 --- a/src/test/java/com/github/javafaker/OverwatchTest.java +++ b/src/test/java/com/github/javafaker/OverwatchTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 a1df875..fb78239 100644 --- a/src/test/java/com/github/javafaker/PhoneNumberTest.java +++ b/src/test/java/com/github/javafaker/PhoneNumberTest.java @@ -5,7 +5,7 @@ import java.util.Locale; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 40e1635..0a03d50 100644 --- a/src/test/java/com/github/javafaker/PhotographyTest.java +++ b/src/test/java/com/github/javafaker/PhotographyTest.java @@ -5,6 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; public class PhotographyTest extends AbstractFakerTest{ @@ -68,4 +69,4 @@ private void assertNonNullOrEmpty(String value) { assertNotNull(value); assertFalse(value.isEmpty()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/github/javafaker/PokemonTest.java b/src/test/java/com/github/javafaker/PokemonTest.java index 0968561..40a3718 100644 --- a/src/test/java/com/github/javafaker/PokemonTest.java +++ b/src/test/java/com/github/javafaker/PokemonTest.java @@ -1,7 +1,7 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/PrincessBrideTest.java b/src/test/java/com/github/javafaker/PrincessBrideTest.java index cf83051..32d6433 100644 --- a/src/test/java/com/github/javafaker/PrincessBrideTest.java +++ b/src/test/java/com/github/javafaker/PrincessBrideTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 e6d9837..ca11d31 100644 --- a/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java +++ b/src/test/java/com/github/javafaker/ProgrammingLanguageTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class ProgrammingLanguageTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/RelationshipTest.java b/src/test/java/com/github/javafaker/RelationshipTest.java index 38e372e..e23e18c 100644 --- a/src/test/java/com/github/javafaker/RelationshipTest.java +++ b/src/test/java/com/github/javafaker/RelationshipTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import org.junit.Before; diff --git a/src/test/java/com/github/javafaker/RickAndMortyTest.java b/src/test/java/com/github/javafaker/RickAndMortyTest.java index 7025cc1..4df76c4 100644 --- a/src/test/java/com/github/javafaker/RickAndMortyTest.java +++ b/src/test/java/com/github/javafaker/RickAndMortyTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 d3f1ea1..cf83b32 100644 --- a/src/test/java/com/github/javafaker/RobinTest.java +++ b/src/test/java/com/github/javafaker/RobinTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class RobinTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/RockBandTest.java b/src/test/java/com/github/javafaker/RockBandTest.java index c6993ba..999deec 100644 --- a/src/test/java/com/github/javafaker/RockBandTest.java +++ b/src/test/java/com/github/javafaker/RockBandTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class RockBandTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/ShakespeareTest.java b/src/test/java/com/github/javafaker/ShakespeareTest.java index fdd593a..1cc58dc 100644 --- a/src/test/java/com/github/javafaker/ShakespeareTest.java +++ b/src/test/java/com/github/javafaker/ShakespeareTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 da60c51..731f3f4 100644 --- a/src/test/java/com/github/javafaker/SipTest.java +++ b/src/test/java/com/github/javafaker/SipTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 a5dc5d7..d7e1d5a 100644 --- a/src/test/java/com/github/javafaker/SlackEmojiTest.java +++ b/src/test/java/com/github/javafaker/SlackEmojiTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class SlackEmojiTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/SpaceTest.java b/src/test/java/com/github/javafaker/SpaceTest.java index df8c13e..fadb60b 100644 --- a/src/test/java/com/github/javafaker/SpaceTest.java +++ b/src/test/java/com/github/javafaker/SpaceTest.java @@ -1,7 +1,7 @@ package com.github.javafaker; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; diff --git a/src/test/java/com/github/javafaker/StarCraftTest.java b/src/test/java/com/github/javafaker/StarCraftTest.java index d221e5b..32fdcb4 100644 --- a/src/test/java/com/github/javafaker/StarCraftTest.java +++ b/src/test/java/com/github/javafaker/StarCraftTest.java @@ -4,7 +4,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 3effea0..51dd3da 100644 --- a/src/test/java/com/github/javafaker/StarTrekTest.java +++ b/src/test/java/com/github/javafaker/StarTrekTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; diff --git a/src/test/java/com/github/javafaker/StockTest.java b/src/test/java/com/github/javafaker/StockTest.java index 3026460..0f912e3 100644 --- a/src/test/java/com/github/javafaker/StockTest.java +++ b/src/test/java/com/github/javafaker/StockTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; +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 c2babf2..9140677 100644 --- a/src/test/java/com/github/javafaker/SuperheroTest.java +++ b/src/test/java/com/github/javafaker/SuperheroTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class SuperheroTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/TeamTest.java b/src/test/java/com/github/javafaker/TeamTest.java index 2bc0128..deb99e5 100644 --- a/src/test/java/com/github/javafaker/TeamTest.java +++ b/src/test/java/com/github/javafaker/TeamTest.java @@ -6,7 +6,7 @@ import static com.github.javafaker.matchers.IsStringWithContents.isStringWithContents; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class TeamTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/TwinPeaksTest.java b/src/test/java/com/github/javafaker/TwinPeaksTest.java index a5a67c8..2961a29 100644 --- a/src/test/java/com/github/javafaker/TwinPeaksTest.java +++ b/src/test/java/com/github/javafaker/TwinPeaksTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; 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 18e397d..bc6af2e 100644 --- a/src/test/java/com/github/javafaker/UniversityTest.java +++ b/src/test/java/com/github/javafaker/UniversityTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class UniversityTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/WeatherTest.java b/src/test/java/com/github/javafaker/WeatherTest.java index 758f3ee..4f298ca 100644 --- a/src/test/java/com/github/javafaker/WeatherTest.java +++ b/src/test/java/com/github/javafaker/WeatherTest.java @@ -5,7 +5,7 @@ import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class WeatherTest extends AbstractFakerTest { @@ -37,4 +37,4 @@ public void temperatureFahrenheitInRange() { assertThat(faker.weather().temperatureFahrenheit(-5, 5), matchesRegularExpression("[-]?[0-5]°F")); } } -} \ No newline at end of file +} diff --git a/src/test/java/com/github/javafaker/WitcherTest.java b/src/test/java/com/github/javafaker/WitcherTest.java index 59c8475..e37df91 100644 --- a/src/test/java/com/github/javafaker/WitcherTest.java +++ b/src/test/java/com/github/javafaker/WitcherTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class WitcherTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/YodaTest.java b/src/test/java/com/github/javafaker/YodaTest.java index 282df4e..2095fbc 100644 --- a/src/test/java/com/github/javafaker/YodaTest.java +++ b/src/test/java/com/github/javafaker/YodaTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * @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 6c72ef3..3d78dbb 100644 --- a/src/test/java/com/github/javafaker/ZeldaTest.java +++ b/src/test/java/com/github/javafaker/ZeldaTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class ZeldaTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/idnumbers/SwedishIdNumberTest.java b/src/test/java/com/github/javafaker/idnumbers/SwedishIdNumberTest.java index a065cb6..7b8f9d4 100644 --- a/src/test/java/com/github/javafaker/idnumbers/SwedishIdNumberTest.java +++ b/src/test/java/com/github/javafaker/idnumbers/SwedishIdNumberTest.java @@ -1,10 +1,10 @@ package com.github.javafaker.idnumbers; -import org.junit.Test; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import org.junit.Test; + public class SwedishIdNumberTest { @Test diff --git a/src/test/java/com/github/javafaker/integration/FakerIT.java b/src/test/java/com/github/javafaker/integration/FakerIT.java index 24e57b2..dfb1c06 100644 --- a/src/test/java/com/github/javafaker/integration/FakerIT.java +++ b/src/test/java/com/github/javafaker/integration/FakerIT.java @@ -1,7 +1,30 @@ package com.github.javafaker.integration; -import com.github.javafaker.Faker; -import com.google.common.collect.Maps; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.startsWith; +import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.reflections.ReflectionUtils.getAllMethods; +import static org.reflections.ReflectionUtils.withModifier; +import static org.reflections.ReflectionUtils.withParametersCount; +import static org.reflections.ReflectionUtils.withReturnType; + +import java.io.File; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; +import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.junit.Ignore; @@ -11,16 +34,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.*; - -import static org.hamcrest.Matchers.*; -import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.Assert.assertThat; -import static org.reflections.ReflectionUtils.*; +import com.github.javafaker.Faker; +import com.google.common.collect.Maps; /** * The purpose of these tests is to ensure that the Locales have been properly configured @@ -89,7 +104,7 @@ public static Collection data() { dataFromYmlFiles[i][0] = new Locale(StringUtils.substringBefore(ymlFileName, ".")); } - List allData = new ArrayList(Arrays.asList(data)); + List allData = new ArrayList<>(Arrays.asList(data)); allData.addAll(Arrays.asList(dataFromYmlFiles)); return allData; } diff --git a/src/test/java/com/github/javafaker/integration/Issue194SlashFormatRegexIT.java b/src/test/java/com/github/javafaker/integration/Issue194SlashFormatRegexIT.java index c0ec580..8ecbea4 100644 --- a/src/test/java/com/github/javafaker/integration/Issue194SlashFormatRegexIT.java +++ b/src/test/java/com/github/javafaker/integration/Issue194SlashFormatRegexIT.java @@ -1,14 +1,14 @@ package com.github.javafaker.integration; -import com.github.javafaker.Faker; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.MatcherAssert.assertThat; + +import java.util.Locale; import org.junit.Ignore; import org.junit.Test; -import java.util.Locale; - -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.junit.Assert.assertThat; +import com.github.javafaker.Faker; @Ignore public class Issue194SlashFormatRegexIT { diff --git a/src/test/java/com/github/javafaker/integration/MostSpecificLocaleIT.java b/src/test/java/com/github/javafaker/integration/MostSpecificLocaleIT.java index d79704b..46b4f1b 100644 --- a/src/test/java/com/github/javafaker/integration/MostSpecificLocaleIT.java +++ b/src/test/java/com/github/javafaker/integration/MostSpecificLocaleIT.java @@ -1,15 +1,18 @@ package com.github.javafaker.integration; -import com.github.javafaker.service.FakeValuesService; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import java.util.List; import java.util.Locale; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import com.github.javafaker.service.FakeValuesService; /** * The purpose of these tests is to ensure that the Locales have been properly configured diff --git a/src/test/java/com/github/javafaker/integration/UkLocalDirectivesTest.java b/src/test/java/com/github/javafaker/integration/UkLocalDirectivesTest.java index f1fda71..f4c6d54 100644 --- a/src/test/java/com/github/javafaker/integration/UkLocalDirectivesTest.java +++ b/src/test/java/com/github/javafaker/integration/UkLocalDirectivesTest.java @@ -1,16 +1,16 @@ package com.github.javafaker.integration; -import com.github.javafaker.Faker; -import com.google.common.collect.Lists; - -import org.junit.Ignore; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import java.util.ArrayList; import java.util.Locale; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import org.junit.Ignore; +import org.junit.Test; + +import com.github.javafaker.Faker; +import com.google.common.collect.Lists; /** * The purpose of these tests is to ensure that the Locales have been properly configured diff --git a/src/test/java/com/github/javafaker/matchers/IsANumber.java b/src/test/java/com/github/javafaker/matchers/IsANumber.java index 6170269..b6635c6 100644 --- a/src/test/java/com/github/javafaker/matchers/IsANumber.java +++ b/src/test/java/com/github/javafaker/matchers/IsANumber.java @@ -10,7 +10,7 @@ public class IsANumber extends TypeSafeMatcher { @Override protected boolean matchesSafely(String item) { try { - new Double(item); + Double.valueOf(item); } catch (NumberFormatException nfe) { return false; } diff --git a/src/test/java/com/github/javafaker/matchers/IsANumberTest.java b/src/test/java/com/github/javafaker/matchers/IsANumberTest.java index 6b4c666..66e430e 100644 --- a/src/test/java/com/github/javafaker/matchers/IsANumberTest.java +++ b/src/test/java/com/github/javafaker/matchers/IsANumberTest.java @@ -1,10 +1,10 @@ package com.github.javafaker.matchers; -import org.junit.Test; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import org.junit.Test; + public class IsANumberTest { @Test diff --git a/src/test/java/com/github/javafaker/matchers/IsStringWithContentsTest.java b/src/test/java/com/github/javafaker/matchers/IsStringWithContentsTest.java index c437ce9..2bb8c02 100644 --- a/src/test/java/com/github/javafaker/matchers/IsStringWithContentsTest.java +++ b/src/test/java/com/github/javafaker/matchers/IsStringWithContentsTest.java @@ -1,11 +1,11 @@ package com.github.javafaker.matchers; -import org.junit.Before; -import org.junit.Test; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import org.junit.Before; +import org.junit.Test; + public class IsStringWithContentsTest { private IsStringWithContents matcher; diff --git a/src/test/java/com/github/javafaker/repeating/Repeat.java b/src/test/java/com/github/javafaker/repeating/Repeat.java index 3639f53..47de870 100644 --- a/src/test/java/com/github/javafaker/repeating/Repeat.java +++ b/src/test/java/com/github/javafaker/repeating/Repeat.java @@ -4,7 +4,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Pulled from https://gist.github.com/fappel/8bcb2aea4b39ff9cfb6e + * Pulled from fappel */ @Retention( RetentionPolicy.RUNTIME ) @Target( { diff --git a/src/test/java/com/github/javafaker/service/FakeValuesGroupingTest.java b/src/test/java/com/github/javafaker/service/FakeValuesGroupingTest.java index 09ba3cc..f9de9e7 100644 --- a/src/test/java/com/github/javafaker/service/FakeValuesGroupingTest.java +++ b/src/test/java/com/github/javafaker/service/FakeValuesGroupingTest.java @@ -1,13 +1,13 @@ package com.github.javafaker.service; -import org.junit.Before; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; import java.util.Locale; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Test; public class FakeValuesGroupingTest { diff --git a/src/test/java/com/github/javafaker/service/FakeValuesServiceTest.java b/src/test/java/com/github/javafaker/service/FakeValuesServiceTest.java index 85eb671..f58ea64 100644 --- a/src/test/java/com/github/javafaker/service/FakeValuesServiceTest.java +++ b/src/test/java/com/github/javafaker/service/FakeValuesServiceTest.java @@ -1,14 +1,21 @@ package com.github.javafaker.service; -import com.github.javafaker.AbstractFakerTest; -import com.github.javafaker.Faker; -import com.github.javafaker.Superhero; -import org.hamcrest.core.Is; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; +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.greaterThan; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.isOneOf; +import static org.hamcrest.Matchers.lessThan; +import static org.junit.Assert.*; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -17,11 +24,16 @@ import java.util.List; import java.util.Locale; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.*; +import org.hamcrest.core.Is; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +import com.github.javafaker.AbstractFakerTest; +import com.github.javafaker.Faker; +import com.github.javafaker.Superhero; public class FakeValuesServiceTest extends AbstractFakerTest { diff --git a/src/test/java/com/github/javafaker/service/FakeValuesTest.java b/src/test/java/com/github/javafaker/service/FakeValuesTest.java index 1710efe..1a3acad 100644 --- a/src/test/java/com/github/javafaker/service/FakeValuesTest.java +++ b/src/test/java/com/github/javafaker/service/FakeValuesTest.java @@ -1,13 +1,14 @@ package com.github.javafaker.service; -import org.junit.Before; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; import java.util.Locale; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Test; public class FakeValuesTest { diff --git a/src/test/java/com/github/javafaker/service/RandomServiceTest.java b/src/test/java/com/github/javafaker/service/RandomServiceTest.java index 1e18de1..0d0176e 100644 --- a/src/test/java/com/github/javafaker/service/RandomServiceTest.java +++ b/src/test/java/com/github/javafaker/service/RandomServiceTest.java @@ -1,19 +1,23 @@ package com.github.javafaker.service; -import com.github.javafaker.AbstractFakerTest; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import static org.hamcrest.CoreMatchers.*; +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.hamcrest.core.CombinableMatcher.both; import java.util.Arrays; import java.util.Collection; import java.util.Random; -import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.core.CombinableMatcher.both; -import static org.junit.Assert.assertThat; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import com.github.javafaker.AbstractFakerTest; /** * @author pmiklos @@ -36,7 +40,7 @@ public static Collection data() { }; return Arrays.asList(data); } - + @Test(expected = IllegalArgumentException.class) public void testPositiveBoundariesOnly() { randomService.nextLong(0L);