Consolidate Environment tests

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4332 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.core/src/test/java/org/springframework/core/env/DefaultEnvironmentTests.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2011 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.core.env;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class DefaultEnvironmentTests {
-
-	@Test
-	public void propertySourceOrder() {
-		ConfigurableEnvironment env = new DefaultEnvironment();
-		MutablePropertySources sources = env.getPropertySources();
-		assertThat(sources.precedenceOf(PropertySource.named(DefaultEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)), equalTo(0));
-		assertThat(sources.precedenceOf(PropertySource.named(DefaultEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME)), equalTo(1));
-		assertThat(sources.size(), is(2));
-	}
-}

org.springframework.core/src/test/java/org/springframework/core/env/EnvironmentTests.java

@@ -61,6 +61,15 @@ public class EnvironmentTests {
 
 	private ConfigurableEnvironment environment = new DefaultEnvironment();
 
+	@Test
+	public void propertySourceOrder() {
+		ConfigurableEnvironment env = new DefaultEnvironment();
+		MutablePropertySources sources = env.getPropertySources();
+		assertThat(sources.precedenceOf(PropertySource.named(DefaultEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)), equalTo(0));
+		assertThat(sources.precedenceOf(PropertySource.named(DefaultEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME)), equalTo(1));
+		assertThat(sources.size(), is(2));
+	}
+
 	@Test
 	public void activeProfiles() {
 		assertThat(environment.getActiveProfiles().length, is(0));