You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/06/02 22:53:50 UTC
svn commit: r1683186 [5/5] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upg...
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java Tue Jun 2 20:53:49 2015
@@ -58,42 +58,42 @@ public class QueueMessageDurabilityTest
Map<String,Object> arguments = new HashMap<>();
arguments.put(QPID_MESSAGE_DURABILITY, MessageDurability.ALWAYS.name());
- amqSession.createQueue(new AMQShortString(DURABLE_ALWAYS_PERSIST_NAME), false, true, false, arguments);
+ amqSession.createQueue(DURABLE_ALWAYS_PERSIST_NAME, false, true, false, arguments);
arguments = new HashMap<>();
arguments.put(QPID_MESSAGE_DURABILITY, MessageDurability.NEVER.name());
- amqSession.createQueue(new AMQShortString(DURABLE_NEVER_PERSIST_NAME), false, true, false, arguments);
+ amqSession.createQueue(DURABLE_NEVER_PERSIST_NAME, false, true, false, arguments);
arguments = new HashMap<>();
arguments.put(QPID_MESSAGE_DURABILITY, MessageDurability.DEFAULT.name());
- amqSession.createQueue(new AMQShortString(DURABLE_DEFAULT_PERSIST_NAME), false, true, false, arguments);
+ amqSession.createQueue(DURABLE_DEFAULT_PERSIST_NAME, false, true, false, arguments);
arguments = new HashMap<>();
arguments.put(QPID_MESSAGE_DURABILITY,MessageDurability.ALWAYS.name());
- amqSession.createQueue(new AMQShortString(NONDURABLE_ALWAYS_PERSIST_NAME), false, false, false, arguments);
+ amqSession.createQueue(NONDURABLE_ALWAYS_PERSIST_NAME, false, false, false, arguments);
- amqSession.bindQueue(AMQShortString.valueOf(DURABLE_ALWAYS_PERSIST_NAME),
- AMQShortString.valueOf("Y.*.*.*"),
+ amqSession.bindQueue(DURABLE_ALWAYS_PERSIST_NAME,
+ "Y.*.*.*",
null,
- AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME),
+ ExchangeDefaults.TOPIC_EXCHANGE_NAME,
null);
- amqSession.bindQueue(AMQShortString.valueOf(DURABLE_NEVER_PERSIST_NAME),
- AMQShortString.valueOf("*.Y.*.*"),
+ amqSession.bindQueue(DURABLE_NEVER_PERSIST_NAME,
+ "*.Y.*.*",
null,
- AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME),
+ ExchangeDefaults.TOPIC_EXCHANGE_NAME,
null);
- amqSession.bindQueue(AMQShortString.valueOf(DURABLE_DEFAULT_PERSIST_NAME),
- AMQShortString.valueOf("*.*.Y.*"),
+ amqSession.bindQueue(DURABLE_DEFAULT_PERSIST_NAME,
+ "*.*.Y.*",
null,
- AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME),
+ ExchangeDefaults.TOPIC_EXCHANGE_NAME,
null);
- amqSession.bindQueue(AMQShortString.valueOf(NONDURABLE_ALWAYS_PERSIST_NAME),
- AMQShortString.valueOf("*.*.*.Y"),
+ amqSession.bindQueue(NONDURABLE_ALWAYS_PERSIST_NAME,
+ "*.*.*.Y",
null,
- AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME),
+ ExchangeDefaults.TOPIC_EXCHANGE_NAME,
null);
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java Tue Jun 2 20:53:49 2015
@@ -339,7 +339,7 @@ public class SortedQueueTest extends Qpi
{
final Map<String, Object> arguments = new HashMap<String, Object>();
arguments.put(QueueArgumentsConverter.QPID_QUEUE_SORT_KEY, TEST_SORT_KEY);
- ((AMQSession<?,?>) _producerSession).createQueue(new AMQShortString(getTestQueueName()), false, true, false, arguments);
+ ((AMQSession<?,?>) _producerSession).createQueue(getTestQueueName(), false, true, false, arguments);
final Queue queue = new AMQQueue("amq.direct", getTestQueueName());
((AMQSession<?,?>) _producerSession).declareAndBind((AMQDestination) queue);
return queue;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java Tue Jun 2 20:53:49 2015
@@ -51,7 +51,7 @@ public class ExhaustiveACLTest extends A
Connection conn = getConnection(vhost, user, "guest");
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
conn.start();
- ((AMQSession<?, ?>) sess).createQueue(new AMQShortString(name), autoDelete, durable, false);
+ ((AMQSession<?, ?>) sess).createQueue(name, autoDelete, durable, false);
sess.commit();
conn.close();
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java Tue Jun 2 20:53:49 2015
@@ -175,7 +175,7 @@ public class StatisticsReportingTest ext
_queue = new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, _queueName);
if (!((AMQSession<?,?>) session).isQueueBound((AMQDestination) _queue))
{
- ((AMQSession<?,?>) session).createQueue(new AMQShortString(_queueName), false, true, false, null);
+ ((AMQSession<?,?>) session).createQueue(_queueName, false, true, false, null);
((AMQSession<?,?>) session).declareAndBind((AMQDestination) new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, _queueName));
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java Tue Jun 2 20:53:49 2015
@@ -170,7 +170,7 @@ public class QueueManagementTest extends
{
String queueName = getTestQueueName();
Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION);
- ((AMQSession<?, ?>)_session).createQueue(AMQShortString.valueOf(queueName), false, true, false, arguments);
+ ((AMQSession<?, ?>)_session).createQueue(queueName, false, true, false, arguments);
final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
assertEquals(TEST_QUEUE_DESCRIPTION, managedQueue.getDescription());
@@ -184,7 +184,7 @@ public class QueueManagementTest extends
String queueName = getTestQueueName();
Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION);
- ((AMQSession<?, ?>)_session).createQueue(AMQShortString.valueOf(queueName), false, true, false, arguments);
+ ((AMQSession<?, ?>)_session).createQueue(queueName, false, true, false, arguments);
ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
assertEquals(TEST_QUEUE_DESCRIPTION, managedQueue.getDescription());
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java Tue Jun 2 20:53:49 2015
@@ -103,8 +103,8 @@ public class CloseOnNoRouteForMandatoryM
StringBuilder longExchangeName = getLongExchangeName();
- AMQShortString exchangeName = new AMQShortString(longExchangeName.toString());
- transactedSession.declareExchange(exchangeName, new AMQShortString("direct"), false);
+ String exchangeName = longExchangeName.toString();
+ transactedSession.declareExchange(exchangeName, "direct", false);
Destination testQueue = new AMQQueue(exchangeName, getTestQueueName());
MessageProducer mandatoryProducer = transactedSession.createProducer(
@@ -150,8 +150,8 @@ public class CloseOnNoRouteForMandatoryM
StringBuilder longExchangeName = getLongExchangeName();
- AMQShortString exchangeName = new AMQShortString(longExchangeName.toString());
- transactedSession.declareExchange(exchangeName, new AMQShortString("direct"), false);
+ String exchangeName = longExchangeName.toString();
+ transactedSession.declareExchange(exchangeName, "direct", false);
AMQQueue testQueue = new AMQQueue(exchangeName, getTestQueueName());
MessageProducer mandatoryProducer = transactedSession.createProducer(
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java Tue Jun 2 20:53:49 2015
@@ -106,8 +106,8 @@ public class UnroutableMessageTestExcept
{
JMSException exception = getReceivedException();
assertNoRouteException(exception, message);
- AMQShortString exchangeName = queue.getExchangeName();
- String expectedMessage = "Error: No Route for message [Exchange: " + exchangeName.asString().substring(0, 220) + "...";
+ String exchangeName = queue.getExchangeName();
+ String expectedMessage = "Error: No Route for message [Exchange: " + exchangeName.substring(0, 220) + "...";
assertTrue("Unexpected exception message: " + exception.getMessage(), exception.getMessage().contains(expectedMessage));
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java Tue Jun 2 20:53:49 2015
@@ -63,7 +63,7 @@ public class MessageToStringTest extends
String queueName = getTestQueueName();
//Create Queue
- ((AMQSession) _session).createQueue(new AMQShortString(queueName), true, false, false);
+ ((AMQSession) _session).createQueue(queueName, true, false, false);
_queue = _session.createQueue("direct://amq.direct/"+queueName+"/"+queueName+"?durable='false'&autodelete='true'");
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java Tue Jun 2 20:53:49 2015
@@ -53,7 +53,7 @@ public class ObjectMessageTest extends Q
//Create Queue
String queueName = getTestQueueName();
- ((AMQSession) _session).createQueue(new AMQShortString(queueName), true, false, false);
+ ((AMQSession) _session).createQueue(queueName, true, false, false);
Queue queue = _session.createQueue("direct://amq.direct/"+queueName+"/"+queueName+"?durable='false'&autodelete='true'");
//Create Consumer
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java Tue Jun 2 20:53:49 2015
@@ -179,10 +179,10 @@ public class RecoverTest extends QpidBro
Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
Queue queue =
- new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q1"), new AMQShortString("Q1"),
+ new AMQQueue(consumerSession.getDefaultQueueExchangeName(), "Q1", "Q1",
false, true);
Queue queue2 =
- new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q2"), new AMQShortString("Q2"),
+ new AMQQueue(consumerSession.getDefaultQueueExchangeName(), "Q2", "Q2",
false, true);
MessageConsumer consumer = consumerSession.createConsumer(queue);
MessageConsumer consumer2 = consumerSession.createConsumer(queue2);
@@ -221,7 +221,7 @@ public class RecoverTest extends QpidBro
final Session consumerSession = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue =
- new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q3"), new AMQShortString("Q3"),
+ new AMQQueue(consumerSession.getDefaultQueueExchangeName(), "Q3", "Q3",
false, true);
MessageConsumer consumer = consumerSession.createConsumer(queue);
MessageProducer producer = consumerSession.createProducer(queue);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java Tue Jun 2 20:53:49 2015
@@ -191,7 +191,7 @@ public class MultipleConnectionTest exte
String broker = _connectionString;
int messages = 10;
- AMQTopic topic = new AMQTopic(AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME), "amq.topic");
+ AMQTopic topic = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, "amq.topic");
Receiver[] receivers = new Receiver[] { new Receiver(broker, topic, 2), new Receiver(broker, topic, 14) };
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java Tue Jun 2 20:53:49 2015
@@ -58,7 +58,7 @@ public class SessionStartTest extends Qp
private void init(AMQConnection connection) throws Exception
{
init(connection,
- new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("SessionStartTest")), true));
+ new AMQQueue(connection.getDefaultQueueExchangeName(), randomize("SessionStartTest"), true));
}
private void init(AMQConnection connection, AMQDestination destination) throws Exception
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Tue Jun 2 20:53:49 2015
@@ -78,7 +78,7 @@ public class TextMessageTest extends Qpi
private void init(AMQConnection connection) throws Exception
{
Destination destination =
- new AMQQueue(connection.getDefaultQueueExchangeName(), new AMQShortString(randomize("TextMessageTest")), true);
+ new AMQQueue(connection.getDefaultQueueExchangeName(), randomize("TextMessageTest"), true);
init(connection, destination);
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java Tue Jun 2 20:53:49 2015
@@ -86,17 +86,13 @@ public class ConnectionTest extends Qpid
AMQSession sess = (AMQSession) conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- sess.declareExchange(new AMQShortString("test.direct"),
- AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS), false);
+ sess.declareExchange("test.direct", ExchangeDefaults.DIRECT_EXCHANGE_CLASS, false);
- sess.declareExchange(new AMQShortString("tmp.direct"),
- AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS), false);
+ sess.declareExchange("tmp.direct", ExchangeDefaults.DIRECT_EXCHANGE_CLASS, false);
- sess.declareExchange(new AMQShortString("tmp.topic"),
- AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS), false);
+ sess.declareExchange("tmp.topic", ExchangeDefaults.TOPIC_EXCHANGE_CLASS, false);
- sess.declareExchange(new AMQShortString("test.topic"),
- AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS), false);
+ sess.declareExchange("test.topic", ExchangeDefaults.TOPIC_EXCHANGE_CLASS, false);
QueueSession queueSession = conn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java Tue Jun 2 20:53:49 2015
@@ -51,7 +51,7 @@ public class AMQProtocolSessionTest exte
return (TestNetworkConnection) getProtocolHandler().getNetworkConnection();
}
- public AMQShortString genQueueName()
+ public String genQueueName()
{
return generateQueueName();
}
@@ -99,7 +99,7 @@ public class AMQProtocolSessionTest exte
private void checkTempQueueName(SocketAddress address, String queueName)
{
_testSession.getNetworkConnection().setLocalAddress(address);
- assertEquals("Wrong queue name", queueName, _testSession.genQueueName().asString());
+ assertEquals("Wrong queue name", queueName, _testSession.genQueueName().toString());
}
private static class TestNetworkConnection implements NetworkConnection
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java Tue Jun 2 20:53:49 2015
@@ -87,8 +87,7 @@ public class JavaServerCloseRaceConditio
// Also set a different exchange class string so the attempt to declare
// the exchange causes an exchange.
ExchangeDeclareBody body = session.getMethodRegistry().createExchangeDeclareBody(session.getTicket(),
- new AMQShortString(
- EXCHANGE_NAME),
+ EXCHANGE_NAME,
null,
true,
false,
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java Tue Jun 2 20:53:49 2015
@@ -77,8 +77,7 @@ public class JMSPropertiesTest extends Q
AMQConnection con = (AMQConnection) getConnection("guest", "guest");
AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
Queue queue =
- new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false,
- true);
+ new AMQQueue(con.getDefaultQueueExchangeName(), "someQ", "someQ", false, true);
MessageConsumer consumer = consumerSession.createConsumer(queue);
AMQConnection con2 = (AMQConnection) getConnection("guest", "guest");
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java Tue Jun 2 20:53:49 2015
@@ -43,6 +43,9 @@ import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.StreamMessage;
+
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
@@ -64,9 +67,9 @@ public class StreamMessageTest extends Q
ExchangeDefaults.HEADERS_EXCHANGE_CLASS + "://" + ExchangeDefaults.HEADERS_EXCHANGE_NAME
+ "/test/queue1?" + BindingURL.OPTION_ROUTING_KEY + "='F0000=1'"));
- FieldTable ft = new FieldTable();
- ft.setString("x-match", "any");
- ft.setString("F1000", "1");
+ Map<String,Object> ft = new HashMap<>();
+ ft.put("x-match", "any");
+ ft.put("F1000", "1");
consumerSession.declareAndBind(queue, ft);
MessageConsumer consumer = consumerSession.createConsumer(queue);
// force synch to ensure the consumer has resulted in a bound queue
@@ -120,7 +123,7 @@ public class StreamMessageTest extends Q
AMQConnection con = (AMQConnection) getConnection("guest", "guest");
AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- AMQQueue queue = new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("testQ"));
+ AMQQueue queue = new AMQQueue(con.getDefaultQueueExchangeName(), "testQ");
MessageConsumer consumer = consumerSession.createConsumer(queue);
consumer.setMessageListener(new MessageListener()
{
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java Tue Jun 2 20:53:49 2015
@@ -32,6 +32,7 @@ import javax.naming.InitialContext;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java Tue Jun 2 20:53:49 2015
@@ -68,10 +68,10 @@ public class TransactedTest extends Qpid
_logger.info("Create Session");
session = con.createSession(true, Session.SESSION_TRANSACTED);
_logger.info("Create Q1");
- queue1 = new AMQQueue(session.getDefaultQueueExchangeName(), new AMQShortString("Q1"),
- new AMQShortString("Q1"), false, true);
+ queue1 = new AMQQueue(session.getDefaultQueueExchangeName(), "Q1",
+ "Q1", false, true);
_logger.info("Create Q2");
- AMQQueue queue2 = new AMQQueue(session.getDefaultQueueExchangeName(), new AMQShortString("Q2"), false);
+ AMQQueue queue2 = new AMQQueue(session.getDefaultQueueExchangeName(), "Q2", false);
_logger.info("Create Consumer of Q1");
consumer1 = session.createConsumer(queue1);
@@ -230,7 +230,7 @@ public class TransactedTest extends Qpid
AMQConnection con = (AMQConnection) getConnection("guest", "guest");
Session consumerSession = con.createSession(true, Session.SESSION_TRANSACTED);
- AMQQueue queue3 = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), new AMQShortString("Q3"), false);
+ AMQQueue queue3 = new AMQQueue(consumerSession.getDefaultQueueExchangeName(), "Q3", false);
MessageConsumer consumer = consumerSession.createConsumer(queue3);
AMQConnection con2 = (AMQConnection) getConnection("guest", "guest");
Modified: qpid/java/trunk/test-profiles/JavaPre010Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/JavaPre010Excludes?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/JavaPre010Excludes (original)
+++ qpid/java/trunk/test-profiles/JavaPre010Excludes Tue Jun 2 20:53:49 2015
@@ -44,7 +44,6 @@ org.apache.qpid.test.unit.message.JMSPro
org.apache.qpid.server.queue.AddressBasedSortedQueueTest#*
// Those tests are written against the 0.10 path
-org.apache.qpid.test.unit.message.UTF8Test#*
org.apache.qpid.client.SynchReceiveTest#testReceiveNoWait
org.apache.qpid.server.logging.ChannelLoggingTest#testChannelClosedOnExclusiveQueueDeclaredOnDifferentSession
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org