From 3fe09d70cde90a592a2934315f084e4a93324248 Mon Sep 17 00:00:00 2001
From: Rob Harrop <rharrop@vmware.com>
Date: Tue, 8 Sep 2009 16:29:43 +0000
Subject: [PATCH] [SPR-6025] added SystemPropertyUtilsTests

---
 .../util/SystemPropertyUtilsTests.java        | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 org.springframework.core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java

diff --git a/org.springframework.core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java
new file mode 100644
index 00000000000..e5ad34b6b1c
--- /dev/null
+++ b/org.springframework.core/src/test/java/org/springframework/util/SystemPropertyUtilsTests.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2009 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.util;
+
+import java.util.Map;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+/** @author Rob Harrop */
+public class SystemPropertyUtilsTests {
+
+	@Test
+	public void testReplaceFromSystemProperty() {
+		System.setProperty("test.prop", "bar");
+		String resolved = SystemPropertyUtils.resolvePlaceholders("${test.prop}");
+		assertEquals("bar", resolved);
+	}
+
+	@Test
+	public void testReplaceFromEnv() {
+		Map<String,String> env = System.getenv();
+		if(env.containsKey("PATH")) {
+			String text = "${PATH}";
+			assertEquals(env.get("PATH"), SystemPropertyUtils.resolvePlaceholders(text));
+		}
+	}
+}