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

Be more lenient about expected exceptions

This commit is contained in:
Phillip Webb 2015-06-29 18:35:22 -07:00
parent ada92fe020
commit 8d948dfa6c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java
View File

@ -24,6 +24,7 @@ import org.junit.After;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.UnsatisfiedDependencyException; import org.springframework.beans.factory.UnsatisfiedDependencyException;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
@ -48,6 +49,7 @@ import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/** /**
* Tests for {@link MongoDataAutoConfiguration}. * Tests for {@link MongoDataAutoConfiguration}.
@ -125,8 +127,17 @@ public class MongoDataAutoConfigurationTests {
@Test @Test
public void interfaceFieldNamingStrategy() { public void interfaceFieldNamingStrategy() {
this.thrown.expect(UnsatisfiedDependencyException.class); try {
testFieldNamingStrategy(FieldNamingStrategy.class.getName(), null); testFieldNamingStrategy(FieldNamingStrategy.class.getName(), null);
fail("Create FieldNamingStrategy interface should fail");
}
// We seem to have an inconsistent exception, accept either
catch (UnsatisfiedDependencyException ex) {
// Expected
}
catch (BeanCreationException ex) {
// Expected
}
} }
public void testFieldNamingStrategy(String strategy, public void testFieldNamingStrategy(String strategy,