From dcfe2673fd99ff60400ead9c83e338c358e2d1b3 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 14 Sep 2016 16:48:41 -0700
Subject: [PATCH] Fix failing test following Tomcat upgrade

Tomcat 8.5.5 has change the default value of `validationInterval` to
3000. See https://bz.apache.org/bugzilla/show_bug.cgi?id=59923 for
details.

See gh-6703
See gh-6657
---
 .../autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
index ebc28c61c8..83f962b827 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
@@ -126,7 +126,7 @@ public class TomcatDataSourceConfigurationTests {
 		assertThat(ds.getTimeBetweenEvictionRunsMillis()).isEqualTo(5000);
 		assertThat(ds.getMinEvictableIdleTimeMillis()).isEqualTo(60000);
 		assertThat(ds.getMaxWait()).isEqualTo(30000);
-		assertThat(ds.getValidationInterval()).isEqualTo(30000L);
+		assertThat(ds.getValidationInterval()).isEqualTo(3000L);
 	}
 
 	@SuppressWarnings("unchecked")