Commit ae4dd0d1 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.4.x' into 1.5.x

parents a56bf44b a638dcd5
...@@ -146,7 +146,6 @@ public class SecurityFilterAutoConfigurationEarlyInitializationTests { ...@@ -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);
} }
......
...@@ -33,7 +33,6 @@ public class JvmUtilsTests { ...@@ -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();
} }
......
...@@ -673,9 +673,6 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { ...@@ -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]);
......
...@@ -384,9 +384,6 @@ public class TomcatEmbeddedServletContainerFactoryTests ...@@ -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]);
......
...@@ -144,7 +144,6 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment