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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2016-06-08 09:27:40 -07:00
parent 6a291777da
commit 5ab072be9c
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java
View File

@@ -41,6 +41,8 @@ import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.li
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
/** /**
* Tests for {@link AutoConfigureRestDocs}.
*
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@@ -61,7 +63,7 @@ public class RestDocsAutoConfigurationAdvancedConfigurationIntegrationTests {
@Test @Test
public void snippetGeneration() throws Exception { public void snippetGeneration() throws Exception {
this.document.snippets(links( this.document.document(links(
linkWithRel("self").description("Canonical location of this resource"))); linkWithRel("self").description("Canonical location of this resource")));
this.mvc.perform(get("/")); this.mvc.perform(get("/"));
File defaultSnippetsDir = new File( File defaultSnippetsDir = new File(

19
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@@ -682,20 +682,17 @@ public class SpringApplicationTests {
application.setApplicationContextClass(SpyApplicationContext.class); application.setApplicationContextClass(SpyApplicationContext.class);
final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<ApplicationEvent>(); final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<ApplicationEvent>();
application.addListeners(new ApplicationListener<ApplicationEvent>() { application.addListeners(new ApplicationListener<ApplicationEvent>() {
@Override @Override
public void onApplicationEvent(ApplicationEvent event) { public void onApplicationEvent(ApplicationEvent event) {
events.add(event); events.add(event);
} }
}); });
this.context = application.run(); this.context = application.run();
assertThat(events).hasAtLeastOneElementOfType(ApplicationPreparedEvent.class); assertThat(events).hasAtLeastOneElementOfType(ApplicationPreparedEvent.class);
assertThat(events).hasAtLeastOneElementOfType(ContextRefreshedEvent.class); assertThat(events).hasAtLeastOneElementOfType(ContextRefreshedEvent.class);
verifyTestListenerEvents();
ApplicationListener<ApplicationEvent> listener = this.context.getBean(
"testApplicationListener", ApplicationListener.class);
verify(listener).onApplicationEvent(argThat(isA(ContextRefreshedEvent.class)));
verify(listener).onApplicationEvent(argThat(isA(ApplicationReadyEvent.class)));
verifyNoMoreInteractions(listener);
} }
@Test @Test
@@ -705,17 +702,23 @@ public class SpringApplicationTests {
application.setApplicationContextClass(SpyApplicationContext.class); application.setApplicationContextClass(SpyApplicationContext.class);
final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<ApplicationEvent>(); final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<ApplicationEvent>();
application.addListeners(new ApplicationListener<ApplicationEvent>() { application.addListeners(new ApplicationListener<ApplicationEvent>() {
@Override @Override
public void onApplicationEvent(ApplicationEvent event) { public void onApplicationEvent(ApplicationEvent event) {
events.add(event); events.add(event);
} }
}); });
this.context = application.run(); this.context = application.run();
assertThat(events).hasAtLeastOneElementOfType(ApplicationPreparedEvent.class); assertThat(events).hasAtLeastOneElementOfType(ApplicationPreparedEvent.class);
assertThat(events).hasAtLeastOneElementOfType(ContextRefreshedEvent.class); assertThat(events).hasAtLeastOneElementOfType(ContextRefreshedEvent.class);
verifyTestListenerEvents();
}
ApplicationListener<ApplicationEvent> listener = this.context.getBean( @SuppressWarnings("unchecked")
"testApplicationListener", ApplicationListener.class); private void verifyTestListenerEvents() {
ApplicationListener<ApplicationEvent> listener = this.context
.getBean("testApplicationListener", ApplicationListener.class);
verify(listener).onApplicationEvent(argThat(isA(ContextRefreshedEvent.class))); verify(listener).onApplicationEvent(argThat(isA(ContextRefreshedEvent.class)));
verify(listener).onApplicationEvent(argThat(isA(ApplicationReadyEvent.class))); verify(listener).onApplicationEvent(argThat(isA(ApplicationReadyEvent.class)));
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);