qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject qpid-broker-j git commit: QPID-8031: [Broker-J, System Tests] Bump version of AMQP 0-x client to 6.3.0
Date Wed, 06 Dec 2017 09:23:54 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 01bcb51d4 -> cd534214a


QPID-8031: [Broker-J, System Tests] Bump version of AMQP 0-x client to 6.3.0


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/cd534214
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/cd534214
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/cd534214

Branch: refs/heads/master
Commit: cd534214affe087847792de95cca3b524202c7ab
Parents: 01bcb51
Author: Alex Rudyy <orudyy@apache.org>
Authored: Tue Dec 5 17:37:20 2017 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Tue Dec 5 17:37:20 2017 +0000

----------------------------------------------------------------------
 pom.xml                                         |  2 +-
 .../SimpleConversionTest.java                   |  5 --
 .../message/JMSHeadersAndPropertiesTest.java    |  5 --
 .../apache/qpid/util/AMQExceptionTestUtil.java  | 54 --------------------
 4 files changed, 1 insertion(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cd534214/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7856f07..aa82bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
     <maven-resolver-version>1.0.3</maven-resolver-version>
     <httpclient-version>4.5.3</httpclient-version>
     <qpid-jms-client-version>0.26.0</qpid-jms-client-version>
-    <qpid-jms-client-amqp-0-x-version>6.1.4</qpid-jms-client-amqp-0-x-version>
+    <qpid-jms-client-amqp-0-x-version>6.3.0</qpid-jms-client-amqp-0-x-version>
 
     <exec-maven-plugin-version>1.3.2</exec-maven-plugin-version>
     <javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cd534214/systests/end-to-end-conversion-tests/src/test/java/org/apache/qpid/systests/end_to_end_conversion/SimpleConversionTest.java
----------------------------------------------------------------------
diff --git a/systests/end-to-end-conversion-tests/src/test/java/org/apache/qpid/systests/end_to_end_conversion/SimpleConversionTest.java
b/systests/end-to-end-conversion-tests/src/test/java/org/apache/qpid/systests/end_to_end_conversion/SimpleConversionTest.java
index dbad8fd..54f9806 100644
--- a/systests/end-to-end-conversion-tests/src/test/java/org/apache/qpid/systests/end_to_end_conversion/SimpleConversionTest.java
+++ b/systests/end-to-end-conversion-tests/src/test/java/org/apache/qpid/systests/end_to_end_conversion/SimpleConversionTest.java
@@ -165,11 +165,6 @@ public class SimpleConversionTest extends EndToEndConversionTestBase
     @Test
     public void correlationIdAsBytes() throws Exception
     {
-        assumeTrue("This test is known to fail for pre 0-10 subscribers (QPID-7897)",
-                   EnumSet.of(Protocol.AMQP_0_10, Protocol.AMQP_1_0).contains(getSubscriberProtocolVersion()));
-        assumeTrue("This test is known to fail for pre 0-10 subscribers (QPID-7899)",
-                   EnumSet.of(Protocol.AMQP_0_10, Protocol.AMQP_1_0).contains(getPublisherProtocolVersion()));
-
         final byte[] correlationId = new byte[]{(byte) 0xFF, 0x00, (byte) 0xC3};
         final MessageDescription messageDescription = new MessageDescription();
         messageDescription.setHeader(MessageDescription.MessageHeader.CORRELATION_ID, correlationId);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cd534214/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/JMSHeadersAndPropertiesTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/JMSHeadersAndPropertiesTest.java
b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/JMSHeadersAndPropertiesTest.java
index 1a8612a..eaf35ac 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/JMSHeadersAndPropertiesTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/message/JMSHeadersAndPropertiesTest.java
@@ -19,7 +19,6 @@
  */
 package org.apache.qpid.systests.jms_1_1.message;
 
-import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
@@ -33,7 +32,6 @@ import static org.junit.Assume.assumeThat;
 import java.util.Enumeration;
 
 import javax.jms.Connection;
-import javax.jms.ConnectionMetaData;
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -45,7 +43,6 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.qpid.systests.JmsTestBase;
@@ -53,7 +50,6 @@ import org.apache.qpid.systests.JmsTestBase;
 public class JMSHeadersAndPropertiesTest extends JmsTestBase
 {
 
-    @Ignore("QPID-8031")
     @Test
     public void testResentJMSMessageGetsReplacementJMSMessageID() throws Exception
     {
@@ -63,7 +59,6 @@ public class JMSHeadersAndPropertiesTest extends JmsTestBase
         {
             connection.start();
             Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            ConnectionMetaData metaData = connection.getMetaData();
 
             MessageProducer producer = session.createProducer(queue);
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cd534214/systests/src/test/java/org/apache/qpid/util/AMQExceptionTestUtil.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/util/AMQExceptionTestUtil.java b/systests/src/test/java/org/apache/qpid/util/AMQExceptionTestUtil.java
deleted file mode 100644
index 8a7ecee..0000000
--- a/systests/src/test/java/org/apache/qpid/util/AMQExceptionTestUtil.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.util;
-
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.qpid.AMQException;
-
-public class AMQExceptionTestUtil
-{
-    private AMQExceptionTestUtil()
-    {
-
-    }
-
-    public static void assertAMQException(final String message, final Integer expected, final
AMQException e) throws Exception
-    {
-        // After v6.3.0, AMQException#getErrorCode() is an integer, whereas before v6.3.0,
AMQException#getErrorCode() was an AMQConstant with a getCode method
-        Object object = e.getErrorCode();
-        final Integer errorCode;
-        if (object instanceof Integer || object == null)
-        {
-            errorCode = (Integer) object;
-        }
-        else
-        {
-            // TODO Remove after 6.3.0 is released
-            Method m = object.getClass().getMethod("getCode", new Class[]{});
-            errorCode = (Integer) m.invoke(object);
-        }
-
-        TestCase.assertEquals(message, expected, errorCode);
-    }
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message