diff --git a/build.gradle b/build.gradle index b089859b5..4ed619aed 100644 --- a/build.gradle +++ b/build.gradle @@ -25,8 +25,8 @@ subprojects { ext { JUNIT_ENGINE_VERSION = "1.8.1" - JUNIT_JUPITER_VERSION = "5.8.1" - JQWIK_VERSION = "1.6.4" + JUNIT_JUPITER_VERSION = "5.8.2" + JQWIK_VERSION = "1.6.5" } dependencies { diff --git a/fixture-monkey-api/build.gradle b/fixture-monkey-api/build.gradle index 2d55175a6..3f9b04353 100644 --- a/fixture-monkey-api/build.gradle +++ b/fixture-monkey-api/build.gradle @@ -17,10 +17,10 @@ dependencies { testImplementation("net.jqwik:jqwik-api:${JQWIK_VERSION}") testImplementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") testImplementation("org.junit.platform:junit-platform-engine:${JUNIT_ENGINE_VERSION}") - testImplementation("org.projectlombok:lombok:1.18.20") - testImplementation("org.assertj:assertj-core:3.18.1") + testImplementation("org.projectlombok:lombok:1.18.24") + testImplementation("org.assertj:assertj-core:3.22.0") testImplementation("net.jqwik:jqwik-time:${JQWIK_VERSION}") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey-autoparams/build.gradle b/fixture-monkey-autoparams/build.gradle index 1e9507e1b..1861a7d14 100644 --- a/fixture-monkey-autoparams/build.gradle +++ b/fixture-monkey-autoparams/build.gradle @@ -15,9 +15,9 @@ dependencies { testImplementation(project(":fixture-monkey-engine")) testImplementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") testImplementation("org.junit.platform:junit-platform-engine:${JUNIT_ENGINE_VERSION}") - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey-engine/build.gradle b/fixture-monkey-engine/build.gradle index d1267b38a..7ccc690f8 100644 --- a/fixture-monkey-engine/build.gradle +++ b/fixture-monkey-engine/build.gradle @@ -12,9 +12,9 @@ dependencies { implementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") api("net.jqwik:jqwik-engine:${JQWIK_VERSION}") - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey-jackson/build.gradle b/fixture-monkey-jackson/build.gradle index 3c29a8719..7afc6f2b2 100644 --- a/fixture-monkey-jackson/build.gradle +++ b/fixture-monkey-jackson/build.gradle @@ -9,16 +9,16 @@ plugins { dependencies { api(project(":fixture-monkey")) - api("com.fasterxml.jackson.core:jackson-databind:2.12.3") - api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3") - api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3") + api("com.fasterxml.jackson.core:jackson-databind:2.13.3") + api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.3") + api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3") testRuntimeOnly(project(":fixture-monkey-engine")) testImplementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") testImplementation("org.junit.platform:junit-platform-engine:${JUNIT_ENGINE_VERSION}") - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey-jackson/src/test/java/com/navercorp/fixturemonkey/test/FixtureMonkeyJacksonArbitraryGeneratorTest.java b/fixture-monkey-jackson/src/test/java/com/navercorp/fixturemonkey/test/FixtureMonkeyJacksonArbitraryGeneratorTest.java index 5f4a57b37..888a5b1a0 100644 --- a/fixture-monkey-jackson/src/test/java/com/navercorp/fixturemonkey/test/FixtureMonkeyJacksonArbitraryGeneratorTest.java +++ b/fixture-monkey-jackson/src/test/java/com/navercorp/fixturemonkey/test/FixtureMonkeyJacksonArbitraryGeneratorTest.java @@ -89,7 +89,7 @@ void giveMeJsonNodeReturnsNull() { // when JsonNodeWrapperClass actual = sut.giveMeOne(JsonNodeWrapperClass.class); - then(actual.getValue().isNull()).isTrue(); + then(actual.getValue()).isNull(); } @Data diff --git a/fixture-monkey-javax-validation/build.gradle b/fixture-monkey-javax-validation/build.gradle index 19d993050..d3a169e32 100644 --- a/fixture-monkey-javax-validation/build.gradle +++ b/fixture-monkey-javax-validation/build.gradle @@ -19,9 +19,9 @@ dependencies { testImplementation("org.glassfish:jakarta.el:3.0.3") testImplementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") testImplementation("org.junit.platform:junit-platform-engine:${JUNIT_ENGINE_VERSION}") - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey-junit-jupiter/build.gradle b/fixture-monkey-junit-jupiter/build.gradle index 2dd5b8508..204854590 100644 --- a/fixture-monkey-junit-jupiter/build.gradle +++ b/fixture-monkey-junit-jupiter/build.gradle @@ -10,13 +10,13 @@ plugins { dependencies { api(project(":fixture-monkey")) - api("org.junit.jupiter:junit-jupiter-api:5.8.2") + api("org.junit.jupiter:junit-jupiter-api:${JUNIT_JUPITER_VERSION}") testImplementation(project(":fixture-monkey-engine")) - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey-kotlin/build.gradle b/fixture-monkey-kotlin/build.gradle index dee030455..3f77d4916 100644 --- a/fixture-monkey-kotlin/build.gradle +++ b/fixture-monkey-kotlin/build.gradle @@ -28,7 +28,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") testImplementation("org.junit.platform:junit-platform-engine:${JUNIT_ENGINE_VERSION}") - testImplementation("org.assertj:assertj-core:3.18.1") + testImplementation("org.assertj:assertj-core:3.22.0") } test { diff --git a/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyBuilderExtensionsTest.kt b/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyBuilderExtensionsTest.kt index 466abcd14..bb43303aa 100644 --- a/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyBuilderExtensionsTest.kt +++ b/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyBuilderExtensionsTest.kt @@ -20,6 +20,7 @@ package com.navercorp.fixturemonkey.kotlin import org.assertj.core.api.BDDAssertions.then import org.junit.jupiter.api.Test +import java.util.function.Consumer class FixtureMonkeyBuilderExtensionsTest { @@ -35,12 +36,14 @@ class FixtureMonkeyBuilderExtensionsTest { }.build() val actual = sut.giveMeOne() - then(actual).satisfies { - with(it) { - then(intValue).isEqualTo(-1) - then(stringValue).isEqualTo("test_value") + then(actual).satisfies( + Consumer { + with(it) { + then(intValue).isEqualTo(-1) + then(stringValue).isEqualTo("test_value") + } } - } + ) } data class IntegerStringWrapperClass( diff --git a/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyExtensionsTest.kt b/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyExtensionsTest.kt index 12bb7bfc3..b6ce1c19f 100644 --- a/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyExtensionsTest.kt +++ b/fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyExtensionsTest.kt @@ -25,6 +25,7 @@ import com.navercorp.fixturemonkey.kotlin.customizer.KArbitraryCustomizer import net.jqwik.api.Arbitraries import net.jqwik.api.Property import org.assertj.core.api.BDDAssertions.then +import java.util.function.Consumer import kotlin.reflect.KClass class FixtureMonkeyExtensionsTest { @@ -35,12 +36,14 @@ class FixtureMonkeyExtensionsTest { // when val actual = sut.giveMe().take(10).toList() - then(actual).hasSize(10).allSatisfy { - with(it) { - then(intValue).isBetween(Int.MIN_VALUE, Int.MAX_VALUE) - then(stringValue).isNotNull() + then(actual).hasSize(10).allSatisfy( + Consumer { + with(it) { + then(intValue).isBetween(Int.MIN_VALUE, Int.MAX_VALUE) + then(stringValue).isNotNull() + } } - } + ) } @Property @@ -63,12 +66,14 @@ class FixtureMonkeyExtensionsTest { } ).take(10).toList() - then(actual).hasSize(10).allSatisfy { - with(it) { - then(intValue).isEqualTo(-1) - then(stringValue).isEqualTo("test_value") + then(actual).hasSize(10).allSatisfy( + Consumer { + with(it) { + then(intValue).isEqualTo(-1) + then(stringValue).isEqualTo("test_value") + } } - } + ) } @Property @@ -78,11 +83,13 @@ class FixtureMonkeyExtensionsTest { it?.copy(stringValue = "test_value") }.take(10).toList() - then(actual).hasSize(10).allSatisfy { - with(it) { - then(stringValue).isEqualTo("test_value") + then(actual).hasSize(10).allSatisfy( + Consumer { + with(it) { + then(stringValue).isEqualTo("test_value") + } } - } + ) } @Property @@ -90,12 +97,14 @@ class FixtureMonkeyExtensionsTest { // when val actual = sut.giveMe(10) - then(actual).hasSize(10).allSatisfy { - with(it) { - then(intValue).isBetween(Int.MIN_VALUE, Int.MAX_VALUE) - then(stringValue).isNotNull() + then(actual).hasSize(10).allSatisfy( + Consumer { + with(it) { + then(intValue).isBetween(Int.MIN_VALUE, Int.MAX_VALUE) + then(stringValue).isNotNull() + } } - } + ) } @Property @@ -119,12 +128,14 @@ class FixtureMonkeyExtensionsTest { } ) - then(actual).hasSize(10).allSatisfy { - with(it) { - then(intValue).isEqualTo(-1) - then(stringValue).isEqualTo("test_value") + then(actual).hasSize(10).allSatisfy( + Consumer { + with(it) { + then(intValue).isEqualTo(-1) + then(stringValue).isEqualTo("test_value") + } } - } + ) } @Property @@ -134,11 +145,13 @@ class FixtureMonkeyExtensionsTest { it?.copy(stringValue = "test_value") } - then(actual).hasSize(10).allSatisfy { - with(it) { - then(stringValue).isEqualTo("test_value") + then(actual).hasSize(10).allSatisfy( + Consumer { + with(it) { + then(stringValue).isEqualTo("test_value") + } } - } + ) } @Property diff --git a/fixture-monkey-mockito/build.gradle b/fixture-monkey-mockito/build.gradle index a02ce871a..fa56fc5eb 100644 --- a/fixture-monkey-mockito/build.gradle +++ b/fixture-monkey-mockito/build.gradle @@ -11,9 +11,9 @@ dependencies { api(project(":fixture-monkey")) api("org.mockito:mockito-core:3.9.0") - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey-starter/build.gradle b/fixture-monkey-starter/build.gradle index 51491ada4..81dab57a4 100644 --- a/fixture-monkey-starter/build.gradle +++ b/fixture-monkey-starter/build.gradle @@ -14,11 +14,11 @@ dependencies { api("org.hibernate.validator:hibernate-validator:6.2.0.Final") api("org.glassfish:jakarta.el:3.0.3") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") - testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0") - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testImplementation("org.junit.jupiter:junit-jupiter-api:${JUNIT_JUPITER_VERSION}") + testImplementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig { diff --git a/fixture-monkey/build.gradle b/fixture-monkey/build.gradle index 27ed54f81..258404c2f 100644 --- a/fixture-monkey/build.gradle +++ b/fixture-monkey/build.gradle @@ -18,11 +18,11 @@ dependencies { testRuntimeOnly(project(":fixture-monkey-engine")) testImplementation("org.junit.jupiter:junit-jupiter-engine:${JUNIT_JUPITER_VERSION}") testImplementation("org.junit.platform:junit-platform-engine:${JUNIT_ENGINE_VERSION}") - testImplementation("org.assertj:assertj-core:3.18.1") - testImplementation("org.projectlombok:lombok:1.18.20") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.projectlombok:lombok:1.18.24") testImplementation("org.hibernate.validator:hibernate-validator:6.2.0.Final") testImplementation("org.glassfish:jakarta.el:3.0.3") - testAnnotationProcessor("org.projectlombok:lombok:1.18.20") + testAnnotationProcessor("org.projectlombok:lombok:1.18.24") } editorconfig {