From b3d33754a5c46771c472103772a0883e1d87949a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 22 Apr 2020 11:55:35 -0700 Subject: [PATCH] Remove outdated FIXMEs from tests Closes gh-19782 --- .../ReactiveCloudFoundrySecurityServiceTests.java | 2 -- .../info/InfoEndpointAutoConfigurationTests.java | 1 - .../jmx/annotation/JmxEndpointDiscovererTests.java | 14 ++++---------- .../jdbc/HikariDataSourceConfigurationTests.java | 1 - .../boot/testsupport/rule/OutputCapture.java | 4 ++-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java index 058abc17a9..a1b7eb3e55 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java @@ -204,8 +204,6 @@ public class ReactiveCloudFoundrySecurityServiceTests { }); StepVerifier.create(this.securityService.getUaaUrl()) .consumeNextWith((uaaUrl) -> assertThat(uaaUrl).isEqualTo(UAA_URL)).expectComplete().verify(); - // this.securityService.getUaaUrl().block(); //FIXME subscribe again to check that - // it isn't called again expectRequest((request) -> assertThat(request.getPath()).isEqualTo(CLOUD_CONTROLLER + "/info")); expectRequestCount(1); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfigurationTests.java index 182b876ec2..f064054d5e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfigurationTests.java @@ -42,7 +42,6 @@ public class InfoEndpointAutoConfigurationTests { @Test public void runShouldHaveEndpointBeanEvenIfDefaultIsDisabled() { - // FIXME this.contextRunner.withPropertyValues("management.endpoint.default.enabled:false") .run((context) -> assertThat(context).hasSingleBean(InfoEndpoint.class)); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java index 519a489472..645cb60cb6 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java @@ -79,18 +79,18 @@ public class JmxEndpointDiscovererTests { assertThat(getSomething.getDescription()).isEqualTo("Invoke getSomething for endpoint test"); assertThat(getSomething.getOutputType()).isEqualTo(String.class); assertThat(getSomething.getParameters()).hasSize(1); - hasDefaultParameter(getSomething, 0, String.class); + assertThat(getSomething.getParameters().get(0).getType()).isEqualTo(String.class); JmxOperation update = operationByName.get("update"); assertThat(update.getDescription()).isEqualTo("Invoke update for endpoint test"); assertThat(update.getOutputType()).isEqualTo(Void.TYPE); assertThat(update.getParameters()).hasSize(2); - hasDefaultParameter(update, 0, String.class); - hasDefaultParameter(update, 1, String.class); + assertThat(update.getParameters().get(0).getType()).isEqualTo(String.class); + assertThat(update.getParameters().get(1).getType()).isEqualTo(String.class); JmxOperation deleteSomething = operationByName.get("deleteSomething"); assertThat(deleteSomething.getDescription()).isEqualTo("Invoke deleteSomething for endpoint test"); assertThat(deleteSomething.getOutputType()).isEqualTo(Void.TYPE); assertThat(deleteSomething.getParameters()).hasSize(1); - hasDefaultParameter(deleteSomething, 0, String.class); + assertThat(deleteSomething.getParameters().get(0).getType()).isEqualTo(String.class); }); } @@ -239,12 +239,6 @@ public class JmxEndpointDiscovererTests { assertThat(parameter.getDescription()).isEqualTo(description); } - // FIXME rename - private void hasDefaultParameter(JmxOperation operation, int index, Class type) { - JmxOperationParameter parameter = operation.getParameters().get(index); - assertThat(parameter.getType()).isEqualTo(type); - } - private Map discover(JmxEndpointDiscoverer discoverer) { Map byId = new HashMap<>(); discoverer.getEndpoints().forEach((endpoint) -> byId.put(endpoint.getEndpointId(), endpoint)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java index 4a3ebccd39..3a1d3d8fb9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java @@ -55,7 +55,6 @@ public class HikariDataSourceConfigurationTests { assertThat(ds.getJdbcUrl()).isEqualTo("jdbc:foo//bar/spam"); assertThat(ds.getMaxLifetime()).isEqualTo(1234); }); - // TODO: test JDBC4 isValid() } @Test diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/rule/OutputCapture.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/rule/OutputCapture.java index 5f354b257f..f2eae7a19d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/rule/OutputCapture.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/rule/OutputCapture.java @@ -51,6 +51,7 @@ public class OutputCapture implements TestRule { @Override public Statement apply(Statement base, Description description) { return new Statement() { + @Override public void evaluate() throws Throwable { captureOutput(); @@ -69,11 +70,11 @@ public class OutputCapture implements TestRule { } } } + }; } protected void captureOutput() { - // FIXME AnsiOutput.setEnabled(Enabled.NEVER); this.copy = new ByteArrayOutputStream(); this.captureOut = new CaptureOutputStream(System.out, this.copy); this.captureErr = new CaptureOutputStream(System.err, this.copy); @@ -82,7 +83,6 @@ public class OutputCapture implements TestRule { } protected void releaseOutput() { - // FIXME AnsiOutput.setEnabled(Enabled.DETECT); System.setOut(this.captureOut.getOriginal()); System.setErr(this.captureErr.getOriginal()); this.copy = null;