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

SPR-17307: Fix event listener tests

Browse Source 
JIRA: https://jira.spring.io/browse/SPR-17307

The event multicaster now saves singletons in `applicationListeners`
instead of adding the bean name to `applicationListenerBeans`.

**cherry-pick to 5.0.x**

# Conflicts:
#	build.gradle
This commit is contained in:
Gary Russell
2018-10-11 10:49:56 -04:00
committed by Artem Bilan
parent 490ae1b49b
commit 32e221d499
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -154,8 +154,8 @@ subprojects { subproject ->
springSecurityVersion = '5.0.7.RELEASE' springSecurityVersion = '5.0.7.RELEASE'
springSocialTwitterVersion = '1.1.2.RELEASE' springSocialTwitterVersion = '1.1.2.RELEASE'
springRetryVersion = '1.2.2.RELEASE' springRetryVersion = '1.2.2.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.9.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.10.BUILD-SNAPSHOT'
springWsVersion = '3.0.2.RELEASE' springWsVersion = '3.0.3.RELEASE'
tomcatVersion = "8.5.23" tomcatVersion = "8.5.23"
xmlUnitVersion = '1.6' xmlUnitVersion = '1.6'
xstreamVersion = '1.4.10' xstreamVersion = '1.4.10'

14
spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
package org.springframework.integration.event.inbound; package org.springframework.integration.event.inbound;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isOneOf;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@@ -254,9 +256,9 @@ public class ApplicationEventListeningMessageProducerTests {
Class<? extends ApplicationEvent> event = TestUtils.getPropertyValue(entry.getKey(), "eventType.resolved", Class<? extends ApplicationEvent> event = TestUtils.getPropertyValue(entry.getKey(), "eventType.resolved",
Class.class); Class.class);
assertThat(event, Matchers.is(Matchers.isOneOf(ContextRefreshedEvent.class, TestApplicationEvent1.class))); assertThat(event, Matchers.is(Matchers.isOneOf(ContextRefreshedEvent.class, TestApplicationEvent1.class)));
Set<?> listeners = TestUtils.getPropertyValue(entry.getValue(), "applicationListenerBeans", Set.class); Set<?> listeners = TestUtils.getPropertyValue(entry.getValue(), "applicationListeners", Set.class);
assertEquals(1, listeners.size()); assertEquals(1, listeners.size());
assertEquals("testListener", listeners.iterator().next()); assertSame(ctx.getBean("testListener"), listeners.iterator().next());
} }
TestApplicationEvent2 event2 = new TestApplicationEvent2(); TestApplicationEvent2 event2 = new TestApplicationEvent2();
@@ -265,11 +267,11 @@ public class ApplicationEventListeningMessageProducerTests {
for (Map.Entry<?, ?> entry : retrieverCache.entrySet()) { for (Map.Entry<?, ?> entry : retrieverCache.entrySet()) {
Class<?> event = TestUtils.getPropertyValue(entry.getKey(), "eventType.resolved", Class.class); Class<?> event = TestUtils.getPropertyValue(entry.getKey(), "eventType.resolved", Class.class);
if (TestApplicationEvent2.class.isAssignableFrom(event)) { if (TestApplicationEvent2.class.isAssignableFrom(event)) {
Set<?> listeners = TestUtils.getPropertyValue(entry.getValue(), "applicationListenerBeans", Set.class); Set<?> listeners = TestUtils.getPropertyValue(entry.getValue(), "applicationListeners", Set.class);
assertEquals(2, listeners.size()); assertEquals(2, listeners.size());
for (Object listener : listeners) { for (Object listener : listeners) {
assertThat((String) listener, assertThat(listener,
Matchers.is(Matchers.isOneOf("testListenerMessageProducer", "testListener"))); is(isOneOf(ctx.getBean("testListenerMessageProducer"), ctx.getBean("testListener"))));
} }
break; break;
} }