Add test for CacheConfigFileCondition

CacheConfigFileCondition was not properly tested, leading to various
potential source of errors (that last one being gh-3233). This condition
is now tested properly.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigFileCondition.java

@@ -41,7 +41,7 @@ abstract class CacheConfigFileCondition extends SpringBootCondition {
 	public CacheConfigFileCondition(String name, String configPrefix,
 			String... resourceLocations) {
 		this.name = name;
-		this.configPrefix = configPrefix;
+		this.configPrefix = (configPrefix.endsWith(".") ? configPrefix : configPrefix + ".");
 		this.resourceLocations = resourceLocations;
 	}
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheConfigFileConditionTests.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2012-2015 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.autoconfigure.cache;
+
+import org.junit.After;
+import org.junit.Test;
+
+import org.springframework.boot.test.EnvironmentTestUtils;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test for {@link CacheConfigFileCondition}.
+ *
+ * @author Stephane Nicoll
+ */
+public class CacheConfigFileConditionTests {
+
+	private ConfigurableApplicationContext context;
+
+	@After
+	public void tearDown() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void defaultFileAndNoExplicitKey() {
+		load(DefaultFileConfiguration.class);
+		assertTrue(this.context.containsBean("foo"));
+	}
+
+	@Test
+	public void noDefaultFileAndNoExplicitKey() {
+		load(NoDefaultFileConfiguration.class);
+		assertFalse(this.context.containsBean("foo"));
+	}
+
+	@Test
+	public void noDefaultFileAndExplicitKeyToResource() {
+		load(NoDefaultFileConfiguration.class, "spring.cache.test.config=ehcache.xml");
+		assertTrue(this.context.containsBean("foo"));
+	}
+
+	private void load(Class<?> config,
+			String... environment) {
+		AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
+		EnvironmentTestUtils.addEnvironment(applicationContext, environment);
+		applicationContext.register(config);
+		applicationContext.refresh();
+		this.context = applicationContext;
+	}
+
+
+	@Configuration
+	@Conditional(CacheConfigFileDefaultFileCondition.class)
+	static class DefaultFileConfiguration {
+
+		@Bean
+		public String foo() {
+			return "foo";
+		}
+	}
+
+	@Configuration
+	@Conditional(CacheConfigFileNoDefaultFileCondition.class)
+	static class NoDefaultFileConfiguration {
+
+		@Bean
+		public String foo() {
+			return "foo";
+		}
+	}
+
+	private static class CacheConfigFileDefaultFileCondition extends CacheConfigFileCondition {
+
+		public CacheConfigFileDefaultFileCondition() {
+			super("test", "spring.cache.test.", "classpath:/ehcache.xml");
+		}
+	}
+
+	private static class CacheConfigFileNoDefaultFileCondition extends CacheConfigFileCondition {
+		public CacheConfigFileNoDefaultFileCondition() {
+			super("test", "spring.cache.test", "classpath:/this-cache-file-does-not-exist.xml");
+		}
+
+	}
+}