Browse Source

Merge branch '1.4.x' into 1.5.x

pull/7225/head
Stephane Nicoll 9 years ago
parent
commit
ae4dd0d17e
  1. 1
      spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationEarlyInitializationTests.java
  2. 1
      spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/JvmUtilsTests.java
  3. 3
      spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
  4. 3
      spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
  5. 1
      spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java

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

@ -146,7 +146,6 @@ public class SecurityFilterAutoConfigurationEarlyInitializationTests { @@ -146,7 +146,6 @@ public class SecurityFilterAutoConfigurationEarlyInitializationTests {
@RequestMapping("/")
public void convert() {
System.out.println("Hello");
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

@ -33,7 +33,6 @@ public class JvmUtilsTests { @@ -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();
}

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

@ -673,9 +673,6 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { @@ -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]);

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

@ -384,9 +384,6 @@ public class TomcatEmbeddedServletContainerFactoryTests @@ -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]);

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

@ -144,7 +144,6 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { @@ -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…
Cancel
Save