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

Fix JMS tests for ActiveMQ-5.13.0

Browse Source
This commit is contained in:
Artem Bilan
2016-01-07 18:32:00 -05:00
parent ada3f00aa9
commit 6beaa2e89a
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

8
spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ import org.apache.activemq.command.ActiveMQTopic;
import org.apache.commons.logging.Log;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -78,6 +79,11 @@ public class SubscribableJmsChannelTests {
private Destination queue;
@BeforeClass
public static void beforeClass() {
System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*");
}
@Before
public void setup() throws Exception {
ActiveMQConnectionFactory targetConnectionFactory = new ActiveMQConnectionFactory();

8
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.jms.JMSException;
import org.apache.log4j.Level;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -76,6 +77,11 @@ public class ExtractRequestReplyPayloadTests {
@Autowired
ChannelPublishingJmsMessageListener inboundGateway;
@BeforeClass
public static void setup() {
System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*");
}
@Test
public void testOutboundInboundDefault() {
this.outboundGateway.setExtractRequestPayload(true);

8
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -44,6 +45,11 @@ import org.springframework.jms.listener.AbstractMessageListenerContainer;
*/
public class JmsChannelHistoryTests {
@BeforeClass
public static void setup() {
System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*");
}
@SuppressWarnings("rawtypes")
@Test
public void testMessageHistory() throws Exception{