diff --git a/pom.xml b/pom.xml index c3cedd4..7910e31 100644 --- a/pom.xml +++ b/pom.xml @@ -88,9 +88,9 @@ test - junit - junit - 4.13.1 + org.hamcrest + hamcrest + 2.2 test @@ -99,6 +99,12 @@ 1.3 test + + org.junit.jupiter + junit-jupiter + 5.14.1 + test + org.reflections reflections @@ -108,7 +114,7 @@ org.mockito mockito-core - 2.23.4 + 4.11.0 test @@ -139,6 +145,24 @@ + + org.openrewrite.maven + rewrite-maven-plugin + 6.26.0 + + true + + org.openrewrite.java.testing.junit5.JUnit4to5Migration + + + + + org.openrewrite.recipe + rewrite-testing-frameworks + 3.5.1 + + + diff --git a/src/test/java/org/thejavaguy/javafaker/AbstractFakerTest.java b/src/test/java/org/thejavaguy/javafaker/AbstractFakerTest.java index 0a7cd5a..a4db117 100644 --- a/src/test/java/org/thejavaguy/javafaker/AbstractFakerTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AbstractFakerTest.java @@ -5,24 +5,24 @@ import java.util.logging.LogManager; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Rule; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.MockitoAnnotations; import org.mockito.Spy; - import org.thejavaguy.javafaker.repeating.RepeatRule; +@ExtendWith(RepeatRule.class) public class AbstractFakerTest { - @Rule - public RepeatRule repeatRule = new RepeatRule(); - @Spy protected Faker faker; - @Before + private AutoCloseable closeable; + + @BeforeEach public void before() { - MockitoAnnotations.initMocks(this); + closeable = MockitoAnnotations.openMocks(this); Logger rootLogger = LogManager.getLogManager().getLogger(""); Handler[] handlers = rootLogger.getHandlers(); @@ -32,4 +32,8 @@ public void before() { } } + @AfterEach + void closeMocks() throws Exception{ + closeable.close(); + } } diff --git a/src/test/java/org/thejavaguy/javafaker/AddressTest.java b/src/test/java/org/thejavaguy/javafaker/AddressTest.java index e4624fe..0e07c40 100644 --- a/src/test/java/org/thejavaguy/javafaker/AddressTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AddressTest.java @@ -1,21 +1,21 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.IsANumber.isANumber; -import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.IsANumber.isANumber; +import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.text.DecimalFormatSymbols; import java.util.Locale; import java.util.Random; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AddressTest extends AbstractFakerTest { @@ -91,7 +91,7 @@ public void testCountryCode() { @Test public void testStreetAddressIncludeSecondary() { - assertThat(faker.address().streetAddress(true), not(isEmptyString())); + assertThat(faker.address().streetAddress(true), is(not(emptyString()))); } @Test @@ -104,7 +104,7 @@ public void testCityWithLocaleFranceAndSeed() { @Test public void testFullAddress() { - assertThat(faker.address().fullAddress(), not(isEmptyOrNullString())); + assertThat(faker.address().fullAddress(), is(not(emptyOrNullString()))); } @Test @@ -122,7 +122,7 @@ public void testHungarianZipCodeByState() { @Test public void testCountyByZipCode() { faker = new Faker(new Locale("en-US")); - assertThat(faker.address().countyByZipCode("47732"), not(isEmptyOrNullString())); + assertThat(faker.address().countyByZipCode("47732"), is(not(emptyOrNullString()))); } @Test diff --git a/src/test/java/org/thejavaguy/javafaker/AncientTest.java b/src/test/java/org/thejavaguy/javafaker/AncientTest.java index e23fd92..63e091d 100644 --- a/src/test/java/org/thejavaguy/javafaker/AncientTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AncientTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AncientTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/AnimalTest.java b/src/test/java/org/thejavaguy/javafaker/AnimalTest.java index 08ab11a..78ac0e3 100644 --- a/src/test/java/org/thejavaguy/javafaker/AnimalTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AnimalTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnimalTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/AppTest.java b/src/test/java/org/thejavaguy/javafaker/AppTest.java index a705ec2..b6ecf26 100644 --- a/src/test/java/org/thejavaguy/javafaker/AppTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AppTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AppTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/AquaTeenHungerForceTest.java b/src/test/java/org/thejavaguy/javafaker/AquaTeenHungerForceTest.java index 7c8fd93..745c6c5 100644 --- a/src/test/java/org/thejavaguy/javafaker/AquaTeenHungerForceTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AquaTeenHungerForceTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AquaTeenHungerForceTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/ArtistTest.java b/src/test/java/org/thejavaguy/javafaker/ArtistTest.java index 9058d34..df6b855 100644 --- a/src/test/java/org/thejavaguy/javafaker/ArtistTest.java +++ b/src/test/java/org/thejavaguy/javafaker/ArtistTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ArtistTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/AvatarTest.java b/src/test/java/org/thejavaguy/javafaker/AvatarTest.java index efc5d5d..73222ca 100644 --- a/src/test/java/org/thejavaguy/javafaker/AvatarTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AvatarTest.java @@ -1,15 +1,14 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; - +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class AvatarTest extends AbstractFakerTest { - @Test + @TestTemplate @Repeat(times=10) public void testAvatar() { String avatar = faker.avatar().image(); diff --git a/src/test/java/org/thejavaguy/javafaker/AviationTest.java b/src/test/java/org/thejavaguy/javafaker/AviationTest.java index 8bbdbc4..85c50b0 100644 --- a/src/test/java/org/thejavaguy/javafaker/AviationTest.java +++ b/src/test/java/org/thejavaguy/javafaker/AviationTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; +import static org.hamcrest.MatcherAssert.assertThat; import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AviationTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/BackToTheFutureTest.java b/src/test/java/org/thejavaguy/javafaker/BackToTheFutureTest.java index 95f2573..338082f 100644 --- a/src/test/java/org/thejavaguy/javafaker/BackToTheFutureTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BackToTheFutureTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; +import static org.hamcrest.MatcherAssert.assertThat; import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BackToTheFutureTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/BarcodeTest.java b/src/test/java/org/thejavaguy/javafaker/BarcodeTest.java index 10bebb3..4daaa81 100644 --- a/src/test/java/org/thejavaguy/javafaker/BarcodeTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BarcodeTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BarcodeTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/BasketballTest.java b/src/test/java/org/thejavaguy/javafaker/BasketballTest.java index 8450257..77e5f47 100644 --- a/src/test/java/org/thejavaguy/javafaker/BasketballTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BasketballTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BasketballTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/BeerTest.java b/src/test/java/org/thejavaguy/javafaker/BeerTest.java index 77859b5..74d2393 100644 --- a/src/test/java/org/thejavaguy/javafaker/BeerTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BeerTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BeerTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/BojackHorsemanTest.java b/src/test/java/org/thejavaguy/javafaker/BojackHorsemanTest.java index afc7e39..a95f75d 100644 --- a/src/test/java/org/thejavaguy/javafaker/BojackHorsemanTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BojackHorsemanTest.java @@ -1,10 +1,11 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BojackHorsemanTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/BookTest.java b/src/test/java/org/thejavaguy/javafaker/BookTest.java index a0b1573..79edda5 100644 --- a/src/test/java/org/thejavaguy/javafaker/BookTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BookTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BookTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/BoolTest.java b/src/test/java/org/thejavaguy/javafaker/BoolTest.java index 9a0586e..94f8197 100644 --- a/src/test/java/org/thejavaguy/javafaker/BoolTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BoolTest.java @@ -1,16 +1,17 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isOneOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.oneOf; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BoolTest extends AbstractFakerTest { @Test public void testBool() { for (int i = 0; i < 100; i++) { - assertThat(faker.bool().bool(), isOneOf(true, false)); + assertThat(faker.bool().bool(), is(oneOf(true, false))); } } } diff --git a/src/test/java/org/thejavaguy/javafaker/BuffyTest.java b/src/test/java/org/thejavaguy/javafaker/BuffyTest.java index daed547..e1e30e4 100644 --- a/src/test/java/org/thejavaguy/javafaker/BuffyTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BuffyTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BuffyTest extends AbstractFakerTest { @Test diff --git a/src/test/java/org/thejavaguy/javafaker/BusinessTest.java b/src/test/java/org/thejavaguy/javafaker/BusinessTest.java index 8f0f06b..17ad3a5 100644 --- a/src/test/java/org/thejavaguy/javafaker/BusinessTest.java +++ b/src/test/java/org/thejavaguy/javafaker/BusinessTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BusinessTest extends AbstractFakerTest { @Test diff --git a/src/test/java/org/thejavaguy/javafaker/CatTest.java b/src/test/java/org/thejavaguy/javafaker/CatTest.java index ae3e0a5..e8fb839 100644 --- a/src/test/java/org/thejavaguy/javafaker/CatTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CatTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CatTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/ChuckNorrisTest.java b/src/test/java/org/thejavaguy/javafaker/ChuckNorrisTest.java index 5b5ccd2..793d8ea 100644 --- a/src/test/java/org/thejavaguy/javafaker/ChuckNorrisTest.java +++ b/src/test/java/org/thejavaguy/javafaker/ChuckNorrisTest.java @@ -1,15 +1,16 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ChuckNorrisTest extends AbstractFakerTest { @Test public void testFact() { - assertThat(faker.chuckNorris().fact(), not(isEmptyOrNullString())); + assertThat(faker.chuckNorris().fact(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/CodeTest.java b/src/test/java/org/thejavaguy/javafaker/CodeTest.java index d9c6007..65c88f5 100644 --- a/src/test/java/org/thejavaguy/javafaker/CodeTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CodeTest.java @@ -1,26 +1,26 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.util.Locale; import org.apache.commons.validator.routines.ISBNValidator; import org.apache.commons.validator.routines.checkdigit.EAN13CheckDigit; import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit; -import org.junit.Test; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class CodeTest extends AbstractFakerTest { private static final ISBNValidator ISBN_VALIDATOR = ISBNValidator.getInstance(false); - @Test + @TestTemplate @Repeat(times = 1000) public void isbn10DefaultIsNoSeparator() { String isbn10 = faker.code().isbn10(); @@ -29,7 +29,7 @@ public void isbn10DefaultIsNoSeparator() { assertThat(isbn10, not(containsString("-"))); } - @Test + @TestTemplate @Repeat(times = 1000) public void isbn13DefaultIsNoSeparator() { String isbn13 = faker.code().isbn13(); @@ -38,7 +38,7 @@ public void isbn13DefaultIsNoSeparator() { assertThat(isbn13, not(containsString("-"))); } - @Test + @TestTemplate @Repeat(times = 1000) public void testIsbn10() { final String isbn10NoSep = faker.code().isbn10(false); @@ -53,7 +53,7 @@ public void testIsbn10() { assertIsValidISBN10(isbn10Sep); } - @Test + @TestTemplate @Repeat(times = 1000) public void testIsbn13() { final String isbn13NoSep = faker.code().isbn13(false); @@ -76,7 +76,7 @@ private void assertIsValidISBN13(String isbn13) { assertThat(isbn13 + " is valid", ISBN_VALIDATOR.isValidISBN13(isbn13), is(true)); } - @Test + @TestTemplate @Repeat(times = 100) public void testOverrides() { Faker faker = new Faker(new Locale("test")); diff --git a/src/test/java/org/thejavaguy/javafaker/CoinTest.java b/src/test/java/org/thejavaguy/javafaker/CoinTest.java index 3887eda..13e40ed 100644 --- a/src/test/java/org/thejavaguy/javafaker/CoinTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CoinTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CoinTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/ColorTest.java b/src/test/java/org/thejavaguy/javafaker/ColorTest.java index 7756fa9..4addc7c 100644 --- a/src/test/java/org/thejavaguy/javafaker/ColorTest.java +++ b/src/test/java/org/thejavaguy/javafaker/ColorTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ColorTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/CommerceTest.java b/src/test/java/org/thejavaguy/javafaker/CommerceTest.java index f06fdf5..8de5900 100644 --- a/src/test/java/org/thejavaguy/javafaker/CommerceTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CommerceTest.java @@ -1,11 +1,11 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.text.DecimalFormatSymbols; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CommerceTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/CompanyTest.java b/src/test/java/org/thejavaguy/javafaker/CompanyTest.java index aa39308..c994a7d 100644 --- a/src/test/java/org/thejavaguy/javafaker/CompanyTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CompanyTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CompanyTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/CountryTest.java b/src/test/java/org/thejavaguy/javafaker/CountryTest.java index d400e3b..147127b 100644 --- a/src/test/java/org/thejavaguy/javafaker/CountryTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CountryTest.java @@ -1,16 +1,16 @@ package org.thejavaguy.javafaker; +import static org.hamcrest.MatcherAssert.assertThat; import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class CountryTest extends AbstractFakerTest { - @Test + @TestTemplate @Repeat(times=10) public void testFlag() { String flag = faker.country().flag(); diff --git a/src/test/java/org/thejavaguy/javafaker/CryptoTest.java b/src/test/java/org/thejavaguy/javafaker/CryptoTest.java index a24bb3a..ab63fb0 100644 --- a/src/test/java/org/thejavaguy/javafaker/CryptoTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CryptoTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CryptoTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/CurrencyTest.java b/src/test/java/org/thejavaguy/javafaker/CurrencyTest.java index af46bec..70b1d61 100644 --- a/src/test/java/org/thejavaguy/javafaker/CurrencyTest.java +++ b/src/test/java/org/thejavaguy/javafaker/CurrencyTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CurrencyTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/DateAndTimeTest.java b/src/test/java/org/thejavaguy/javafaker/DateAndTimeTest.java index 744b18c..1e195d1 100644 --- a/src/test/java/org/thejavaguy/javafaker/DateAndTimeTest.java +++ b/src/test/java/org/thejavaguy/javafaker/DateAndTimeTest.java @@ -5,14 +5,15 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author pmiklos diff --git a/src/test/java/org/thejavaguy/javafaker/DemographicTest.java b/src/test/java/org/thejavaguy/javafaker/DemographicTest.java index f54ab06..e588538 100644 --- a/src/test/java/org/thejavaguy/javafaker/DemographicTest.java +++ b/src/test/java/org/thejavaguy/javafaker/DemographicTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DemographicTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/DiseaseTest.java b/src/test/java/org/thejavaguy/javafaker/DiseaseTest.java index f602348..c4a4bc2 100644 --- a/src/test/java/org/thejavaguy/javafaker/DiseaseTest.java +++ b/src/test/java/org/thejavaguy/javafaker/DiseaseTest.java @@ -1,12 +1,12 @@ package org.thejavaguy.javafaker; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; - -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class DiseaseTest extends AbstractFakerTest { @@ -66,42 +66,42 @@ public void testInternalDiseaseWith10000Times() { assertTrue(isExist); } - @Test + @TestTemplate @Repeat(times = 10000) public void testNeurologyWith10000Times() { Faker faker = new Faker(); assertThat(faker.disease().neurology(), isStringWithContents()); } - @Test + @TestTemplate @Repeat(times = 10000) public void testSurgeryWith10000Times() { Faker faker = new Faker(); assertThat(faker.disease().surgery(), isStringWithContents()); } - @Test + @TestTemplate @Repeat(times = 10000) public void testPaediatricsWith10000Times() { Faker faker = new Faker(); assertThat(faker.disease().paediatrics(), isStringWithContents()); } - @Test + @TestTemplate @Repeat(times = 10000) public void testGynecologyAndObstetricsWith10000Times() { Faker faker = new Faker(); assertThat(faker.disease().gynecologyAndObstetrics(), isStringWithContents()); } - @Test + @TestTemplate @Repeat(times = 10000) public void testOphthalmologyAndOtorhinolaryngologyWith10000Times() { Faker faker = new Faker(); assertThat(faker.disease().ophthalmologyAndOtorhinolaryngology(), isStringWithContents()); } - @Test + @TestTemplate @Repeat(times = 10000) public void testDermatoloryWith10000Times() { Faker faker = new Faker(); diff --git a/src/test/java/org/thejavaguy/javafaker/DogTest.java b/src/test/java/org/thejavaguy/javafaker/DogTest.java index 8022e5b..caf4fe3 100644 --- a/src/test/java/org/thejavaguy/javafaker/DogTest.java +++ b/src/test/java/org/thejavaguy/javafaker/DogTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DogTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/DragonBallTest.java b/src/test/java/org/thejavaguy/javafaker/DragonBallTest.java index 98040f2..59f7b27 100644 --- a/src/test/java/org/thejavaguy/javafaker/DragonBallTest.java +++ b/src/test/java/org/thejavaguy/javafaker/DragonBallTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DragonBallTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/DuneTest.java b/src/test/java/org/thejavaguy/javafaker/DuneTest.java index ffb4cb9..889753f 100644 --- a/src/test/java/org/thejavaguy/javafaker/DuneTest.java +++ b/src/test/java/org/thejavaguy/javafaker/DuneTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class DuneTest extends AbstractFakerTest { @@ -29,7 +29,7 @@ public void quote() { assertThat(faker.dune().quote(), matchesRegularExpression("\\P{Cc}+")); } - @Test + @TestTemplate @Repeat(times = 10000) public void randomQuote() { assertThat( @@ -42,7 +42,7 @@ public void saying() { assertThat(faker.dune().saying(), matchesRegularExpression("\\P{Cc}+")); } - @Test + @TestTemplate @Repeat(times = 10000) public void randomSaying() { assertThat( diff --git a/src/test/java/org/thejavaguy/javafaker/EducatorTest.java b/src/test/java/org/thejavaguy/javafaker/EducatorTest.java index dc880b1..dbd2019 100644 --- a/src/test/java/org/thejavaguy/javafaker/EducatorTest.java +++ b/src/test/java/org/thejavaguy/javafaker/EducatorTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EducatorTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/ElderScrollsTest.java b/src/test/java/org/thejavaguy/javafaker/ElderScrollsTest.java index ea596f8..7027564 100644 --- a/src/test/java/org/thejavaguy/javafaker/ElderScrollsTest.java +++ b/src/test/java/org/thejavaguy/javafaker/ElderScrollsTest.java @@ -1,52 +1,51 @@ - - package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ElderScrollsTest extends AbstractFakerTest { @Test public void testCity() { - assertThat(faker.elderScrolls().city(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().city(), is(not(emptyOrNullString()))); } @Test public void testCreature() { - assertThat(faker.elderScrolls().creature(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().creature(), is(not(emptyOrNullString()))); } @Test public void testDragon() { - assertThat(faker.elderScrolls().dragon(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().dragon(), is(not(emptyOrNullString()))); } @Test public void testFirstName() { - assertThat(faker.elderScrolls().firstName(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().firstName(), is(not(emptyOrNullString()))); } @Test public void testLastName() { - assertThat(faker.elderScrolls().lastName(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().lastName(), is(not(emptyOrNullString()))); } @Test public void testRace() { - assertThat(faker.elderScrolls().race(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().race(), is(not(emptyOrNullString()))); } @Test public void testRegion() { - assertThat(faker.elderScrolls().region(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().region(), is(not(emptyOrNullString()))); } @Test public void testQuote() { - assertThat(faker.elderScrolls().quote(), not(isEmptyOrNullString())); + assertThat(faker.elderScrolls().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/EnglandFootBallTest.java b/src/test/java/org/thejavaguy/javafaker/EnglandFootBallTest.java index 4453dfb..0865461 100644 --- a/src/test/java/org/thejavaguy/javafaker/EnglandFootBallTest.java +++ b/src/test/java/org/thejavaguy/javafaker/EnglandFootBallTest.java @@ -1,27 +1,22 @@ package org.thejavaguy.javafaker; - import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EnglandFootBallTest extends AbstractFakerTest{ - - - @Test public void testLeague() { String league = faker.englandfootball().league(); - assertThat(league, not(isEmptyOrNullString())); - + assertThat(league, is(not(emptyOrNullString()))); } @Test public void testTeam() { String team = faker.englandfootball().team(); - assertThat(team, not(isEmptyOrNullString())); - + assertThat(team, is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/EsportsTest.java b/src/test/java/org/thejavaguy/javafaker/EsportsTest.java index 91217ad..1b8d38a 100644 --- a/src/test/java/org/thejavaguy/javafaker/EsportsTest.java +++ b/src/test/java/org/thejavaguy/javafaker/EsportsTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EsportsTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/FakerTest.java b/src/test/java/org/thejavaguy/javafaker/FakerTest.java index cd0a56c..ebd5f96 100644 --- a/src/test/java/org/thejavaguy/javafaker/FakerTest.java +++ b/src/test/java/org/thejavaguy/javafaker/FakerTest.java @@ -1,18 +1,19 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.util.Locale; import java.util.Random; -import org.junit.Test; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class FakerTest extends AbstractFakerTest { @@ -112,19 +113,22 @@ public void regexifyShouldGenerateEscapedCharacters() { assertThat(faker.regexify("\\.\\*\\?\\+"), matchesRegularExpression("\\.\\*\\?\\+")); } - @Test(expected = RuntimeException.class) + @Test public void badExpressionTooManyArgs() { - faker.expression("#{regexify 'a','a'}"); + assertThrows(RuntimeException.class, () -> + faker.expression("#{regexify 'a','a'}")); } - @Test(expected = RuntimeException.class) + @Test public void badExpressionTooFewArgs() { - faker.expression("#{regexify}"); + assertThrows(RuntimeException.class, () -> + faker.expression("#{regexify}")); } - @Test(expected = RuntimeException.class) + @Test public void badExpressionCouldntCoerce() { - faker.expression("#{number.number_between 'x','10'}"); + assertThrows(RuntimeException.class, () -> + faker.expression("#{number.number_between 'x','10'}")); } @Test @@ -139,7 +143,7 @@ public void expression() { assertThat(faker.expression("#{color.name}"), matchesRegularExpression("[a-z\\s]+")); } - @Test + @TestTemplate @Repeat(times = 100) public void numberBetweenRepeated() { assertThat(faker.expression("#{number.number_between '1','10'}"), matchesRegularExpression("[1-9]")); @@ -158,13 +162,15 @@ public void regexifyShouldGenerateSameValueForFakerWithSameSeed() { @Test public void resolveShouldReturnValueThatExists() { - assertThat(faker.resolve("address.city_prefix"), not(isEmptyString())); + assertThat(faker.resolve("address.city_prefix"), is(not(emptyString()))); } - @Test(expected = RuntimeException.class) + @Test public void resolveShouldThrowExceptionWhenPropertyDoesntExist() { - final String resolve = faker.resolve("address.nothing"); - assertThat(resolve, is(nullValue())); + assertThrows(RuntimeException.class, () -> { + final String resolve = faker.resolve("address.nothing"); + assertThat(resolve, is(nullValue())); + }); } @Test diff --git a/src/test/java/org/thejavaguy/javafaker/FileTest.java b/src/test/java/org/thejavaguy/javafaker/FileTest.java index e825177..6014df7 100644 --- a/src/test/java/org/thejavaguy/javafaker/FileTest.java +++ b/src/test/java/org/thejavaguy/javafaker/FileTest.java @@ -1,28 +1,28 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class FileTest extends AbstractFakerTest { - @Test + @TestTemplate @Repeat(times=10) public void testExtension() { assertThat(faker.file().extension(), matchesRegularExpression("(flac|mp3|wav|bmp|gif|jpeg|jpg|png|tiff|css|csv|html|js|json|txt|mp4|avi|mov|webm|doc|docx|xls|xlsx|ppt|pptx|odt|ods|odp|pages|numbers|key|pdf)")); } - @Test + @TestTemplate @Repeat(times=10) public void testMimeTypeFormat() { assertThat(faker.file().mimeType(), matchesRegularExpression(".+\\/.+")); } - @Test + @TestTemplate @Repeat(times=10) public void testFileName() { assertThat(faker.file().fileName(), matchesRegularExpression("([a-z\\-_]+)(\\\\|\\/)([a-z\\-_]+)\\.([a-z0-9]+)")); diff --git a/src/test/java/org/thejavaguy/javafaker/FinanceTest.java b/src/test/java/org/thejavaguy/javafaker/FinanceTest.java index a26954f..e09be4f 100644 --- a/src/test/java/org/thejavaguy/javafaker/FinanceTest.java +++ b/src/test/java/org/thejavaguy/javafaker/FinanceTest.java @@ -1,11 +1,11 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FinanceTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/FoodTest.java b/src/test/java/org/thejavaguy/javafaker/FoodTest.java index 1372479..11cae1c 100644 --- a/src/test/java/org/thejavaguy/javafaker/FoodTest.java +++ b/src/test/java/org/thejavaguy/javafaker/FoodTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FoodTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/FriendsTest.java b/src/test/java/org/thejavaguy/javafaker/FriendsTest.java index ca849c7..714cf83 100644 --- a/src/test/java/org/thejavaguy/javafaker/FriendsTest.java +++ b/src/test/java/org/thejavaguy/javafaker/FriendsTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FriendsTest extends AbstractFakerTest { @@ -21,6 +22,6 @@ public void location() { @Test public void quote() { - assertThat(faker.friends().quote(), not(isEmptyOrNullString())); + assertThat(faker.friends().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/FunnyNameTest.java b/src/test/java/org/thejavaguy/javafaker/FunnyNameTest.java index d3aa7f4..c248393 100644 --- a/src/test/java/org/thejavaguy/javafaker/FunnyNameTest.java +++ b/src/test/java/org/thejavaguy/javafaker/FunnyNameTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FunnyNameTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/GameOfThronesTest.java b/src/test/java/org/thejavaguy/javafaker/GameOfThronesTest.java index 7458b99..873580a 100644 --- a/src/test/java/org/thejavaguy/javafaker/GameOfThronesTest.java +++ b/src/test/java/org/thejavaguy/javafaker/GameOfThronesTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GameOfThronesTest extends AbstractFakerTest { @@ -31,6 +32,6 @@ public void dragon() { @Test public void quote() { - assertThat(faker.gameOfThrones().quote(), not(isEmptyOrNullString())); + assertThat(faker.gameOfThrones().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/GenderTest.java b/src/test/java/org/thejavaguy/javafaker/GenderTest.java index 1d7d229..df995a5 100644 --- a/src/test/java/org/thejavaguy/javafaker/GenderTest.java +++ b/src/test/java/org/thejavaguy/javafaker/GenderTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenderTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/HackerTest.java b/src/test/java/org/thejavaguy/javafaker/HackerTest.java index f246b3b..5896ccd 100644 --- a/src/test/java/org/thejavaguy/javafaker/HackerTest.java +++ b/src/test/java/org/thejavaguy/javafaker/HackerTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HackerTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/HarryPotterTest.java b/src/test/java/org/thejavaguy/javafaker/HarryPotterTest.java index 822d523..bef499c 100644 --- a/src/test/java/org/thejavaguy/javafaker/HarryPotterTest.java +++ b/src/test/java/org/thejavaguy/javafaker/HarryPotterTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HarryPotterTest extends AbstractFakerTest { @@ -21,7 +22,7 @@ public void location() { @Test public void quote() { - assertThat(faker.harryPotter().quote(), not(isEmptyOrNullString())); + assertThat(faker.harryPotter().quote(), is(not(emptyOrNullString()))); } @Test diff --git a/src/test/java/org/thejavaguy/javafaker/HipsterTest.java b/src/test/java/org/thejavaguy/javafaker/HipsterTest.java index e7da873..5117fe8 100644 --- a/src/test/java/org/thejavaguy/javafaker/HipsterTest.java +++ b/src/test/java/org/thejavaguy/javafaker/HipsterTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HipsterTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/HitchhikersGuideToTheGalaxyTest.java b/src/test/java/org/thejavaguy/javafaker/HitchhikersGuideToTheGalaxyTest.java index 265df64..071e930 100644 --- a/src/test/java/org/thejavaguy/javafaker/HitchhikersGuideToTheGalaxyTest.java +++ b/src/test/java/org/thejavaguy/javafaker/HitchhikersGuideToTheGalaxyTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HitchhikersGuideToTheGalaxyTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/HobbitTest.java b/src/test/java/org/thejavaguy/javafaker/HobbitTest.java index 0f13af6..a3260f6 100644 --- a/src/test/java/org/thejavaguy/javafaker/HobbitTest.java +++ b/src/test/java/org/thejavaguy/javafaker/HobbitTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HobbitTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/HowIMetYourMotherTest.java b/src/test/java/org/thejavaguy/javafaker/HowIMetYourMotherTest.java index 6a0d554..4dc8404 100644 --- a/src/test/java/org/thejavaguy/javafaker/HowIMetYourMotherTest.java +++ b/src/test/java/org/thejavaguy/javafaker/HowIMetYourMotherTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HowIMetYourMotherTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/IdNumberTest.java b/src/test/java/org/thejavaguy/javafaker/IdNumberTest.java index 60ee1ec..7d53b8c 100644 --- a/src/test/java/org/thejavaguy/javafaker/IdNumberTest.java +++ b/src/test/java/org/thejavaguy/javafaker/IdNumberTest.java @@ -1,11 +1,11 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IdNumberTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/InternetTest.java b/src/test/java/org/thejavaguy/javafaker/InternetTest.java index 001205a..535afb7 100644 --- a/src/test/java/org/thejavaguy/javafaker/InternetTest.java +++ b/src/test/java/org/thejavaguy/javafaker/InternetTest.java @@ -1,29 +1,30 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.CountOfCharactersMatcher.countOf; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static java.lang.Integer.parseInt; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.both; +import static org.hamcrest.Matchers.emptyOrNullString; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; +import static org.thejavaguy.javafaker.matchers.CountOfCharactersMatcher.countOf; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.util.List; import java.util.Locale; import org.apache.commons.validator.routines.EmailValidator; import org.hamcrest.Matchers; -import org.junit.Test; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -263,45 +264,45 @@ public void testIpV6Cidr() { } } - @Test + @TestTemplate @Repeat(times=10) public void testSlugWithParams() { assertThat(faker.internet().slug(ImmutableList.of("a", "b"), "-"), matchesRegularExpression("[a-zA-Z]+\\-[a-zA-Z]+")); } - @Test + @TestTemplate @Repeat(times=10) public void testSlug() { assertThat(faker.internet().slug(), matchesRegularExpression("[a-zA-Z]+\\_[a-zA-Z]+")); } - @Test + @TestTemplate @Repeat(times=10) public void testUuid() { assertThat(faker.internet().uuid(), matchesRegularExpression("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$")); } - @Test + @TestTemplate @Repeat(times=100) public void testFarsiIDNs() { // in this case, we're just making sure Farsi doesn't blow up. // there have been issues with Farsi not being produced. final Faker f = new Faker(new Locale("fa")); - assertThat(f.internet().domainName(), not(isEmptyOrNullString())); - assertThat(f.internet().emailAddress(), not(isEmptyOrNullString())); - assertThat(f.internet().safeEmailAddress(), not(isEmptyOrNullString())); - assertThat(f.internet().url(), not(isEmptyOrNullString())); + assertThat(f.internet().domainName(), is(not(emptyOrNullString()))); + assertThat(f.internet().emailAddress(), is(not(emptyOrNullString()))); + assertThat(f.internet().safeEmailAddress(), is(not(emptyOrNullString()))); + assertThat(f.internet().url(), is(not(emptyOrNullString()))); } @Test public void testUserAgent() { Internet.UserAgent[] agents = Internet.UserAgent.values(); for(Internet.UserAgent agent : agents) { - assertThat(faker.internet().userAgent(agent), not(isEmptyOrNullString())); + assertThat(faker.internet().userAgent(agent), is(not(emptyOrNullString()))); } //Test faker.internet().userAgentAny() for random user_agent retrieval. - assertThat(faker.internet().userAgentAny(), not(isEmptyOrNullString())); + assertThat(faker.internet().userAgentAny(), is(not(emptyOrNullString()))); } @Test diff --git a/src/test/java/org/thejavaguy/javafaker/JobTest.java b/src/test/java/org/thejavaguy/javafaker/JobTest.java index 9a522e7..b2de6ca 100644 --- a/src/test/java/org/thejavaguy/javafaker/JobTest.java +++ b/src/test/java/org/thejavaguy/javafaker/JobTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JobTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/KaamelottTest.java b/src/test/java/org/thejavaguy/javafaker/KaamelottTest.java index c87c8e8..a429aff 100644 --- a/src/test/java/org/thejavaguy/javafaker/KaamelottTest.java +++ b/src/test/java/org/thejavaguy/javafaker/KaamelottTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KaamelottTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/LeagueOfLegendsTest.java b/src/test/java/org/thejavaguy/javafaker/LeagueOfLegendsTest.java index e2c171a..ca6419d 100644 --- a/src/test/java/org/thejavaguy/javafaker/LeagueOfLegendsTest.java +++ b/src/test/java/org/thejavaguy/javafaker/LeagueOfLegendsTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LeagueOfLegendsTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/LebowskiTest.java b/src/test/java/org/thejavaguy/javafaker/LebowskiTest.java index 863e90f..527f813 100644 --- a/src/test/java/org/thejavaguy/javafaker/LebowskiTest.java +++ b/src/test/java/org/thejavaguy/javafaker/LebowskiTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LebowskiTest extends AbstractFakerTest { @Test diff --git a/src/test/java/org/thejavaguy/javafaker/LordOfTheRingsTest.java b/src/test/java/org/thejavaguy/javafaker/LordOfTheRingsTest.java index c4a2b08..61bd22e 100644 --- a/src/test/java/org/thejavaguy/javafaker/LordOfTheRingsTest.java +++ b/src/test/java/org/thejavaguy/javafaker/LordOfTheRingsTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Luka Obradovic (luka@vast.com) diff --git a/src/test/java/org/thejavaguy/javafaker/LoremTest.java b/src/test/java/org/thejavaguy/javafaker/LoremTest.java index 95912a4..64e55c8 100644 --- a/src/test/java/org/thejavaguy/javafaker/LoremTest.java +++ b/src/test/java/org/thejavaguy/javafaker/LoremTest.java @@ -1,15 +1,16 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LoremTest extends AbstractFakerTest { @@ -23,7 +24,7 @@ public void shouldCreateFixedLengthString() { @Test public void wordShouldNotBeNullOrEmpty() { - assertThat(faker.lorem().word(), not(isEmptyOrNullString())); + assertThat(faker.lorem().word(), is(not(emptyOrNullString()))); } @Test @@ -52,8 +53,8 @@ public void testCharactersIncludeUpperCase() { public void testCharactersWithLength() { assertThat(faker.lorem().characters(2), matchesRegularExpression("[a-z\\d]{2}")); assertThat(faker.lorem().characters(500), matchesRegularExpression("[a-z\\d]{500}")); - assertThat(faker.lorem().characters(0), isEmptyString()); - assertThat(faker.lorem().characters(-1), isEmptyString()); + assertThat(faker.lorem().characters(0), is(emptyString())); + assertThat(faker.lorem().characters(-1), is(emptyString())); } @Test @@ -62,8 +63,8 @@ public void testCharactersWithLengthIncludeUppercase() { assertThat(faker.lorem().characters(500, false), matchesRegularExpression("[a-z\\d]{500}")); assertThat(faker.lorem().characters(2, true), matchesRegularExpression("[a-zA-Z\\d]{2}")); assertThat(faker.lorem().characters(500, true), matchesRegularExpression("[a-zA-Z\\d]{500}")); - assertThat(faker.lorem().characters(0, false), isEmptyString()); - assertThat(faker.lorem().characters(-1, true), isEmptyString()); + assertThat(faker.lorem().characters(0, false), is(emptyString())); + assertThat(faker.lorem().characters(-1, true), is(emptyString())); } @Test diff --git a/src/test/java/org/thejavaguy/javafaker/MatzTest.java b/src/test/java/org/thejavaguy/javafaker/MatzTest.java index 79682d5..15f3a11 100644 --- a/src/test/java/org/thejavaguy/javafaker/MatzTest.java +++ b/src/test/java/org/thejavaguy/javafaker/MatzTest.java @@ -1,15 +1,16 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MatzTest extends AbstractFakerTest { @Test public void quote() { - assertThat(faker.matz().quote(), not(isEmptyOrNullString())); + assertThat(faker.matz().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/MedicalTest.java b/src/test/java/org/thejavaguy/javafaker/MedicalTest.java index 2166606..d673d04 100644 --- a/src/test/java/org/thejavaguy/javafaker/MedicalTest.java +++ b/src/test/java/org/thejavaguy/javafaker/MedicalTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MedicalTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/MountainTest.java b/src/test/java/org/thejavaguy/javafaker/MountainTest.java index f05feae..70a82f0 100644 --- a/src/test/java/org/thejavaguy/javafaker/MountainTest.java +++ b/src/test/java/org/thejavaguy/javafaker/MountainTest.java @@ -1,21 +1,22 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MountainTest extends AbstractFakerTest { @Test public void testMountainName() { String mountainName = faker.mountain().name(); - assertThat(mountainName, not(isEmptyOrNullString())); + assertThat(mountainName, is(not(emptyOrNullString()))); } @Test public void testMountainLeague() { String mountainLeague = faker.mountain().range(); - assertThat(mountainLeague, not(isEmptyOrNullString())); + assertThat(mountainLeague, is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/MusicTest.java b/src/test/java/org/thejavaguy/javafaker/MusicTest.java index c34b5f1..769abac 100644 --- a/src/test/java/org/thejavaguy/javafaker/MusicTest.java +++ b/src/test/java/org/thejavaguy/javafaker/MusicTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MusicTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/NameTest.java b/src/test/java/org/thejavaguy/javafaker/NameTest.java index f60162a..8f415d0 100644 --- a/src/test/java/org/thejavaguy/javafaker/NameTest.java +++ b/src/test/java/org/thejavaguy/javafaker/NameTest.java @@ -1,14 +1,14 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNot.not; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; @@ -24,7 +24,7 @@ public void testNameWithMiddle() { assertThat(faker.name().nameWithMiddle(), matchesRegularExpression("([\\w']+\\.?( )?){3,4}")); } - @Test @Repeat(times = 10) + @TestTemplate @Repeat(times = 10) public void testNameWithMiddleDoesNotHaveRepeatedName() { String nameWithMiddle = faker.name().nameWithMiddle(); String[] splitNames = nameWithMiddle.split(" "); diff --git a/src/test/java/org/thejavaguy/javafaker/NationTest.java b/src/test/java/org/thejavaguy/javafaker/NationTest.java index 34470fe..58de0a2 100644 --- a/src/test/java/org/thejavaguy/javafaker/NationTest.java +++ b/src/test/java/org/thejavaguy/javafaker/NationTest.java @@ -1,11 +1,11 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NationTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/NumberTest.java b/src/test/java/org/thejavaguy/javafaker/NumberTest.java index d00e2ad..fb06db0 100644 --- a/src/test/java/org/thejavaguy/javafaker/NumberTest.java +++ b/src/test/java/org/thejavaguy/javafaker/NumberTest.java @@ -1,6 +1,5 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; @@ -9,6 +8,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.math.BigDecimal; import java.util.List; @@ -17,11 +17,12 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.lang3.tuple.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.thejavaguy.javafaker.repeating.Repeat; + import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -129,7 +130,7 @@ public void testNumberBetween() { assertThat(v1, is(lessThan(980000000L))); } - @Test + @TestTemplate @Repeat(times = 100) public void testLongNumberBetweenRepeated() { long low = 1; @@ -139,7 +140,7 @@ public void testLongNumberBetweenRepeated() { assertThat(v, is(greaterThanOrEqualTo(low))); } - @Test + @TestTemplate @Repeat(times = 100) public void testIntNumberBetweenRepeated() { int low = 1; diff --git a/src/test/java/org/thejavaguy/javafaker/OptionsTest.java b/src/test/java/org/thejavaguy/javafaker/OptionsTest.java index 8e7a15d..cb9f6ad 100644 --- a/src/test/java/org/thejavaguy/javafaker/OptionsTest.java +++ b/src/test/java/org/thejavaguy/javafaker/OptionsTest.java @@ -1,43 +1,44 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isIn; -import static org.hamcrest.Matchers.isOneOf; +import static org.hamcrest.Matchers.in; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.oneOf; import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class OptionsTest extends AbstractFakerTest { private String[] options; - @Before + @BeforeEach public void setupOptions() { options = new String[]{"A", "B", "C"}; } @Test public void testOptionWithArray() { - assertThat(faker.options().option(options), isOneOf(options)); + assertThat(faker.options().option(options), is(oneOf(options))); } @Test public void testOptionWithVarargsString() { - assertThat(faker.options().option("A", "B", "C"), isOneOf(options)); + assertThat(faker.options().option("A", "B", "C"), is(oneOf(options))); } @Test public void testOptionWithVarargsInteger() { Integer[] integerOptions = new Integer[] { 1, 3, 4, 5}; - assertThat(faker.options().option(1, 3, 4, 5), isOneOf(integerOptions)); + assertThat(faker.options().option(1, 3, 4, 5), is(oneOf(integerOptions))); } @Test public void testOptionWithEnum() { - assertThat(faker.options().option(Day.class), isOneOf(Day.values())); + assertThat(faker.options().option(Day.class), is(oneOf(Day.values()))); } @Test @@ -45,7 +46,7 @@ public void testNextArrayElement() { Integer[] array = new Integer[] { 1, 2, 3, 5, 8, 13, 21 }; for (int i = 1; i < 10; i++) { - assertThat(faker.options().nextElement(array), isIn(array)); + assertThat(faker.options().nextElement(array), is(in(array))); } } @@ -53,7 +54,7 @@ public void testNextArrayElement() { public void testNextListElement() { List list = Arrays.asList(1, 2, 3, 5, 8, 13, 21); for (int i = 1; i < 10; i++) { - assertThat(faker.options().nextElement(list), isIn(list)); + assertThat(faker.options().nextElement(list), is(in(list))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/OverwatchTest.java b/src/test/java/org/thejavaguy/javafaker/OverwatchTest.java index 4aaae68..93fab05 100644 --- a/src/test/java/org/thejavaguy/javafaker/OverwatchTest.java +++ b/src/test/java/org/thejavaguy/javafaker/OverwatchTest.java @@ -1,10 +1,10 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OverwatchTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/PhoneNumberTest.java b/src/test/java/org/thejavaguy/javafaker/PhoneNumberTest.java index fb12c28..6c0a9fc 100644 --- a/src/test/java/org/thejavaguy/javafaker/PhoneNumberTest.java +++ b/src/test/java/org/thejavaguy/javafaker/PhoneNumberTest.java @@ -1,11 +1,11 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PhoneNumberTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/PhotographyTest.java b/src/test/java/org/thejavaguy/javafaker/PhotographyTest.java index 82b9be4..9874c54 100644 --- a/src/test/java/org/thejavaguy/javafaker/PhotographyTest.java +++ b/src/test/java/org/thejavaguy/javafaker/PhotographyTest.java @@ -1,11 +1,13 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; - -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestTemplate; import org.thejavaguy.javafaker.repeating.Repeat; public class PhotographyTest extends AbstractFakerTest{ @@ -52,14 +54,14 @@ public void imageTag() { assertNonNullOrEmpty(value); } - @Test + @TestTemplate @Repeat(times=7) public void shutter() { final String value = faker.photography().shutter(); assertThat(value, matchesRegularExpression("\\d{1,}\\/{0,1}\\d*")); } - @Test + @TestTemplate @Repeat(times=7) public void iso() { final String value = faker.photography().iso(); diff --git a/src/test/java/org/thejavaguy/javafaker/PokemonTest.java b/src/test/java/org/thejavaguy/javafaker/PokemonTest.java index 821f5e3..392896f 100644 --- a/src/test/java/org/thejavaguy/javafaker/PokemonTest.java +++ b/src/test/java/org/thejavaguy/javafaker/PokemonTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PokemonTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/PrincessBrideTest.java b/src/test/java/org/thejavaguy/javafaker/PrincessBrideTest.java index 81ec405..e2a0623 100644 --- a/src/test/java/org/thejavaguy/javafaker/PrincessBrideTest.java +++ b/src/test/java/org/thejavaguy/javafaker/PrincessBrideTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PrincessBrideTest extends AbstractFakerTest { @Test @@ -15,6 +16,6 @@ public void character() { @Test public void quote() { - assertThat(faker.princessBride().quote(), not(isEmptyOrNullString())); + assertThat(faker.princessBride().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/ProgrammingLanguageTest.java b/src/test/java/org/thejavaguy/javafaker/ProgrammingLanguageTest.java index 903b7de..71faa8a 100644 --- a/src/test/java/org/thejavaguy/javafaker/ProgrammingLanguageTest.java +++ b/src/test/java/org/thejavaguy/javafaker/ProgrammingLanguageTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ProgrammingLanguageTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/RandomFakerTest.java b/src/test/java/org/thejavaguy/javafaker/RandomFakerTest.java index 4ada4b4..03c282d 100644 --- a/src/test/java/org/thejavaguy/javafaker/RandomFakerTest.java +++ b/src/test/java/org/thejavaguy/javafaker/RandomFakerTest.java @@ -5,8 +5,8 @@ import java.util.Random; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class RandomFakerTest extends AbstractFakerTest { @@ -14,7 +14,7 @@ public class RandomFakerTest extends AbstractFakerTest { private Faker faker; private Random random; - @Before + @BeforeEach public void before() { super.before(); random = new Random(); diff --git a/src/test/java/org/thejavaguy/javafaker/RelationshipTest.java b/src/test/java/org/thejavaguy/javafaker/RelationshipTest.java index f95005a..0c65cd9 100644 --- a/src/test/java/org/thejavaguy/javafaker/RelationshipTest.java +++ b/src/test/java/org/thejavaguy/javafaker/RelationshipTest.java @@ -1,21 +1,23 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.when; import java.lang.reflect.InvocationTargetException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; public class RelationshipTest extends AbstractFakerTest { private Faker mockFaker; - @Before + @BeforeEach public void before() { super.before(); mockFaker = Mockito.mock(Faker.class); @@ -23,61 +25,69 @@ public void before() { @Test public void anyTest() { - assertThat(faker.relationships().any(), not(isEmptyOrNullString())); + assertThat(faker.relationships().any(), is(not(emptyOrNullString()))); } @Test public void directTest() { - assertThat(faker.relationships().direct(), not(isEmptyOrNullString())); + assertThat(faker.relationships().direct(), is(not(emptyOrNullString()))); } @Test public void extendedTest() { - assertThat(faker.relationships().extended(), not(isEmptyOrNullString())); + assertThat(faker.relationships().extended(), is(not(emptyOrNullString()))); } @Test public void inLawTest() { - assertThat(faker.relationships().inLaw(), not(isEmptyOrNullString())); + assertThat(faker.relationships().inLaw(), is(not(emptyOrNullString()))); } @Test public void spouseTest() { - assertThat(faker.relationships().spouse(), not(isEmptyOrNullString())); + assertThat(faker.relationships().spouse(), is(not(emptyOrNullString()))); } @Test public void parentTest() { - assertThat(faker.relationships().parent(), not(isEmptyOrNullString())); + assertThat(faker.relationships().parent(), is(not(emptyOrNullString()))); } @Test public void siblingTest() { - assertThat(faker.relationships().sibling(), not(isEmptyOrNullString())); + assertThat(faker.relationships().sibling(), is(not(emptyOrNullString()))); } - @Test(expected = RuntimeException.class) + @Test public void anyWithIllegalArgumentExceptionThrown() { - when(mockFaker.random()).thenThrow(new IllegalArgumentException()); - new Relationships(mockFaker).any(); + assertThrows(RuntimeException.class, () -> { + when(mockFaker.random()).thenThrow(new IllegalArgumentException()); + new Relationships(mockFaker).any(); + }); } - @Test(expected = RuntimeException.class) + @Test public void anyWithSecurityExceptionThrown() { - when(mockFaker.random()).thenThrow(new SecurityException()); - new Relationships(mockFaker).any(); + assertThrows(RuntimeException.class, () -> { + when(mockFaker.random()).thenThrow(new SecurityException()); + new Relationships(mockFaker).any(); + }); } - @Test(expected = RuntimeException.class) + @Test public void anyWithIllegalAccessExceptionThrown() { - when(mockFaker.random()).thenThrow(new IllegalAccessException()); - new Relationships(mockFaker).any(); + assertThrows(RuntimeException.class, () -> { + when(mockFaker.random()).thenThrow(new IllegalAccessException()); + new Relationships(mockFaker).any(); + }); } - @Test(expected = RuntimeException.class) + @Test public void anyWithInvocationTargetExceptionThrown() { - when(mockFaker.random()).thenThrow(new InvocationTargetException(new Exception())); - new Relationships(mockFaker).any(); + assertThrows(RuntimeException.class, () -> { + when(mockFaker.random()).thenThrow(new InvocationTargetException(new Exception())); + new Relationships(mockFaker).any(); + }); } } diff --git a/src/test/java/org/thejavaguy/javafaker/RickAndMortyTest.java b/src/test/java/org/thejavaguy/javafaker/RickAndMortyTest.java index 018e053..2498147 100644 --- a/src/test/java/org/thejavaguy/javafaker/RickAndMortyTest.java +++ b/src/test/java/org/thejavaguy/javafaker/RickAndMortyTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RickAndMortyTest extends AbstractFakerTest { @@ -21,6 +22,6 @@ public void location() { @Test public void quote() { - assertThat(faker.rickAndMorty().quote(), not(isEmptyOrNullString())); + assertThat(faker.rickAndMorty().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/RobinTest.java b/src/test/java/org/thejavaguy/javafaker/RobinTest.java index 23b8b9c..10747a8 100644 --- a/src/test/java/org/thejavaguy/javafaker/RobinTest.java +++ b/src/test/java/org/thejavaguy/javafaker/RobinTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RobinTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/RockBandTest.java b/src/test/java/org/thejavaguy/javafaker/RockBandTest.java index 63f6438..969cb57 100644 --- a/src/test/java/org/thejavaguy/javafaker/RockBandTest.java +++ b/src/test/java/org/thejavaguy/javafaker/RockBandTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RockBandTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/ShakespeareTest.java b/src/test/java/org/thejavaguy/javafaker/ShakespeareTest.java index a04e8af..d1434f2 100644 --- a/src/test/java/org/thejavaguy/javafaker/ShakespeareTest.java +++ b/src/test/java/org/thejavaguy/javafaker/ShakespeareTest.java @@ -1,31 +1,32 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ShakespeareTest extends AbstractFakerTest{ @Test public void testHamletQuote() { - assertThat(faker.shakespeare().hamletQuote(), not(isEmptyOrNullString())); + assertThat(faker.shakespeare().hamletQuote(), is(not(emptyOrNullString()))); } @Test public void testAsYouLikeItQuote() { - assertThat(faker.shakespeare().asYouLikeItQuote(), not(isEmptyOrNullString())); + assertThat(faker.shakespeare().asYouLikeItQuote(), is(not(emptyOrNullString()))); } @Test public void testKingRichardIIIQuote() { - assertThat(faker.shakespeare().kingRichardIIIQuote(), not(isEmptyOrNullString())); + assertThat(faker.shakespeare().kingRichardIIIQuote(), is(not(emptyOrNullString()))); } @Test public void testRomeoAndJulietQuote() { - assertThat(faker.shakespeare().romeoAndJulietQuote(), not(isEmptyOrNullString())); + assertThat(faker.shakespeare().romeoAndJulietQuote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/SipTest.java b/src/test/java/org/thejavaguy/javafaker/SipTest.java index 118815c..c581422 100644 --- a/src/test/java/org/thejavaguy/javafaker/SipTest.java +++ b/src/test/java/org/thejavaguy/javafaker/SipTest.java @@ -1,6 +1,5 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -8,8 +7,9 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SipTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/SlackEmojiTest.java b/src/test/java/org/thejavaguy/javafaker/SlackEmojiTest.java index 475076d..4097816 100644 --- a/src/test/java/org/thejavaguy/javafaker/SlackEmojiTest.java +++ b/src/test/java/org/thejavaguy/javafaker/SlackEmojiTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SlackEmojiTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/SpaceTest.java b/src/test/java/org/thejavaguy/javafaker/SpaceTest.java index 7400b6f..49ee1b4 100644 --- a/src/test/java/org/thejavaguy/javafaker/SpaceTest.java +++ b/src/test/java/org/thejavaguy/javafaker/SpaceTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SpaceTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/StarCraftTest.java b/src/test/java/org/thejavaguy/javafaker/StarCraftTest.java index 8424025..c93ae11 100644 --- a/src/test/java/org/thejavaguy/javafaker/StarCraftTest.java +++ b/src/test/java/org/thejavaguy/javafaker/StarCraftTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StarCraftTest extends AbstractFakerTest { @@ -14,28 +15,28 @@ public class StarCraftTest extends AbstractFakerTest { @Test public void testUnit() { String unit = faker.starCraft().unit(); - assertThat(unit, not(isEmptyOrNullString())); + assertThat(unit, is(not(emptyOrNullString()))); assertThat(unit, matchesRegularExpression(noLeadingTrailingWhitespaceRegex)); } @Test public void testBuilding() { String building = faker.starCraft().building(); - assertThat(building, not(isEmptyOrNullString())); + assertThat(building, is(not(emptyOrNullString()))); assertThat(building, matchesRegularExpression(noLeadingTrailingWhitespaceRegex)); } @Test public void testCharacter() { String character = faker.starCraft().character(); - assertThat(character, not(isEmptyOrNullString())); + assertThat(character, is(not(emptyOrNullString()))); assertThat(character, matchesRegularExpression(noLeadingTrailingWhitespaceRegex)); } @Test public void testPlanet() { String planet = faker.starCraft().planet(); - assertThat(planet, not(isEmptyOrNullString())); + assertThat(planet, is(not(emptyOrNullString()))); assertThat(planet, matchesRegularExpression(noLeadingTrailingWhitespaceRegex)); } diff --git a/src/test/java/org/thejavaguy/javafaker/StarTrekTest.java b/src/test/java/org/thejavaguy/javafaker/StarTrekTest.java index 5272932..a75ef15 100644 --- a/src/test/java/org/thejavaguy/javafaker/StarTrekTest.java +++ b/src/test/java/org/thejavaguy/javafaker/StarTrekTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StarTrekTest extends AbstractFakerTest { @@ -30,5 +31,5 @@ public void villain() { } @Test - public void klingon() { assertThat(faker.starTrek().klingon(), not(isEmptyOrNullString())); } + public void klingon() { assertThat(faker.starTrek().klingon(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/StockTest.java b/src/test/java/org/thejavaguy/javafaker/StockTest.java index 56b1930..a1cdd22 100644 --- a/src/test/java/org/thejavaguy/javafaker/StockTest.java +++ b/src/test/java/org/thejavaguy/javafaker/StockTest.java @@ -1,21 +1,22 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StockTest extends AbstractFakerTest { @Test public void testNasdaq() { - assertThat(faker.stock().nsdqSymbol(), not(isEmptyOrNullString())); + assertThat(faker.stock().nsdqSymbol(), is(not(emptyOrNullString()))); } @Test public void testNYSE() { - assertThat(faker.stock().nyseSymbol(), not(isEmptyOrNullString())); + assertThat(faker.stock().nyseSymbol(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/SuperheroTest.java b/src/test/java/org/thejavaguy/javafaker/SuperheroTest.java index 56f760e..09be4a2 100644 --- a/src/test/java/org/thejavaguy/javafaker/SuperheroTest.java +++ b/src/test/java/org/thejavaguy/javafaker/SuperheroTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SuperheroTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/TeamTest.java b/src/test/java/org/thejavaguy/javafaker/TeamTest.java index 07edc17..aaf5dab 100644 --- a/src/test/java/org/thejavaguy/javafaker/TeamTest.java +++ b/src/test/java/org/thejavaguy/javafaker/TeamTest.java @@ -1,12 +1,12 @@ package org.thejavaguy.javafaker; +import static org.hamcrest.MatcherAssert.assertThat; import static org.thejavaguy.javafaker.matchers.IsStringWithContents.isStringWithContents; import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.MatcherAssert.assertThat; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TeamTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/TwinPeaksTest.java b/src/test/java/org/thejavaguy/javafaker/TwinPeaksTest.java index 02bc1c2..9976b54 100644 --- a/src/test/java/org/thejavaguy/javafaker/TwinPeaksTest.java +++ b/src/test/java/org/thejavaguy/javafaker/TwinPeaksTest.java @@ -1,11 +1,12 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TwinPeaksTest extends AbstractFakerTest { @@ -21,6 +22,6 @@ public void location() { @Test public void quote() { - assertThat(faker.twinPeaks().quote(), not(isEmptyOrNullString())); + assertThat(faker.twinPeaks().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/UniversityTest.java b/src/test/java/org/thejavaguy/javafaker/UniversityTest.java index f0a6bfa..3acdd87 100644 --- a/src/test/java/org/thejavaguy/javafaker/UniversityTest.java +++ b/src/test/java/org/thejavaguy/javafaker/UniversityTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UniversityTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/WeatherTest.java b/src/test/java/org/thejavaguy/javafaker/WeatherTest.java index ca2bd47..fd88df3 100644 --- a/src/test/java/org/thejavaguy/javafaker/WeatherTest.java +++ b/src/test/java/org/thejavaguy/javafaker/WeatherTest.java @@ -1,17 +1,18 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class WeatherTest extends AbstractFakerTest { @Test public void description() { - assertThat(faker.weather().description(), not(isEmptyOrNullString())); + assertThat(faker.weather().description(), is(not(emptyOrNullString()))); } @Test diff --git a/src/test/java/org/thejavaguy/javafaker/WitcherTest.java b/src/test/java/org/thejavaguy/javafaker/WitcherTest.java index 45ab9ab..4b71e75 100644 --- a/src/test/java/org/thejavaguy/javafaker/WitcherTest.java +++ b/src/test/java/org/thejavaguy/javafaker/WitcherTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class WitcherTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/YodaTest.java b/src/test/java/org/thejavaguy/javafaker/YodaTest.java index 75ca06b..c00e78f 100644 --- a/src/test/java/org/thejavaguy/javafaker/YodaTest.java +++ b/src/test/java/org/thejavaguy/javafaker/YodaTest.java @@ -1,10 +1,11 @@ package org.thejavaguy.javafaker; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Luka Obradovic (luka@vast.com) @@ -13,6 +14,6 @@ public class YodaTest extends AbstractFakerTest { @Test public void quote() { - assertThat(faker.yoda().quote(), not(isEmptyOrNullString())); + assertThat(faker.yoda().quote(), is(not(emptyOrNullString()))); } } diff --git a/src/test/java/org/thejavaguy/javafaker/ZeldaTest.java b/src/test/java/org/thejavaguy/javafaker/ZeldaTest.java index 973ff4f..518897a 100644 --- a/src/test/java/org/thejavaguy/javafaker/ZeldaTest.java +++ b/src/test/java/org/thejavaguy/javafaker/ZeldaTest.java @@ -1,9 +1,9 @@ package org.thejavaguy.javafaker; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ZeldaTest extends AbstractFakerTest { diff --git a/src/test/java/org/thejavaguy/javafaker/idnumbers/SwedishIdNumberTest.java b/src/test/java/org/thejavaguy/javafaker/idnumbers/SwedishIdNumberTest.java index aa7659e..5ab7e64 100644 --- a/src/test/java/org/thejavaguy/javafaker/idnumbers/SwedishIdNumberTest.java +++ b/src/test/java/org/thejavaguy/javafaker/idnumbers/SwedishIdNumberTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SwedishIdNumberTest { diff --git a/src/test/java/org/thejavaguy/javafaker/integration/FakerIT.java b/src/test/java/org/thejavaguy/javafaker/integration/FakerIT.java index 7218a4b..41b0fc2 100644 --- a/src/test/java/org/thejavaguy/javafaker/integration/FakerIT.java +++ b/src/test/java/org/thejavaguy/javafaker/integration/FakerIT.java @@ -2,12 +2,12 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.emptyOrNullString; 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.not; 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; @@ -27,14 +27,13 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.thejavaguy.javafaker.Faker; + import com.google.common.collect.Maps; /** @@ -42,13 +41,12 @@ * and that methods return values. The unit tests should ensure what the values returned * are correct. These tests just ensure that the methods can be invoked. */ -@Ignore -@RunWith(value = Parameterized.class) +@Disabled public class FakerIT { private static final Logger logger = LoggerFactory.getLogger(FakerIT.class); - private final Locale locale; - private final Faker faker; + private Locale locale; + private Faker faker; /** * a collection of Locales -> Exceptions. @@ -71,7 +69,7 @@ public class FakerIT { exceptions.put(new Locale("pt","Br", "x2"), Arrays.asList("Address.cityPrefix", "Address.citySuffix")); } - public FakerIT(Locale locale, Random random) { + public void initFakerIT(Locale locale, Random random) { this.locale = locale; if (locale != null && random != null) { faker = new Faker(locale, random); @@ -84,7 +82,6 @@ public FakerIT(Locale locale, Random random) { } } - @Parameterized.Parameters(name = "testing locale {0} and random {1}") public static Collection data() { Object[][] data = new Object[][]{ {Locale.ENGLISH, new Random()}, @@ -109,8 +106,10 @@ public static Collection data() { return allData; } - @Test - public void testAllFakerMethodsThatReturnStrings() throws Exception { + @MethodSource("data") + @ParameterizedTest(name = "testing locale {0} and random {1}") + public void testAllFakerMethodsThatReturnStrings(Locale locale,Random random) throws Exception { + initFakerIT(locale, random); testAllMethodsThatReturnStringsActuallyReturnStrings(faker); testAllMethodsThatReturnStringsActuallyReturnStrings(faker.ancient()); testAllMethodsThatReturnStringsActuallyReturnStrings(faker.address()); @@ -211,7 +210,7 @@ private void testAllMethodsThatReturnStringsActuallyReturnStrings(Object object) String failureReason = method + " on " + object; assertThat(failureReason, returnValue, is(instanceOf(String.class))); final String returnValueAsString = (String) returnValue; - assertThat(failureReason, returnValueAsString, not(isEmptyOrNullString())); + assertThat(failureReason, returnValueAsString, is(not(emptyOrNullString()))); assertThat(failureReason + " is a slash encoded regex", returnValueAsString, not(allOf(startsWith("/"), endsWith("/")))); } @@ -223,8 +222,10 @@ private boolean isExcepted(Object object, Method method) { return classDotMethod.contains(object.getClass().getSimpleName() + "." + method.getName()); } - @Test - public void testExceptionsNotCoveredInAboveTest() { + @MethodSource("data") + @ParameterizedTest(name = "testing locale {0} and random {1}") + public void testExceptionsNotCoveredInAboveTest(Locale locale,Random random) { + initFakerIT(locale, random); assertThat(faker.bothify("####???"), is(notNullValue())); assertThat(faker.letterify("????"), is(notNullValue())); assertThat(faker.numerify("####"), is(notNullValue())); diff --git a/src/test/java/org/thejavaguy/javafaker/integration/Issue194SlashFormatRegexIT.java b/src/test/java/org/thejavaguy/javafaker/integration/Issue194SlashFormatRegexIT.java index 0650fb5..f4e1f72 100644 --- a/src/test/java/org/thejavaguy/javafaker/integration/Issue194SlashFormatRegexIT.java +++ b/src/test/java/org/thejavaguy/javafaker/integration/Issue194SlashFormatRegexIT.java @@ -1,16 +1,15 @@ package org.thejavaguy.javafaker.integration; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.util.Locale; -import org.junit.Ignore; -import org.junit.Test; - +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.thejavaguy.javafaker.Faker; -@Ignore +@Disabled public class Issue194SlashFormatRegexIT { @Test diff --git a/src/test/java/org/thejavaguy/javafaker/integration/MostSpecificLocaleIT.java b/src/test/java/org/thejavaguy/javafaker/integration/MostSpecificLocaleIT.java index 4ae6ac8..62c3a84 100644 --- a/src/test/java/org/thejavaguy/javafaker/integration/MostSpecificLocaleIT.java +++ b/src/test/java/org/thejavaguy/javafaker/integration/MostSpecificLocaleIT.java @@ -8,10 +8,9 @@ import java.util.List; import java.util.Locale; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.thejavaguy.javafaker.service.FakeValuesService; /** @@ -19,13 +18,13 @@ * and that methods return values. The unit tests should ensure what the values returned * are correct. These tests just ensure that the methods can be invoked. */ -@Ignore +@Disabled public class MostSpecificLocaleIT { private FakeValuesService en; private FakeValuesService en_US; - @Before + @BeforeEach public void setupFakers() { en = new FakeValuesService(new Locale("en"), null); en_US = new FakeValuesService(new Locale("en","US"), null); diff --git a/src/test/java/org/thejavaguy/javafaker/integration/UkLocalDirectivesTest.java b/src/test/java/org/thejavaguy/javafaker/integration/UkLocalDirectivesTest.java index fbf430e..4eabedd 100644 --- a/src/test/java/org/thejavaguy/javafaker/integration/UkLocalDirectivesTest.java +++ b/src/test/java/org/thejavaguy/javafaker/integration/UkLocalDirectivesTest.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Locale; -import org.junit.Ignore; -import org.junit.Test; - +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.thejavaguy.javafaker.Faker; + import com.google.common.collect.Lists; /** @@ -17,7 +17,7 @@ * and that methods return values. The unit tests should ensure what the values returned * are correct. These tests just ensure that the methods can be invoked. */ -@Ignore +@Disabled public class UkLocalDirectivesTest { /** diff --git a/src/test/java/org/thejavaguy/javafaker/matchers/IsANumberTest.java b/src/test/java/org/thejavaguy/javafaker/matchers/IsANumberTest.java index 57a4bd0..3a1fe9f 100644 --- a/src/test/java/org/thejavaguy/javafaker/matchers/IsANumberTest.java +++ b/src/test/java/org/thejavaguy/javafaker/matchers/IsANumberTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IsANumberTest { diff --git a/src/test/java/org/thejavaguy/javafaker/matchers/IsStringWithContentsTest.java b/src/test/java/org/thejavaguy/javafaker/matchers/IsStringWithContentsTest.java index a2d994f..6df1d50 100644 --- a/src/test/java/org/thejavaguy/javafaker/matchers/IsStringWithContentsTest.java +++ b/src/test/java/org/thejavaguy/javafaker/matchers/IsStringWithContentsTest.java @@ -3,14 +3,14 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class IsStringWithContentsTest { private IsStringWithContents matcher; - @Before + @BeforeEach public void before() { matcher = new IsStringWithContents(); } diff --git a/src/test/java/org/thejavaguy/javafaker/repeating/RepeatRule.java b/src/test/java/org/thejavaguy/javafaker/repeating/RepeatRule.java index e23e0b7..e5b20fa 100644 --- a/src/test/java/org/thejavaguy/javafaker/repeating/RepeatRule.java +++ b/src/test/java/org/thejavaguy/javafaker/repeating/RepeatRule.java @@ -1,40 +1,48 @@ package org.thejavaguy.javafaker.repeating; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestTemplateInvocationContext; +import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider; /** - * Pulled from https://gist.github.com/fappel/8bcb2aea4b39ff9cfb6e + * JUnit 5 extension that provides repeated test execution based on the @Repeat annotation. + * Migrated from JUnit 4 TestRule to JUnit 5 TestTemplateInvocationContextProvider. */ -public class RepeatRule implements TestRule { - - private static class RepeatStatement extends Statement { +public class RepeatRule implements TestTemplateInvocationContextProvider { - private final int times; - private final Statement statement; - - private RepeatStatement( int times, Statement statement ) { - this.times = times; - this.statement = statement; + @Override + public boolean supportsTestTemplate(ExtensionContext context) { + return context.getTestMethod() + .map(method -> method.isAnnotationPresent(Repeat.class)) + .orElse(false); } @Override - public void evaluate() throws Throwable { - for( int i = 0; i < times; i++ ) { - statement.evaluate(); - } + public Stream provideTestTemplateInvocationContexts(ExtensionContext context) { + int times = context.getTestMethod() + .map(method -> method.getAnnotation(Repeat.class)) + .map(Repeat::times) + .orElse(1); + + return IntStream.rangeClosed(1, times) + .mapToObj(i -> new RepeatInvocationContext(i, times)); } - } - - @Override - public Statement apply( Statement statement, Description description ) { - Statement result = statement; - Repeat repeat = description.getAnnotation( Repeat.class ); - if( repeat != null ) { - int times = repeat.times(); - result = new RepeatStatement( times, statement ); + + private static class RepeatInvocationContext implements TestTemplateInvocationContext { + private final int currentRepetition; + private final int totalRepetitions; + + RepeatInvocationContext(int currentRepetition, int totalRepetitions) { + this.currentRepetition = currentRepetition; + this.totalRepetitions = totalRepetitions; + } + + @Override + public String getDisplayName(int invocationIndex) { + return "repetition " + currentRepetition + " of " + totalRepetitions; + } } - return result; - } } diff --git a/src/test/java/org/thejavaguy/javafaker/service/FakeValuesGroupingTest.java b/src/test/java/org/thejavaguy/javafaker/service/FakeValuesGroupingTest.java index 561d049..ce887b7 100644 --- a/src/test/java/org/thejavaguy/javafaker/service/FakeValuesGroupingTest.java +++ b/src/test/java/org/thejavaguy/javafaker/service/FakeValuesGroupingTest.java @@ -6,15 +6,15 @@ import java.util.Locale; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class FakeValuesGroupingTest { private FakeValuesGrouping fakeValuesGrouping; private FakeValues addressValues; - @Before + @BeforeEach public void before() { fakeValuesGrouping = new FakeValuesGrouping(); addressValues = new FakeValues(Locale.ENGLISH, "address.yml", "address"); diff --git a/src/test/java/org/thejavaguy/javafaker/service/FakeValuesServiceTest.java b/src/test/java/org/thejavaguy/javafaker/service/FakeValuesServiceTest.java index c446981..5ebddb8 100644 --- a/src/test/java/org/thejavaguy/javafaker/service/FakeValuesServiceTest.java +++ b/src/test/java/org/thejavaguy/javafaker/service/FakeValuesServiceTest.java @@ -1,21 +1,21 @@ package org.thejavaguy.javafaker.service; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.emptyString; 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.hamcrest.Matchers.oneOf; +import static org.junit.jupiter.api.Assertions.fail; 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.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -25,12 +25,12 @@ import java.util.Locale; import org.hamcrest.core.Is; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; - import org.thejavaguy.javafaker.AbstractFakerTest; import org.thejavaguy.javafaker.Faker; import org.thejavaguy.javafaker.Superhero; @@ -44,11 +44,12 @@ public class FakeValuesServiceTest extends AbstractFakerTest { private RandomService randomService; private FakeValuesService fakeValuesService; + private AutoCloseable closeable; - @Before + @BeforeEach public void before() { super.before(); - MockitoAnnotations.initMocks(this); + closeable = MockitoAnnotations.openMocks(this); // always return the first element when(randomService.nextInt(anyInt())).thenReturn(0); @@ -56,6 +57,11 @@ public void before() { fakeValuesService = spy(new FakeValuesService(new Locale("test"), randomService)); } + @AfterEach + void closeMocks() throws Exception{ + closeable.close(); + } + @Test public void fetchStringShouldReturnValue() { assertThat(fakeValuesService.fetchString("property.dummy"), is("x")); @@ -84,7 +90,7 @@ public void safeFetchShouldReturnSimpleList() { @Test public void safeFetchShouldReturnEmptyStringWhenPropertyDoesntExist() { - assertThat(fakeValuesService.safeFetch("property.dummy2", ""), isEmptyString()); + assertThat(fakeValuesService.safeFetch("property.dummy2", ""), is(emptyString())); } @Test @@ -102,7 +108,7 @@ public void regexifyDirective() { final DummyService dummy = mock(DummyService.class); String value = fakeValuesService.resolve("property.regexify1", dummy, faker); - assertThat(value, isOneOf("55", "44", "45", "54")); + assertThat(value, is(oneOf("55", "44", "45", "54"))); verify(faker).regexify("[45]{2}"); } @@ -111,7 +117,7 @@ public void regexifySlashFormatDirective() { final DummyService dummy = mock(DummyService.class); String value = fakeValuesService.resolve("property.regexify_slash_format", dummy, faker); - assertThat(value, isOneOf("55", "44", "45", "54")); + assertThat(value, is(oneOf("55", "44", "45", "54"))); verify(faker).regexify("[45]{2}"); } @@ -120,7 +126,7 @@ public void regexifyDirective2() { final DummyService dummy = mock(DummyService.class); String value = fakeValuesService.resolve("property.regexify_cell", dummy, faker); - assertThat(value, isOneOf("479", "459")); + assertThat(value, is(oneOf("479", "459"))); verify(faker).regexify("4[57]9"); } @@ -138,7 +144,7 @@ public void resolveKeyToPropertyWithAPropertyWithoutAnObject() { // then assertThat(actual, is("Yo!")); verify(dummy).hello(); - verifyZeroInteractions(faker); + verifyNoMoreInteractions(faker); } @Test @@ -311,7 +317,7 @@ public void resolveUsingTheSameKeyTwice() { // then assertThat(actual, is("1 2")); - verifyZeroInteractions(faker); + verifyNoMoreInteractions(faker); } @Test public void FakeValuesServiceWithNullLocaleTest(){ diff --git a/src/test/java/org/thejavaguy/javafaker/service/FakeValuesTest.java b/src/test/java/org/thejavaguy/javafaker/service/FakeValuesTest.java index 4679258..9107f59 100644 --- a/src/test/java/org/thejavaguy/javafaker/service/FakeValuesTest.java +++ b/src/test/java/org/thejavaguy/javafaker/service/FakeValuesTest.java @@ -7,8 +7,8 @@ import java.util.Locale; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class FakeValuesTest { @@ -16,7 +16,7 @@ public class FakeValuesTest { private static final String PATH = "address"; private FakeValues fakeValues; - @Before + @BeforeEach public void before() { fakeValues = new FakeValues(Locale.ENGLISH, "address.yml", PATH); } diff --git a/src/test/java/org/thejavaguy/javafaker/service/RandomServiceTest.java b/src/test/java/org/thejavaguy/javafaker/service/RandomServiceTest.java index c16fa1a..f12998f 100644 --- a/src/test/java/org/thejavaguy/javafaker/service/RandomServiceTest.java +++ b/src/test/java/org/thejavaguy/javafaker/service/RandomServiceTest.java @@ -1,6 +1,5 @@ package org.thejavaguy.javafaker.service; -import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -8,31 +7,29 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.core.CombinableMatcher.both; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.thejavaguy.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; import java.util.Arrays; import java.util.Collection; import java.util.Random; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.thejavaguy.javafaker.AbstractFakerTest; /** * @author pmiklos * */ -@RunWith(Parameterized.class) public class RandomServiceTest extends AbstractFakerTest { private RandomService randomService; - public RandomServiceTest(String ignoredTitle, RandomService service) { + public void initRandomServiceTest(String ignoredTitle, RandomService service) { this.randomService = service; } - @Parameterized.Parameters(name = "Created via {0}") public static Collection data() { Object[][] data = new Object[][]{ {"RandomService(Random)", new RandomService(new Random())}, @@ -41,13 +38,18 @@ public static Collection data() { return Arrays.asList(data); } - @Test(expected = IllegalArgumentException.class) - public void testPositiveBoundariesOnly() { - randomService.nextLong(0L); + @MethodSource("data") + @ParameterizedTest(name = "Created via {0}") + public void testPositiveBoundariesOnly(String ignoredTitle,RandomService service) { + initRandomServiceTest(ignoredTitle, service); + assertThrows(IllegalArgumentException.class, () -> + randomService.nextLong(0L)); } - @Test - public void testLongWithinBoundary() { + @MethodSource("data") + @ParameterizedTest(name = "Created via {0}") + public void testLongWithinBoundary(String ignoredTitle,RandomService service) { + initRandomServiceTest(ignoredTitle, service); assertThat(randomService.nextLong(1), is(0L)); for (int i = 1; i < 10; i++) { @@ -55,25 +57,34 @@ public void testLongWithinBoundary() { } } - @Test - public void testLongMaxBoundary() { + @MethodSource("data") + @ParameterizedTest(name = "Created via {0}") + public void testLongMaxBoundary(String ignoredTitle,RandomService service) { + initRandomServiceTest(ignoredTitle, service); assertThat(randomService.nextLong(Long.MAX_VALUE), greaterThan(0L)); assertThat(randomService.nextLong(Long.MAX_VALUE), lessThan(Long.MAX_VALUE)); } - @Test - public void testIntInRange() { + @MethodSource("data") + @ParameterizedTest(name = "Created via {0}") + public void testIntInRange(String ignoredTitle,RandomService service) { + initRandomServiceTest(ignoredTitle, service); for (int i = 1; i < 100; i++) { assertThat(randomService.nextInt(-5, 5), both(lessThanOrEqualTo(5)).and(greaterThanOrEqualTo(-5))); } } - @Test - public void testHex() { + @MethodSource("data") + @ParameterizedTest(name = "Created via {0}") + public void testHex(String ignoredTitle,RandomService service) { + initRandomServiceTest(ignoredTitle, service); assertThat(randomService.hex(8), matchesRegularExpression("^[0-9A-F]{8}$")); } - @Test - public void testDefaultHex() { + + @MethodSource("data") + @ParameterizedTest(name = "Created via {0}") + public void testDefaultHex(String ignoredTitle,RandomService service) { + initRandomServiceTest(ignoredTitle, service); assertThat(randomService.hex(), matchesRegularExpression("^[0-9A-F]{8}$")); } }