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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2016-08-30 23:57:11 +02:00
parent 03609c1518
commit 4ef428de28
5 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
View File

@@ -77,7 +77,7 @@ public class AnnotationDrivenEventListenerTests {
private EventCollector eventCollector;
private CountDownLatch countDownLatch; // 1 call by default
private CountDownLatch countDownLatch; // 1 call by default
@After
@@ -93,16 +93,23 @@ public class AnnotationDrivenEventListenerTests {
load(TestEventListener.class);
TestEvent event = new TestEvent(this, "test");
TestEventListener listener = this.context.getBean(TestEventListener.class);
this.eventCollector.assertNoEventReceived(listener);
this.context.publishEvent(event);
this.eventCollector.assertEvent(listener, event);
this.eventCollector.assertTotalEventsCount(1);
this.eventCollector.clear();
this.context.publishEvent(event);
this.eventCollector.assertEvent(listener, event);
this.eventCollector.assertTotalEventsCount(1);
}
@Test
public void simpleEventXmlConfig() {
this.context = new ClassPathXmlApplicationContext(
"org/springframework/context/event/simple-event-configuration.xml");
TestEvent event = new TestEvent(this, "test");
TestEventListener listener = this.context.getBean(TestEventListener.class);
this.eventCollector = getEventCollector(this.context);
@@ -116,7 +123,6 @@ public class AnnotationDrivenEventListenerTests {
@Test
public void metaAnnotationIsDiscovered() {
load(MetaAnnotationListenerTestBean.class);
MetaAnnotationListenerTestBean bean = this.context.getBean(MetaAnnotationListenerTestBean.class);
this.eventCollector.assertNoEventReceived(bean);

14
spring-context/src/test/java/org/springframework/context/event/test/EventCollector.java
View File

@@ -30,6 +30,7 @@ import static org.junit.Assert.*;
* Test utility to collect and assert events.
*
* @author Stephane Nicoll
* @author Juergen Hoeller
*/
@Component
public class EventCollector {
@@ -73,7 +74,7 @@ public class EventCollector {
*/
public void assertEvent(String listenerId, Object... events) {
List<Object> actual = this.content.getOrDefault(listenerId, Collections.emptyList());
assertEquals("wrong number of events", events.length, actual.size());
assertEquals("Wrong number of events", events.length, actual.size());
for (int i = 0; i < events.length; i++) {
assertEquals("Wrong event at index " + i, events[i], actual.get(i));
}
@@ -97,8 +98,15 @@ public class EventCollector {
for (Map.Entry<String, List<Object>> entry : this.content.entrySet()) {
actual += entry.getValue().size();
}
assertEquals("Wrong number of total events (" + this.content.size() + ") " +
"registered listener(s)", number, actual);
assertEquals("Wrong number of total events (" + this.content.size() +
") registered listener(s)", number, actual);
}
/**
* Clear the collected events, allowing for reuse of the collector.
*/
public void clear() {
this.content.clear();
}
}