mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
ae4dd0d17e
@ -146,7 +146,6 @@ public class SecurityFilterAutoConfigurationEarlyInitializationTests {
|
||||
|
||||
@RequestMapping("/")
|
||||
public void convert() {
|
||||
System.out.println("Hello");
|
||||
this.conversionService.convert(new SourceType(), DestinationType.class);
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,6 @@ public class JvmUtilsTests {
|
||||
@Test
|
||||
public void getToolsJar() throws Exception {
|
||||
URL jarUrl = JvmUtils.getToolsJarUrl();
|
||||
// System.out.println(jarUrl);
|
||||
assertThat(jarUrl.toString()).endsWith(".jar");
|
||||
assertThat(new File(jarUrl.toURI()).exists()).isTrue();
|
||||
}
|
||||
|
@ -673,9 +673,6 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
|
||||
.getEmbeddedServletContainer(sessionServletRegistration());
|
||||
this.container.start();
|
||||
String s3 = getResponse(getLocalUrl("/session"));
|
||||
System.out.println(s1);
|
||||
System.out.println(s2);
|
||||
System.out.println(s3);
|
||||
String message = "Session error s1=" + s1 + " s2=" + s2 + " s3=" + s3;
|
||||
assertThat(s2.split(":")[0]).as(message).isEqualTo(s1.split(":")[1]);
|
||||
assertThat(s3.split(":")[0]).as(message).isEqualTo(s2.split(":")[1]);
|
||||
|
@ -384,9 +384,6 @@ public class TomcatEmbeddedServletContainerFactoryTests
|
||||
.getEmbeddedServletContainer(sessionServletRegistration());
|
||||
this.container.start();
|
||||
String s3 = getResponse(getLocalUrl("/session"));
|
||||
System.out.println(s1);
|
||||
System.out.println(s2);
|
||||
System.out.println(s3);
|
||||
String message = "Session error s1=" + s1 + " s2=" + s2 + " s3=" + s3;
|
||||
assertThat(s2.split(":")[0]).as(message).isEqualTo(s1.split(":")[1]);
|
||||
assertThat(s3.split(":")[0]).as(message).isNotEqualTo(s2.split(":")[1]);
|
||||
|
@ -144,7 +144,6 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests {
|
||||
private FailureAnalysis performAnalysis(Class<?> configuration) {
|
||||
FailureAnalysis analysis = this.analyzer.analyze(createFailure(configuration));
|
||||
assertThat(analysis).isNotNull();
|
||||
System.out.println(analysis.getDescription());
|
||||
return analysis;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user