Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize JNDI to fix failing Environment test

Browse Source 
Issue: SPR-12223
This commit is contained in:
Phillip Webb
2014-09-20 09:01:16 -07:00
parent c41ea96177
commit 2667956a30
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java
View File

@@ -16,15 +16,17 @@
package org.springframework.web.context.support;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import javax.naming.NamingException;
import org.junit.Test;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.tests.mock.jndi.SimpleNamingContextBuilder;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link StandardServletEnvironment}.
@@ -35,7 +37,9 @@ import org.springframework.core.env.PropertySource;
public class StandardServletEnvironmentTests {
@Test
public void propertySourceOrder() {
public void propertySourceOrder() throws Exception {
SimpleNamingContextBuilder.emptyActivatedContextBuilder();
ConfigurableEnvironment env = new StandardServletEnvironment();
MutablePropertySources sources = env.getPropertySources();