root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix test failing after #99302f

This commit is contained in:
Rossen Stoyanchev 2019-05-23 10:38:08 -04:00
parent 99302fd6bd
commit 5f7541344a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java
View File

@ -16,7 +16,6 @@
package org.springframework.context.config;
import java.io.FileNotFoundException;
import java.util.Calendar;
import java.util.Date;
@ -30,7 +29,9 @@ import org.springframework.context.support.GenericXmlApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.env.MockEnvironment;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
* @author Arjen Poutsma
@ -128,14 +129,14 @@ public class ContextNamespaceHandlerTests {
@Test
public void propertyPlaceholderLocationWithSystemPropertyMissing() {
try {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
new ClassPathXmlApplicationContext(
"contextNamespaceHandlerTests-location-placeholder.xml", getClass());
assertEquals("bar", applicationContext.getBean("foo"));
assertEquals("foo", applicationContext.getBean("bar"));
assertEquals("maps", applicationContext.getBean("spam"));
fail("Should have thrown FatalBeanException");
}
catch (FatalBeanException ex) {
assertTrue(ex.getRootCause() instanceof FileNotFoundException);
Throwable cause = ex.getRootCause();
assertTrue(cause instanceof IllegalArgumentException);
assertEquals("Could not resolve placeholder 'foo' in value \"${foo}\"", cause.getMessage());
}
}