Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for: https://issues.apache.org/jira/browse/AMQ-5004

This commit is contained in:
Timothy Bish 2014-04-30 10:08:28 -04:00
parent 4eb5097f22
commit 8498136f5e
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/bugs/AMQ4914Test.java
View File

@ -26,13 +26,12 @@ import javax.jms.JMSException;
import javax.jms.Message; import javax.jms.Message;
import javax.jms.MessageConsumer; import javax.jms.MessageConsumer;
import javax.jms.MessageProducer; import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session; import javax.jms.Session;
import javax.jms.TextMessage; import javax.jms.TextMessage;
import org.apache.activemq.transport.amqp.AmqpTestSupport; import org.apache.activemq.transport.amqp.AmqpTestSupport;
import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl; import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TestName; import org.junit.rules.TestName;
@ -40,17 +39,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class AMQ4914Test extends AmqpTestSupport { public class AMQ4914Test extends AmqpTestSupport {
@Rule @Rule
public TestName testName = new TestName(); public TestName testName = new TestName();
protected static final Logger LOG = LoggerFactory.getLogger(AMQ4914Test.class); protected static final Logger LOG = LoggerFactory.getLogger(AMQ4914Test.class);
private final static String QUEUE_NAME="queue://ENTMQ476TestQueue";
/**
*
* @param sizeInBytes
* @return
*/
private String createLargeString(int sizeInBytes) { private String createLargeString(int sizeInBytes) {
byte[] base = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0}; byte[] base = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
@ -76,7 +70,6 @@ public class AMQ4914Test extends AmqpTestSupport {
doTestSendLargeMessage(65536 * 4); doTestSendLargeMessage(65536 * 4);
} }
@Ignore("AMQ-5102")
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 5 * 60 * 1000)
public void testSendHugeMessage() throws JMSException { public void testSendHugeMessage() throws JMSException {
doTestSendLargeMessage(1024 * 1024 * 10); doTestSendLargeMessage(1024 * 1024 * 10);
@ -91,7 +84,7 @@ public class AMQ4914Test extends AmqpTestSupport {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
QueueImpl queue = new QueueImpl(QUEUE_NAME); Queue queue = session.createQueue(testName.getMethodName());
MessageProducer producer = session.createProducer(queue); MessageProducer producer = session.createProducer(queue);
TextMessage message = session.createTextMessage(); TextMessage message = session.createTextMessage();
message.setText(payload); message.setText(payload);

2
assembly/pom.xml
View File

@ -426,7 +426,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>proton-j-impl</artifactId> <artifactId>proton-j</artifactId>
<version>${qpid-proton-version}</version> <version>${qpid-proton-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

3
assembly/src/main/descriptors/common-bin.xml
View File

@ -205,9 +205,8 @@
<include>org.jasypt:jasypt-spring3</include> <include>org.jasypt:jasypt-spring3</include>
<include>javax.jmdns:jmdns</include> <include>javax.jmdns:jmdns</include>
<include>org.apache.qpid:proton</include> <include>org.apache.qpid:proton</include>
<include>org.apache.qpid:proton-api</include>
<include>org.apache.qpid:proton-jms</include> <include>org.apache.qpid:proton-jms</include>
<include>org.apache.qpid:proton-j-impl</include> <include>org.apache.qpid:proton-j</include>
<include>${pom.groupId}:activemq-runtime-config</include> <include>${pom.groupId}:activemq-runtime-config</include>
<include>org.jvnet.jaxb2_commons:jaxb2-basics-runtime</include> <include>org.jvnet.jaxb2_commons:jaxb2-basics-runtime</include>

2
pom.xml
View File

@ -100,7 +100,7 @@
<paho-version>0.4.0</paho-version> <paho-version>0.4.0</paho-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version> <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.5</zookeeper-version> <zookeeper-version>3.4.5</zookeeper-version>
<qpid-proton-version>0.6</qpid-proton-version> <qpid-proton-version>0.7</qpid-proton-version>
<qpid-jms-version>0.26</qpid-jms-version> <qpid-jms-version>0.26</qpid-jms-version>
<regexp-version>1.3</regexp-version> <regexp-version>1.3</regexp-version>
<rome-version>1.0</rome-version> <rome-version>1.0</rome-version>