From 7216a8fa3860ed67ec0cc0a074b6702d1a77dab5 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 13 Dec 2017 14:22:57 +0100
Subject: [PATCH] Polish

See gh-11341
---
 .../core/AutoConfigureCache.java              |  7 +-
 ...hExistingCacheManagerIntegrationTests.java | 64 +++++++++++++++++++
 2 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java

diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCache.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCache.java
index 2f46fe1c9ab..a8c9d46206f 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCache.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCache.java
@@ -26,12 +26,13 @@ import java.lang.annotation.Target;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.cache.CacheType;
 import org.springframework.boot.test.autoconfigure.properties.PropertyMapping;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.support.NoOpCacheManager;
 
 /**
- * Annotation that can be applied to a test class to enable and configure
- * auto-configuration of caching. By default this annotation installs a
- * {@link NoOpCacheManager}.
+ * Annotation that can be applied to a test class to configure a test
+ * {@link CacheManager} if none has been defined yet. By default this
+ * annotation installs a {@link NoOpCacheManager}.
  *
  * @author Phillip Webb
  * @since 1.4.0
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java
new file mode 100644
index 00000000000..fdb8ef14f92
--- /dev/null
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2012-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test.autoconfigure.core;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link AutoConfigureCache} with an existing {@link CacheManager}.
+ *
+ * @author Stephane Nicoll
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@AutoConfigureCache
+public class AutoConfigureCacheWithExistingCacheManagerIntegrationTests {
+
+	@Autowired
+	private ApplicationContext applicationContext;
+
+	@Test
+	public void shouldNotReplaceExistingCacheManager() {
+		CacheManager bean = this.applicationContext.getBean(CacheManager.class);
+		assertThat(bean).isInstanceOf(ConcurrentMapCacheManager.class);
+	}
+
+	@Configuration
+	@EnableCaching
+	public static class Config {
+
+		@Bean
+		public ConcurrentMapCacheManager existingCacheManager() {
+			return new ConcurrentMapCacheManager();
+		}
+
+	}
+
+}