From 43661ededbc1ad0070fe67ecab7a2a239822f19c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 18 Mar 2016 15:04:14 +0100
Subject: [PATCH] Verify inlined props override files in @TestPropertySource

This commit introduces a test to demonstrate that inlined properties
override properties loaded from Properties files in
@TestPropertySource.

Issue: SPR-14068
---
 ...ropertiesFilesTestPropertySourceTests.java | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests.java

diff --git a/spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests.java b/spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests.java
new file mode 100644
index 00000000000..c50f7ba65c7
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2002-2016 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.test.context.env;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.env.Environment;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.*;
+
+/**
+ * Integration tests for {@link TestPropertySource @TestPropertySource} support with
+ * inlined properties that overrides properties files.
+ *
+ * @author Sam Brannen
+ * @since 4.3
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@TestPropertySource(locations = "explicit.properties", properties = "explicit = inlined")
+public class InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests {
+
+	@Autowired
+	Environment env;
+
+	@Value("${explicit}")
+	String explicit;
+
+
+	@Test
+	public void inlinedPropertyOverridesValueFromPropertiesFile() {
+		assertEquals("inlined", env.getProperty("explicit"));
+		assertEquals("inlined", this.explicit);
+	}
+
+
+	@Configuration
+	static class Config {
+
+		@Bean
+		public static PropertySourcesPlaceholderConfigurer placeholderConfigurer() {
+			return new PropertySourcesPlaceholderConfigurer();
+		}
+	}
+
+}