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

Fix build failure

This commit is contained in:
Stephane Nicoll 2016-06-20 14:40:57 +02:00
parent f28e3d54c5
commit 97874a0749
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot/src/test/java/org/springframework/boot/context/scan/TestEntityScanTests.java
View File

@ -28,6 +28,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AnnotationConfigurationException; import org.springframework.core.annotation.AnnotationConfigurationException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.Matchers.containsString;
/** /**
* Tests for {@link TestEntityScan}. * Tests for {@link TestEntityScan}.
@ -77,9 +79,11 @@ public class TestEntityScanTests {
@Test @Test
public void valueAndBasePackagesThrows() throws Exception { public void valueAndBasePackagesThrows() throws Exception {
this.thrown.expect(AnnotationConfigurationException.class); this.thrown.expect(AnnotationConfigurationException.class);
this.thrown.expectMessage("attribute 'value' and its alias 'basePackages' are declared"); this.thrown.expectMessage(allOf(
this.thrown.expectMessage("com.mycorp.entity"); containsString("'value'"),
this.thrown.expectMessage("com.mycorp"); containsString("'basePackages'"),
containsString("com.mycorp.entity"),
containsString("com.mycorp")));
new AnnotationConfigApplicationContext(ValueAndBasePackages.class); new AnnotationConfigApplicationContext(ValueAndBasePackages.class);
} }

8
spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java
View File

@ -26,6 +26,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AnnotationConfigurationException; import org.springframework.core.annotation.AnnotationConfigurationException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.Matchers.containsString;
/** /**
* Tests for {@link ServletComponentScanRegistrar} * Tests for {@link ServletComponentScanRegistrar}
@ -76,7 +78,11 @@ public class ServletComponentScanRegistrarTests {
@Test @Test
public void packagesConfiguredWithBothValueAndBasePackages() { public void packagesConfiguredWithBothValueAndBasePackages() {
this.thrown.expect(AnnotationConfigurationException.class); this.thrown.expect(AnnotationConfigurationException.class);
this.thrown.expectMessage("attribute 'value' and its alias 'basePackages' are declared"); this.thrown.expectMessage(allOf(
containsString("'value'"),
containsString("'basePackages'"),
containsString("com.example.foo"),
containsString("com.example.bar")));
new AnnotationConfigApplicationContext(ValueAndBasePackages.class); new AnnotationConfigApplicationContext(ValueAndBasePackages.class);
} }