From dc09886740263029f376336b1b3f46050515f0ee Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Wed, 18 Nov 2026 12:59:07 +0200 Subject: [PATCH 1/2] Tests: Improve diagnostics for unmatched WireMock requests --- .../org/prebid/server/it/IntegrationTest.java | 3 + .../it/WireMockAfterTestDiagnostics.java | 98 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 src/test/java/org/prebid/server/it/WireMockAfterTestDiagnostics.java diff --git a/src/test/java/org/prebid/server/it/IntegrationTest.java b/src/test/java/org/prebid/server/it/IntegrationTest.java index 3271bee989e..8c18d67825d 100644 --- a/src/test/java/org/prebid/server/it/IntegrationTest.java +++ b/src/test/java/org/prebid/server/it/IntegrationTest.java @@ -70,6 +70,9 @@ public abstract class IntegrationTest extends VertxTest { .extensions(IntegrationTest.CacheResponseTransformer.class)) .build(); + @RegisterExtension + public static final WireMockAfterTestDiagnostics WIRE_MOCK_DIAGNOSTICS = new WireMockAfterTestDiagnostics(WIRE_MOCK_RULE); + protected static final RequestSpecification SPEC = spec(APP_PORT); private static final String HOST_AND_PORT = "localhost:" + WIREMOCK_PORT; private static final String CACHE_PATH = "/cache"; diff --git a/src/test/java/org/prebid/server/it/WireMockAfterTestDiagnostics.java b/src/test/java/org/prebid/server/it/WireMockAfterTestDiagnostics.java new file mode 100644 index 00000000000..05328678707 --- /dev/null +++ b/src/test/java/org/prebid/server/it/WireMockAfterTestDiagnostics.java @@ -0,0 +1,98 @@ +package org.prebid.server.it; + +import com.github.tomakehurst.wiremock.junit5.WireMockExtension; +import com.github.tomakehurst.wiremock.matching.ContentPattern; +import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern; +import com.github.tomakehurst.wiremock.verification.LoggedRequest; +import com.github.tomakehurst.wiremock.verification.NearMiss; +import net.javacrumbs.jsonunit.core.Configuration; +import net.javacrumbs.jsonunit.core.Option; +import net.javacrumbs.jsonunit.core.internal.Diff; +import org.junit.jupiter.api.extension.AfterTestExecutionCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +import java.math.BigDecimal; +import java.util.List; + +public class WireMockAfterTestDiagnostics implements AfterTestExecutionCallback { + + private final WireMockExtension wireMock; + + public WireMockAfterTestDiagnostics(WireMockExtension wireMock) { + this.wireMock = wireMock; + } + + @Override + public void afterTestExecution(ExtensionContext context) { + context.getExecutionException().ifPresent(this::addDiagnostics); + } + + private void addDiagnostics(Throwable failure) { + try { + wireMock.findAllUnmatchedRequests() + .forEach(request -> addRequestDiagnostics(request, failure)); + } catch (RuntimeException e) { + failure.addSuppressed(e); + } + } + + private void addRequestDiagnostics(LoggedRequest request, Throwable failure) { + try { + final List nearMisses = wireMock.findNearMissesFor(request); + if (!nearMisses.isEmpty()) { + compareRequestBody(nearMisses.getFirst(), failure); + } + } catch (RuntimeException e) { + failure.addSuppressed(e); + } + } + + private static void compareRequestBody(NearMiss nearMiss, Throwable failure) { + final List> patterns = nearMiss.getStubMapping() + .getRequest() + .getBodyPatterns(); + + if (patterns == null) { + return; + } + + for (ContentPattern pattern : patterns) { + if (pattern instanceof EqualToJsonPattern jsonPattern) { + compareJson(nearMiss.getRequest(), jsonPattern, failure); + } + } + } + + private static void compareJson(LoggedRequest request, + EqualToJsonPattern pattern, + Throwable failure) { + + final Diff diff = Diff.create( + pattern.getExpected(), + request.getBodyAsString(), + "actual", + "", + makeConfiguration(pattern)); + + if (!diff.similar()) { + failure.addSuppressed(new AssertionError( + "WireMock request body mismatch: %s %s%n%s".formatted( + request.getMethod(), + request.getUrl(), + diff.differences()))); + } + } + + private static Configuration makeConfiguration(EqualToJsonPattern pattern) { + Configuration configuration = Configuration.empty().withTolerance(BigDecimal.ZERO); + if (Boolean.TRUE.equals(pattern.isIgnoreArrayOrder())) { + configuration = configuration.withOptions(Option.IGNORING_ARRAY_ORDER); + } + if (Boolean.TRUE.equals(pattern.isIgnoreExtraElements())) { + configuration = configuration.withOptions( + Option.IGNORING_EXTRA_FIELDS, + Option.IGNORING_EXTRA_ARRAY_ITEMS); + } + return configuration; + } +} From e2c7adf6a1b25df52f38edca33eed6b43ceb5561 Mon Sep 17 00:00:00 2001 From: osulzhenko Date: Wed, 18 Nov 2026 13:35:44 +0200 Subject: [PATCH 2/2] fix checkstyle --- src/test/java/org/prebid/server/it/IntegrationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/prebid/server/it/IntegrationTest.java b/src/test/java/org/prebid/server/it/IntegrationTest.java index 8c18d67825d..9b2e48cebb7 100644 --- a/src/test/java/org/prebid/server/it/IntegrationTest.java +++ b/src/test/java/org/prebid/server/it/IntegrationTest.java @@ -71,7 +71,8 @@ public abstract class IntegrationTest extends VertxTest { .build(); @RegisterExtension - public static final WireMockAfterTestDiagnostics WIRE_MOCK_DIAGNOSTICS = new WireMockAfterTestDiagnostics(WIRE_MOCK_RULE); + public static final WireMockAfterTestDiagnostics WIRE_MOCK_DIAGNOSTICS = + new WireMockAfterTestDiagnostics(WIRE_MOCK_RULE); protected static final RequestSpecification SPEC = spec(APP_PORT); private static final String HOST_AND_PORT = "localhost:" + WIREMOCK_PORT;