Upgrade to SK-2.0 M2 and SF-5.0 RC1

Fix `JmsMockTests` for wrong mock usage - just `reset()` before testing!
This commit is contained in:
Artem Bilan
2017-05-12 11:04:20 -04:00
parent be0e24aea5
commit e1be51feb1
2 changed files with 4 additions and 2 deletions

View File

@@ -35,6 +35,7 @@ import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -89,6 +90,7 @@ public class JmsMockTests {
@Before
public void setup() throws JMSException {
Mockito.reset(this.mockJmsTemplate);
TextMessage message = mock(TextMessage.class);
when(this.mockJmsTemplate.getMessageConverter()).thenReturn(new SimpleMessageConverter());
when(this.mockJmsTemplate.receiveSelected(anyString())).thenReturn(message);

View File

@@ -217,8 +217,8 @@ subprojects { subproject ->
springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT'
springIntegrationKafkaVersion = '3.0.0.M1'
springIntegrationSplunkVersion = '1.1.0.RELEASE'
springKafkaVersion = '2.0.0.M1'
springVersion = '5.0.0.BUILD-SNAPSHOT'
springKafkaVersion = '2.0.0.M2'
springVersion = '5.0.0.RC1'
springSecurityVersion = '4.2.2.RELEASE'
springWebFlowVersion = '2.3.3.RELEASE'
tilesJspVersion = '2.2.1'