Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

Browse Source 
Closes gh-25506
This commit is contained in:
Stephane Nicoll
2021-03-05 10:03:42 +01:00
parent 37dcb90876 2682b3803a
commit 76d0a7f8ba
8 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -284,7 +284,7 @@ class Neo4jAutoConfigurationTests {
@Test @Test
void securityWithCustomCertificates(@TempDir File directory) throws IOException { void securityWithCustomCertificates(@TempDir File directory) throws IOException {
File certFile = new File(directory, "neo4j-driver.cert"); File certFile = new File(directory, "neo4j-driver.cert");
assertThat(certFile.createNewFile()); assertThat(certFile.createNewFile()).isTrue();
Neo4jProperties properties = new Neo4jProperties(); Neo4jProperties properties = new Neo4jProperties();
properties.getSecurity().setTrustStrategy(TrustStrategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES); properties.getSecurity().setTrustStrategy(TrustStrategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES);

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ class BuildInfoIntegrationTests {
Properties second = buildInfoProperties(); Properties second = buildInfoProperties();
String secondBuildTime = second.getProperty("build.time"); String secondBuildTime = second.getProperty("build.time");
assertThat(secondBuildTime).isNotNull(); assertThat(secondBuildTime).isNotNull();
assertThat(Instant.parse(firstBuildTime).isBefore(Instant.parse(secondBuildTime))); assertThat(Instant.parse(firstBuildTime)).isBefore(Instant.parse(secondBuildTime));
} }
@TestTemplate @TestTemplate

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public class BootBuildImageRegistryIntegrationTests {
@BeforeEach @BeforeEach
void setUp() { void setUp() {
assertThat(registry.isRunning()); assertThat(registry.isRunning()).isTrue();
this.registryAddress = registry.getHost() + ":" + registry.getFirstMappedPort(); this.registryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
} }

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java
View File

@@ -98,7 +98,7 @@ abstract class AbstractArchiveIntegrationTests {
private JarAssert(File actual) { private JarAssert(File actual) {
super(actual, JarAssert.class); super(actual, JarAssert.class);
assertThat(actual.exists()); assertThat(actual).exists();
} }
JarAssert doesNotHaveEntryWithName(String name) { JarAssert doesNotHaveEntryWithName(String name) {

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public class BuildImageRegistryIntegrationTests extends AbstractArchiveIntegrati
@BeforeEach @BeforeEach
void setUp() { void setUp() {
assertThat(registry.isRunning()); assertThat(registry.isRunning()).isTrue();
this.dockerClient = registry.getDockerClient(); this.dockerClient = registry.getDockerClient();
this.registryAddress = registry.getHost() + ":" + registry.getFirstMappedPort(); this.registryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
} }

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1228,10 +1228,10 @@ class SpringApplicationTests {
application.addListeners(listener); application.addListeners(listener);
application.run(); application.run();
ApplicationStartingEvent startingEvent = listener.getEvent(ApplicationStartingEvent.class); ApplicationStartingEvent startingEvent = listener.getEvent(ApplicationStartingEvent.class);
assertThat(startingEvent.getBootstrapContext().get(String.class)); assertThat(startingEvent.getBootstrapContext().get(String.class)).isEqualTo("boot");
ApplicationEnvironmentPreparedEvent environmentPreparedEvent = listener ApplicationEnvironmentPreparedEvent environmentPreparedEvent = listener
.getEvent(ApplicationEnvironmentPreparedEvent.class); .getEvent(ApplicationEnvironmentPreparedEvent.class);
assertThat(environmentPreparedEvent.getBootstrapContext().get(String.class)); assertThat(environmentPreparedEvent.getBootstrapContext().get(String.class)).isEqualTo("boot");
} }
@Test @Test

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -54,7 +54,6 @@ import org.springframework.messaging.rsocket.RSocketStrategies;
import org.springframework.util.SocketUtils; import org.springframework.util.SocketUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.will; import static org.mockito.BDDMockito.will;
import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.inOrder;
@@ -203,7 +202,7 @@ class NettyRSocketServerFactoryTests {
String payload = "test payload"; String payload = "test payload";
Mono<String> responseMono = this.requester.route("test").data(payload).retrieveMono(String.class); Mono<String> responseMono = this.requester.route("test").data(payload).retrieveMono(String.class);
StepVerifier.create(responseMono) StepVerifier.create(responseMono)
.verifyErrorSatisfies((ex) -> assertThatExceptionOfType(ClosedChannelException.class)); .verifyErrorSatisfies((ex) -> assertThat(ex).isInstanceOf(ClosedChannelException.class));
} }
private RSocketRequester createRSocketTcpClient() { private RSocketRequester createRSocketTcpClient() {

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ServletWebServerFactoryTests.java
View File

@@ -40,7 +40,7 @@ public class Jetty10ServletWebServerFactoryTests extends JettyServletWebServerFa
@Test @Test
protected void correctVersionOfJettyUsed() { protected void correctVersionOfJettyUsed() {
String jettyVersion = ErrorHandler.class.getPackage().getImplementationVersion(); String jettyVersion = ErrorHandler.class.getPackage().getImplementationVersion();
assertThat(jettyVersion.startsWith("10.0")); assertThat(jettyVersion).startsWith("10.0");
} }
@Override @Override