From 59493e8306b34e3b8647fb684c9618b8f041360e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 20 Nov 2023 21:03:17 -0800 Subject: [PATCH] Fix failing tests following version upgrades --- .../wavefront/WavefrontPropertiesConfigAdapterTests.java | 2 +- .../org/springframework/boot/json/GsonJsonParserTests.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontPropertiesConfigAdapterTests.java index 9c4439f538..2acd34bbe5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontPropertiesConfigAdapterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontPropertiesConfigAdapterTests.java @@ -66,7 +66,7 @@ class WavefrontPropertiesConfigAdapterTests extends protected void whenPropertiesBatchSizeIsSetAdapterBatchSizeReturnsIt() { WavefrontProperties properties = new WavefrontProperties(); properties.getSender().setBatchSize(10042); - assertThat(createConfigAdapter(properties.getMetrics().getExport()).batchSize()).isEqualTo(10042); + assertThat(new WavefrontPropertiesConfigAdapter(properties).batchSize()).isEqualTo(10042); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java index 757a2d3b0d..3a7b7f04aa 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java @@ -18,8 +18,6 @@ package org.springframework.boot.json; import java.io.IOException; -import org.junit.jupiter.api.Disabled; - /** * Tests for {@link GsonJsonParser}. * @@ -33,9 +31,8 @@ class GsonJsonParserTests extends AbstractJsonParserTests { } @Override - @Disabled("Gson does not protect against deeply nested JSON") void listWithRepeatedOpenArray() throws IOException { - super.listWithRepeatedOpenArray(); + // Gson does not protect against deeply nested JSON } }