SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test broken by change in commons

Browse Source
This commit is contained in:
Dave Syer
2015-09-25 09:43:20 +01:00
parent 63e90d7d27
commit da2b20c8be
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeEnvironmentRepositoryTests.java
View File

@@ -15,12 +15,13 @@
*/
package org.springframework.cloud.config.server;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.config.environment.Environment;
import org.springframework.cloud.config.server.NativeEnvironmentRepository;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.context.ConfigurableApplicationContext;
/**
* @author Dave Syer
@@ -28,40 +29,47 @@ import org.springframework.core.env.StandardEnvironment;
*/
public class NativeEnvironmentRepositoryTests {
private NativeEnvironmentRepository repository = new NativeEnvironmentRepository(
new StandardEnvironment());
private NativeEnvironmentRepository repository;
@Before
public void init() {
ConfigurableApplicationContext context = new SpringApplicationBuilder(
NativeEnvironmentRepositoryTests.class).web(false).run();
this.repository = new NativeEnvironmentRepository(context.getEnvironment());
context.close();
}
@Test
public void vanilla() {
Environment environment = repository.findOne("foo", "development", "master");
Environment environment = this.repository.findOne("foo", "development", "master");
assertEquals(2, environment.getPropertySources().size());
}
@Test
public void ignoresExistingProfile() {
System.setProperty("spring.profiles.active", "cloud");
Environment environment = repository.findOne("foo", "main", "master");
Environment environment = this.repository.findOne("foo", "main", "master");
assertEquals(1, environment.getPropertySources().size());
}
@Test
public void prefixed() {
repository.setSearchLocations("classpath:/test");
Environment environment = repository.findOne("foo", "development", "master");
this.repository.setSearchLocations("classpath:/test");
Environment environment = this.repository.findOne("foo", "development", "master");
assertEquals(2, environment.getPropertySources().size());
}
@Test
public void prefixedWithFile() {
repository.setSearchLocations("file:./src/test/resources/test");
Environment environment = repository.findOne("foo", "development", "master");
this.repository.setSearchLocations("file:./src/test/resources/test");
Environment environment = this.repository.findOne("foo", "development", "master");
assertEquals(2, environment.getPropertySources().size());
}
@Test
public void labelled() {
repository.setSearchLocations("classpath:/test");
Environment environment = repository.findOne("foo", "development", "dev");
this.repository.setSearchLocations("classpath:/test");
Environment environment = this.repository.findOne("foo", "development", "dev");
assertEquals(3, environment.getPropertySources().size());
// position 1 because it has higher precendence than anything except the
// foo-development.properties