qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject [2/7] qpid-broker-j git commit: QPID-6933: [System Tests] Remove AMQP 0-x client specific AMQPEncodedMapMessageTest after moving test into client system tests
Date Sun, 14 Jan 2018 12:14:19 GMT
QPID-6933: [System Tests] Remove AMQP 0-x client specific AMQPEncodedMapMessageTest after moving
test into client system tests


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/16d2ece7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/16d2ece7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/16d2ece7

Branch: refs/heads/master
Commit: 16d2ece75a5cbf286c9cae56741fb62af2a0cc0a
Parents: 98a9d1c
Author: Keith Wall <kwall@apache.org>
Authored: Fri Jan 12 16:33:12 2018 +0000
Committer: Keith Wall <kwall@apache.org>
Committed: Fri Jan 12 16:33:12 2018 +0000

----------------------------------------------------------------------
 .../message/AMQPEncodedMapMessageTest.java      | 277 -------------------
 test-profiles/Java10Excludes                    |   3 -
 2 files changed, 280 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/16d2ece7/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
b/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
deleted file mode 100644
index e3a85e9..0000000
--- a/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
+++ /dev/null
@@ -1,277 +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.client.message;
-
-
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-
-public class AMQPEncodedMapMessageTest extends QpidBrokerTestCase
-{
-    private Connection _connection;
-    private Session _session;
-    private MessageConsumer _consumer;
-    private MessageProducer _producer;
-    private UUID myUUID = UUID.randomUUID();
-    
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        
-        //Create Connection
-        _connection = getConnection();
-        
-        //Create Session
-        _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        //Create Queue
-        String queueName = getTestQueueName();
-        Queue queue = _session.createQueue(queueName);
-
-        //Create Consumer
-        _consumer = _session.createConsumer(queue);
-
-        //Create Producer
-        _producer = _session.createProducer(queue);
-
-        _connection.start();
-    }
-
-    public void testEmptyMessage() throws JMSException
-    {
-        MapMessage m = _session.createMapMessage();
-        _producer.send(m);
-        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message was not received on time",msg);  
-        assertEquals("Message content-type is incorrect",
-                        AMQPEncodedMapMessage.MIME_TYPE,
-                        ((AbstractJMSMessage)msg).getContentType());
-        
-        assertEquals("Message content should be an empty map",
-                Collections.EMPTY_MAP,
-                ((AMQPEncodedMapMessage)msg).getMap());
-    }
-    
-    public void testNullMessage() throws JMSException
-    {
-        MapMessage m = _session.createMapMessage();
-        ((AMQPEncodedMapMessage)m).setMap(null);
-        _producer.send(m);
-        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message was not received on time",msg);  
-        assertEquals("Message content-type is incorrect",
-                        AMQPEncodedMapMessage.MIME_TYPE,
-                        ((AbstractJMSMessage)msg).getContentType());
-        
-        assertEquals("Message content should be null",
-                null,
-                ((AMQPEncodedMapMessage)msg).getMap());
-
-    }
-
-    public void testMessageWithContent() throws JMSException
-    {
-        MapMessage m = _session.createMapMessage();
-        m.setBoolean("Boolean", true);
-        m.setByte("Byte", (byte)5);
-        byte[] bytes = new byte[]{(byte)5,(byte)8};
-        m.setBytes("Bytes", bytes);
-        m.setChar("Char", 'X');
-        m.setDouble("Double", 56.84);
-        m.setFloat("Float", Integer.MAX_VALUE + 5000);
-        m.setInt("Int", Integer.MAX_VALUE - 5000);
-        m.setShort("Short", (short)58);
-        m.setString("String", "Hello"); 
-        m.setObject("uuid", myUUID);
-        _producer.send(m);
-        
-        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message was not received on time",msg);            
-        assertEquals("Message content-type is incorrect",
-                        AMQPEncodedMapMessage.MIME_TYPE,
-                        ((AbstractJMSMessage)msg).getContentType());
-        
-        assertEquals(true,m.getBoolean("Boolean"));
-        assertEquals((byte)5,m.getByte("Byte"));
-        byte[] bytesRcv = m.getBytes("Bytes");
-        assertNotNull("Byte array is null",bytesRcv);
-        assertEquals((byte)5,bytesRcv[0]);
-        assertEquals((byte)8,bytesRcv[1]);
-        assertEquals('X',m.getChar("Char"));
-        assertEquals(56.84,m.getDouble("Double"));
-        //assertEquals(Integer.MAX_VALUE + 5000,m.getFloat("Float"));
-        assertEquals(Integer.MAX_VALUE - 5000,m.getInt("Int"));
-        assertEquals((short)58,m.getShort("Short"));
-        assertEquals("Hello",m.getString("String"));
-        assertEquals(myUUID,(UUID)m.getObject("uuid"));
-    }
-    
-    
-    public void testMessageWithListEntries() throws JMSException
-    {
-        MapMessage m = _session.createMapMessage();
-        
-        List<Integer> myList = getList();
-        
-        m.setObject("List", myList);   
-        
-        List<UUID> uuidList = new ArrayList<UUID>();
-        uuidList.add(myUUID);
-        m.setObject("uuid-list", uuidList);
-        _producer.send(m);
-        
-        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message was not received on time",msg);            
-        assertEquals("Message content-type is incorrect",
-                        AMQPEncodedMapMessage.MIME_TYPE,
-                        ((AbstractJMSMessage)msg).getContentType());
-        
-        List<Integer> list = (List<Integer>)msg.getObject("List");
-        assertNotNull("List not received",list);
-        Collections.sort(list);
-        int i = 1;
-        for (Integer j: list)
-        {
-            assertEquals(i,j.intValue());
-            i++;
-        }
-        
-        List<UUID> list2 = (List<UUID>)msg.getObject("uuid-list");
-        assertNotNull("UUID List not received",list2);
-        assertEquals(myUUID,list2.get(0));        
-    }
-    
-    public void testMessageWithMapEntries() throws JMSException
-    {
-        MapMessage m = _session.createMapMessage();
-        
-        Map<String,String> myMap = getMap();
-        m.setObject("Map", myMap);          
-        
-        Map<String,UUID> uuidMap = new HashMap<String,UUID>();
-        uuidMap.put("uuid", myUUID);
-        m.setObject("uuid-map", uuidMap);      
-        
-        _producer.send(m);
-        
-        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message was not received on time",msg);            
-        assertEquals("Message content-type is incorrect",
-                        AMQPEncodedMapMessage.MIME_TYPE,
-                        ((AbstractJMSMessage)msg).getContentType());
-        
-        Map<String,String> map = (Map<String,String>)msg.getObject("Map");
-        assertNotNull("Map not received",map);
-        for (int i=1; i <4; i++ )
-        {
-            assertEquals("String" + i,map.get("Key" + i));
-            i++;
-        }
-        
-        Map<String,UUID> map2 = (Map<String,UUID>)msg.getObject("uuid-map");
-        assertNotNull("Map not received",map2);
-        assertEquals(myUUID,map2.get("uuid"));   
-    }
-    
-    public void testMessageWithNestedListsAndMaps() throws JMSException
-    {
-        MapMessage m = _session.createMapMessage();
-        
-        Map<String,Object> myMap = new HashMap<String,Object>();
-        myMap.put("map", getMap());
-        myMap.put("list", getList());
-        
-        m.setObject("Map", myMap);            
-        _producer.send(m);
-        
-        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message was not received on time",msg);            
-        assertEquals("Message content-type is incorrect",
-                        AMQPEncodedMapMessage.MIME_TYPE,
-                        ((AbstractJMSMessage)msg).getContentType());
-        
-        Map<String,Object> mainMap = (Map<String,Object>)msg.getObject("Map");
-        assertNotNull("Main Map not received",mainMap);
-        
-        Map<String,String> map = (Map<String,String>)mainMap.get("map");
-        assertNotNull("Nested Map not received",map);
-        for (int i=1; i <4; i++ )
-        {
-            assertEquals("String" + i,map.get("Key" + i));
-            i++;
-        }
-        
-        List<Integer> list = (List<Integer>)mainMap.get("list");
-        assertNotNull("Nested List not received",list);
-        Collections.sort(list);
-        
-        int i = 1;
-        for (Integer j: list)
-        {
-            assertEquals(i,j.intValue());
-            i++;
-        }
-    }
-    
-    private List<Integer> getList()
-    {
-        List<Integer> myList = new ArrayList<Integer>();
-        myList.add(1);
-        myList.add(2);
-        myList.add(3);
-        
-        return myList;
-    }
-    
-    private Map<String,String> getMap()
-    {
-        Map<String,String> myMap = new HashMap<String,String>();
-        myMap.put("Key1","String1");
-        myMap.put("Key2","String2");
-        myMap.put("Key3","String3");
-        
-        return myMap;
-    }
-    
-    @Override
-    public void tearDown() throws Exception
-    {
-        //clean up
-        _connection.close();
-
-        super.tearDown();
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/16d2ece7/test-profiles/Java10Excludes
----------------------------------------------------------------------
diff --git a/test-profiles/Java10Excludes b/test-profiles/Java10Excludes
index 248aba9..be9a0b9 100644
--- a/test-profiles/Java10Excludes
+++ b/test-profiles/Java10Excludes
@@ -29,9 +29,6 @@ org.apache.qpid.server.failover.FailoverMethodTest#*
 // This test mainly covers the AMQP 0-x client's heartbeating implementation
 org.apache.qpid.client.HeartbeatTest#*
 
-// This is a test of the MapMessage implementation for the 0-x client
-org.apache.qpid.client.message.AMQPEncodedMapMessageTest#*
-
 // Uses an 0-x client API to acknowledge up to a particular message rather than the most
recent
 org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgsAckOnEarlier
 // Tests the effect of setting the prefetch value


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


Mime
View raw message