root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2016-10-24 18:08:23 +02:00
parent a56bf44b39 a638dcd51b
commit ae4dd0d17e
5 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationEarlyInitializationTests.java
View File

@ -146,7 +146,6 @@ public class SecurityFilterAutoConfigurationEarlyInitializationTests {
@RequestMapping("/") @RequestMapping("/")
public void convert() { public void convert() {
System.out.println("Hello");
this.conversionService.convert(new SourceType(), DestinationType.class); this.conversionService.convert(new SourceType(), DestinationType.class);
} }

1
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/JvmUtilsTests.java
View File

@ -33,7 +33,6 @@ public class JvmUtilsTests {
@Test @Test
public void getToolsJar() throws Exception { public void getToolsJar() throws Exception {
URL jarUrl = JvmUtils.getToolsJarUrl(); URL jarUrl = JvmUtils.getToolsJarUrl();
// System.out.println(jarUrl);
assertThat(jarUrl.toString()).endsWith(".jar"); assertThat(jarUrl.toString()).endsWith(".jar");
assertThat(new File(jarUrl.toURI()).exists()).isTrue(); assertThat(new File(jarUrl.toURI()).exists()).isTrue();
} }

3
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -673,9 +673,6 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
.getEmbeddedServletContainer(sessionServletRegistration()); .getEmbeddedServletContainer(sessionServletRegistration());
this.container.start(); this.container.start();
String s3 = getResponse(getLocalUrl("/session")); 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; String message = "Session error s1=" + s1 + " s2=" + s2 + " s3=" + s3;
assertThat(s2.split(":")[0]).as(message).isEqualTo(s1.split(":")[1]); assertThat(s2.split(":")[0]).as(message).isEqualTo(s1.split(":")[1]);
assertThat(s3.split(":")[0]).as(message).isEqualTo(s2.split(":")[1]); assertThat(s3.split(":")[0]).as(message).isEqualTo(s2.split(":")[1]);

3
spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View File

@ -384,9 +384,6 @@ public class TomcatEmbeddedServletContainerFactoryTests
.getEmbeddedServletContainer(sessionServletRegistration()); .getEmbeddedServletContainer(sessionServletRegistration());
this.container.start(); this.container.start();
String s3 = getResponse(getLocalUrl("/session")); 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; String message = "Session error s1=" + s1 + " s2=" + s2 + " s3=" + s3;
assertThat(s2.split(":")[0]).as(message).isEqualTo(s1.split(":")[1]); assertThat(s2.split(":")[0]).as(message).isEqualTo(s1.split(":")[1]);
assertThat(s3.split(":")[0]).as(message).isNotEqualTo(s2.split(":")[1]); assertThat(s3.split(":")[0]).as(message).isNotEqualTo(s2.split(":")[1]);

1
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
View File

@ -144,7 +144,6 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests {
private FailureAnalysis performAnalysis(Class<?> configuration) { private FailureAnalysis performAnalysis(Class<?> configuration) {
FailureAnalysis analysis = this.analyzer.analyze(createFailure(configuration)); FailureAnalysis analysis = this.analyzer.analyze(createFailure(configuration));
assertThat(analysis).isNotNull(); assertThat(analysis).isNotNull();
System.out.println(analysis.getDescription());
return analysis; return analysis;
} }