From b5821c9a2c26664c3aa4046228025a276848cce5 Mon Sep 17 00:00:00 2001 From: Nicklas Wallgren Date: Sun, 25 Jan 2026 14:00:40 +0100 Subject: [PATCH 1/2] chore: migrate to io.github.finoid.snapshot --- README.md | 4 ++++ .../src/test/resources/snapshot.properties | 12 +++++----- testify-snapshot/pom.xml | 13 ++++++----- .../testify/snapshot/Base64SnapshotDsl.java | 4 ++-- .../testify/snapshot/JsonSnapshotDsl.java | 2 +- .../snapshot/JsonSnapshotSerializer.java | 10 ++++---- .../testify/snapshot/PlainSnapshotDsl.java | 4 ++-- .../finoid/testify/snapshot/Snapshotter.java | 4 ++-- .../snapshot/SnapshotterExtension.java | 10 ++++---- .../testify/snapshot/XmlSnapshotDsl.java | 2 +- .../SnapshotterExtensionUnitTest.java | 4 ++-- .../testify/snapshot/SnapshotterUnitTest.java | 8 +++---- .../src/test/resources/snapshot.properties | 12 +++++----- .../testify/spring/http/HttpAsserter.java | 23 +++++++++++++++---- .../src/test/resources/snapshot.properties | 12 +++++----- .../src/test/resources/snapshot.properties | 12 +++++----- 16 files changed, 78 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index 9aec4b0..3807035 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,10 @@ testing, and more - enabling efficient test automation. beans from other Testify modules. * **testify-testcontainers** - Testcontainers support, including JUnit extensions for MsSqlServer. +## Spring Boot suport + +The `0.11.x` releases support Spring Boot 3, while `0.12.x` and later support Spring Boot 4. + ## Examples ### [Snapshot tests](testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterExtensionTest.java) diff --git a/testify-core/src/test/resources/snapshot.properties b/testify-core/src/test/resources/snapshot.properties index 0c3a342..aa993c2 100644 --- a/testify-core/src/test/resources/snapshot.properties +++ b/testify-core/src/test/resources/snapshot.properties @@ -1,9 +1,9 @@ -serializer=au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer -serializer.base64=au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer -serializer.json=au.com.origin.snapshots.jackson.serializers.v1.JacksonSnapshotSerializer -serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.v1.DeterministicJacksonSnapshotSerializer -comparator=au.com.origin.snapshots.comparators.v1.PlainTextEqualsComparator -reporters=au.com.origin.snapshots.reporters.v1.PlainTextSnapshotReporter +serializer=io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer +serializer.base64=io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer +serializer.json=io.github.finoid.snapshots.jackson2.serializers.v1.JacksonSnapshotSerializer +serializer.orderedJson=io.github.finoid.snapshots.jackson2.serializers.v1.DeterministicJacksonSnapshotSerializer +comparator=io.github.finoid.snapshots.comparators.v1.PlainTextEqualsComparator +reporters=io.github.finoid.snapshots.reporters.v1.PlainTextSnapshotReporter snapshot-dir=__snapshots__ output-dir=src/test/java ci-env-var= diff --git a/testify-snapshot/pom.xml b/testify-snapshot/pom.xml index b0d9bf8..832ac3f 100644 --- a/testify-snapshot/pom.xml +++ b/testify-snapshot/pom.xml @@ -24,6 +24,7 @@ 2.4.3 4.0.8 2.9.0 + 0.10.0 @@ -55,14 +56,14 @@ testify-core - io.github.origin-energy - java-snapshot-testing-plugin-jackson - ${java-snapshot-testing-junit5.version} + io.github.finoid + snapshot-testing-jackson2 + ${snapshot-testing.version} - io.github.origin-energy - java-snapshot-testing-junit5 - ${java-snapshot-testing-junit5.version} + io.github.finoid + snapshot-testing-junit5 + ${snapshot-testing.version} org.checkerframework diff --git a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Base64SnapshotDsl.java b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Base64SnapshotDsl.java index 1c63e84..da09f58 100644 --- a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Base64SnapshotDsl.java +++ b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Base64SnapshotDsl.java @@ -1,7 +1,7 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Expect; -import au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer; +import io.github.finoid.snapshots.Expect; +import io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer; import io.github.finoid.testify.core.internal.Precondition; import io.github.finoid.testify.snapshot.SnapshotDsl.ScenarioSnapshotDsl; diff --git a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotDsl.java b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotDsl.java index bbf81c6..f61f605 100644 --- a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotDsl.java +++ b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotDsl.java @@ -1,6 +1,6 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Expect; +import io.github.finoid.snapshots.Expect; import com.fasterxml.jackson.databind.module.SimpleModule; import io.github.finoid.testify.core.internal.Precondition; import io.github.finoid.testify.snapshot.SnapshotDsl.MaskingSnapshotDsl; diff --git a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotSerializer.java b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotSerializer.java index 8adb680..30da159 100644 --- a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotSerializer.java +++ b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotSerializer.java @@ -1,10 +1,10 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Snapshot; -import au.com.origin.snapshots.SnapshotSerializerContext; -import au.com.origin.snapshots.exceptions.SnapshotExtensionException; -import au.com.origin.snapshots.serializers.SerializerType; -import au.com.origin.snapshots.serializers.SnapshotSerializer; +import io.github.finoid.snapshots.Snapshot; +import io.github.finoid.snapshots.SnapshotSerializerContext; +import io.github.finoid.snapshots.exceptions.SnapshotExtensionException; +import io.github.finoid.snapshots.serializers.SerializerType; +import io.github.finoid.snapshots.serializers.SnapshotSerializer; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.PrettyPrinter; diff --git a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/PlainSnapshotDsl.java b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/PlainSnapshotDsl.java index 7de1fcb..af577bc 100644 --- a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/PlainSnapshotDsl.java +++ b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/PlainSnapshotDsl.java @@ -1,7 +1,7 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Expect; -import au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer; +import io.github.finoid.snapshots.Expect; +import io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer; import io.github.finoid.testify.core.internal.Precondition; import io.github.finoid.testify.snapshot.SnapshotDsl.ScenarioSnapshotDsl; diff --git a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Snapshotter.java b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Snapshotter.java index f2e883d..e396ac7 100644 --- a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Snapshotter.java +++ b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Snapshotter.java @@ -1,7 +1,7 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Expect; -import au.com.origin.snapshots.junit5.SnapshotExtension; +import io.github.finoid.snapshots.Expect; +import io.github.finoid.snapshots.junit5.SnapshotExtension; import lombok.RequiredArgsConstructor; /** diff --git a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/SnapshotterExtension.java b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/SnapshotterExtension.java index 580d50b..e274d37 100644 --- a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/SnapshotterExtension.java +++ b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/SnapshotterExtension.java @@ -1,10 +1,10 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Expect; -import au.com.origin.snapshots.SnapshotVerifier; -import au.com.origin.snapshots.config.PropertyResolvingSnapshotConfig; -import au.com.origin.snapshots.exceptions.SnapshotMatchException; -import au.com.origin.snapshots.utils.ReflectionUtils; +import io.github.finoid.snapshots.Expect; +import io.github.finoid.snapshots.SnapshotVerifier; +import io.github.finoid.snapshots.config.PropertyResolvingSnapshotConfig; +import io.github.finoid.snapshots.exceptions.SnapshotMatchException; +import io.github.finoid.snapshots.utils.ReflectionUtils; import lombok.Value; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; diff --git a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/XmlSnapshotDsl.java b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/XmlSnapshotDsl.java index e263f93..1c3ff5c 100644 --- a/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/XmlSnapshotDsl.java +++ b/testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/XmlSnapshotDsl.java @@ -1,6 +1,6 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Expect; +import io.github.finoid.snapshots.Expect; import io.github.finoid.testify.core.internal.Precondition; import io.github.finoid.testify.snapshot.SnapshotDsl.ScenarioSnapshotDsl; diff --git a/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterExtensionUnitTest.java b/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterExtensionUnitTest.java index b89cced..5a32f71 100644 --- a/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterExtensionUnitTest.java +++ b/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterExtensionUnitTest.java @@ -1,7 +1,7 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.SnapshotVerifier; -import au.com.origin.snapshots.exceptions.SnapshotMatchException; +import io.github.finoid.snapshots.SnapshotVerifier; +import io.github.finoid.snapshots.exceptions.SnapshotMatchException; import io.github.finoid.testify.core.type.UnitTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterUnitTest.java b/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterUnitTest.java index aefe326..ef2b914 100644 --- a/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterUnitTest.java +++ b/testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterUnitTest.java @@ -1,9 +1,9 @@ package io.github.finoid.testify.snapshot; -import au.com.origin.snapshots.Expect; -import au.com.origin.snapshots.SnapshotVerifier; -import au.com.origin.snapshots.config.PropertyResolvingSnapshotConfig; -import au.com.origin.snapshots.exceptions.SnapshotMatchException; +import io.github.finoid.snapshots.Expect; +import io.github.finoid.snapshots.SnapshotVerifier; +import io.github.finoid.snapshots.config.PropertyResolvingSnapshotConfig; +import io.github.finoid.snapshots.exceptions.SnapshotMatchException; import io.github.finoid.testify.core.type.UnitTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/testify-snapshot/src/test/resources/snapshot.properties b/testify-snapshot/src/test/resources/snapshot.properties index 0c3a342..aa993c2 100644 --- a/testify-snapshot/src/test/resources/snapshot.properties +++ b/testify-snapshot/src/test/resources/snapshot.properties @@ -1,9 +1,9 @@ -serializer=au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer -serializer.base64=au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer -serializer.json=au.com.origin.snapshots.jackson.serializers.v1.JacksonSnapshotSerializer -serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.v1.DeterministicJacksonSnapshotSerializer -comparator=au.com.origin.snapshots.comparators.v1.PlainTextEqualsComparator -reporters=au.com.origin.snapshots.reporters.v1.PlainTextSnapshotReporter +serializer=io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer +serializer.base64=io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer +serializer.json=io.github.finoid.snapshots.jackson2.serializers.v1.JacksonSnapshotSerializer +serializer.orderedJson=io.github.finoid.snapshots.jackson2.serializers.v1.DeterministicJacksonSnapshotSerializer +comparator=io.github.finoid.snapshots.comparators.v1.PlainTextEqualsComparator +reporters=io.github.finoid.snapshots.reporters.v1.PlainTextSnapshotReporter snapshot-dir=__snapshots__ output-dir=src/test/java ci-env-var= diff --git a/testify-spring/src/main/java/io/github/finoid/testify/spring/http/HttpAsserter.java b/testify-spring/src/main/java/io/github/finoid/testify/spring/http/HttpAsserter.java index 3139492..e1da06a 100644 --- a/testify-spring/src/main/java/io/github/finoid/testify/spring/http/HttpAsserter.java +++ b/testify-spring/src/main/java/io/github/finoid/testify/spring/http/HttpAsserter.java @@ -27,6 +27,7 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.validation.Validator; +import org.springframework.web.servlet.HandlerExceptionResolver; import java.util.Collection; import java.util.Collections; @@ -154,11 +155,12 @@ public static class HttpAsserterDsl { private ObjectMapper objectMapper = new ObjectMapper(); @Nullable private Object controller; - private List controllerAdvices = Collections.emptyList(); + private Collection controllerAdvices = Collections.emptyList(); private FormattingConversionService conversionService = new DefaultFormattingConversionService(); + private Collection handlerExceptionResolvers = Collections.emptyList(); private Validator validator = new ValidatorFactoryBean(); - private List additionalBeans = Collections.emptyList(); - private List> httpMessageConverters = Collections.emptyList(); + private Collection additionalBeans = Collections.emptyList(); + private Collection> httpMessageConverters = Collections.emptyList(); private HttpAsserterDsl() { } @@ -205,6 +207,18 @@ public HttpAsserterDsl conversionService(final FormattingConversionService conve return this; } + public HttpAsserterDsl handlerExceptionResolvers(final Collection handlerExceptionResolvers) { + this.handlerExceptionResolvers = handlerExceptionResolvers; + + return this; + } + + public HttpAsserterDsl handlerExceptionResolvers(final HandlerExceptionResolver... handlerExceptionResolvers) { + this.handlerExceptionResolvers = List.of(handlerExceptionResolvers); + + return this; + } + public HttpAsserterDsl validator(final Validator validator) { this.validator = Precondition.nonNull(validator, "Validator must not be null"); @@ -229,10 +243,11 @@ public HttpAsserterDsl httpMessageConverters(final Collection Date: Sun, 25 Jan 2026 15:17:43 +0000 Subject: [PATCH 2/2] chore(deps): bump spring-boot.version from 3.5.6 to 4.0.2 Bumps `spring-boot.version` from 3.5.6 to 4.0.2. Updates `org.springframework.boot:spring-boot-dependencies` from 3.5.6 to 4.0.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.6...v4.0.2) Updates `org.springframework.boot:spring-boot-autoconfigure` from 3.5.6 to 4.0.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.6...v4.0.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-version: 4.0.2 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-autoconfigure dependency-version: 4.0.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e35cc4..1cd4a71 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 0.10.0 - 3.5.6 + 4.0.2 true checkstyle/checkstyle-suppressions.xml