Merge pull request #11 from ibm-messaging/cascade-close

Check for cascaded close

Author: matrober-uk

cascade_close_test.go

@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) IBM Corporation 2020
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package main
+
+import (
+	"testing"
+
+	"github.com/ibm-messaging/mq-golang-jms20/mqjms"
+	"github.com/stretchr/testify/assert"
+)
+
+/*
+ * Test the behaviour of the cascading close.
+ *
+ * - Create three consumers
+ * - Receive with timeout, get no message
+ * - Close second consumer, try to receive again, get error, check 1 + 3 still ok
+ * - Ctx.close, try to receive on the other two, get error
+ */
+func TestCascadeClose(t *testing.T) {
+
+	// Loads CF parameters from connection_info.json and apiKey.json in the Downloads directory
+	cf, cfErr := mqjms.CreateConnectionFactoryFromDefaultJSONFiles()
+	assert.Nil(t, cfErr)
+
+	// Creates a connection to the queue manager, using defer to close it automatically
+	// at the end of the function (if it was created successfully)
+	context, ctxErr := cf.CreateContext()
+	assert.Nil(t, ctxErr)
+	// We are testing Close behaviour here, but auto-cleanup just in case.
+	if context != nil {
+		defer context.Close()
+	}
+
+	// Equivalent to a JNDI lookup or other declarative definition
+	queue := context.CreateQueue("DEV.QUEUE.1")
+
+	// Set up the consumers 1-3 ready to receive messages.
+	consumer1, conErr := context.CreateConsumer(queue)
+	assert.Nil(t, conErr)
+	// We are testing Close behaviour here, but auto-cleanup just in case.
+	if consumer1 != nil {
+		defer consumer1.Close()
+	}
+
+	consumer2, conErr := context.CreateConsumer(queue)
+	assert.Nil(t, conErr)
+	// We are testing Close behaviour here, but auto-cleanup just in case.
+	if consumer2 != nil {
+		defer consumer2.Close()
+	}
+
+	consumer3, conErr := context.CreateConsumer(queue)
+	assert.Nil(t, conErr)
+	// We are testing Close behaviour here, but auto-cleanup just in case.
+	if consumer3 != nil {
+		defer consumer3.Close()
+	}
+
+	// Check no message on the queue to start with
+	testMsg, err := consumer1.ReceiveNoWait()
+	assert.Nil(t, err)
+	assert.Nil(t, testMsg)
+
+	testMsg, err = consumer2.ReceiveNoWait()
+	assert.Nil(t, err)
+	assert.Nil(t, testMsg)
+
+	testMsg, err = consumer3.ReceiveNoWait()
+	assert.Nil(t, err)
+	assert.Nil(t, testMsg)
+
+	// Close second consumer, try to receive again, get error, check 1 + 3 still ok
+	consumer2.Close()
+
+	testMsg, err = consumer1.ReceiveNoWait()
+	assert.Nil(t, err)
+	assert.Nil(t, testMsg)
+
+	testMsg, err = consumer2.ReceiveNoWait()
+	assert.NotNil(t, err)
+	assert.Equal(t, "2019", err.GetErrorCode())
+	assert.Equal(t, "MQRC_HOBJ_ERROR", err.GetReason())
+	assert.Nil(t, testMsg)
+
+	testMsg, err = consumer3.ReceiveNoWait()
+	assert.Nil(t, err)
+	assert.Nil(t, testMsg)
+
+	// Close a closed thing to check it doesn't complain.
+	consumer2.Close()
+
+	// Ctx.close, try to receive on the other two, get error
+	context.Close()
+
+	testMsg, err = consumer1.ReceiveNoWait()
+	assert.NotNil(t, err)
+	assert.Equal(t, "2018", err.GetErrorCode())
+	assert.Equal(t, "MQRC_HCONN_ERROR", err.GetReason())
+	assert.Nil(t, testMsg)
+
+	testMsg, err = consumer2.ReceiveNoWait()
+	assert.NotNil(t, err)
+	assert.Equal(t, "2018", err.GetErrorCode())
+	assert.Equal(t, "MQRC_HCONN_ERROR", err.GetReason())
+	assert.Nil(t, testMsg)
+
+	testMsg, err = consumer3.ReceiveNoWait()
+	assert.NotNil(t, err)
+	assert.Equal(t, "2018", err.GetErrorCode())
+	assert.Equal(t, "MQRC_HCONN_ERROR", err.GetReason())
+	assert.Nil(t, testMsg)
+
+}

next-features.txt

@@ -5,7 +5,6 @@ project!
 
 Not currently implemented:
 --------------------------
-- Cascade close from JMSContext to producer/consumer objects
 - BytesMessage, receiveBytesBody
 - Local transactions (e.g. allow request/reply under transaction)
 - MessageListener
@@ -15,6 +14,10 @@ Not currently implemented:
 - Temporary destinations
 - Priority
 
+Client capabilities for participating in Uniform Clusters;
+- CCDT to allow listing queue managers
+- Set APPLTag to name the logical application
+- Auto reconnect (any) + MQCNO_RECONNECT_QMGR 
 
 Known issues:
 -------------

requestreply_test.go

@@ -10,10 +10,11 @@
 package main
 
 import (
+	"testing"
+
 	"github.com/ibm-messaging/mq-golang-jms20/jms20subset"
 	"github.com/ibm-messaging/mq-golang-jms20/mqjms"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 /*
@@ -70,16 +71,16 @@ func TestRequestReply(t *testing.T) {
 
 	// Get the generated MessageID from the sent message, so that we
 	// can receive the response message using it later
-	msgId := sentMsg.GetJMSMessageID()
-	assert.NotEqual(t, "", msgId)
-	assert.Equal(t, 48, len(msgId))
+	msgID := sentMsg.GetJMSMessageID()
+	assert.NotEqual(t, "", msgID)
+	assert.Equal(t, 48, len(msgID))
 
 	// "Another application" will consume the request message and sent
 	// the reply message
 	replyToMessage(t, cf, requestQueue)
 
 	// Receive the reply message, selecting by CorrelID
-	replyConsumer, rConErr3 := context.CreateConsumerWithSelector(replyQueue, "JMSCorrelationID = '"+msgId+"'")
+	replyConsumer, rConErr3 := context.CreateConsumerWithSelector(replyQueue, "JMSCorrelationID = '"+msgID+"'")
 	assert.Nil(t, rConErr3)
 	if replyConsumer != nil {
 		defer replyConsumer.Close()
@@ -92,7 +93,7 @@ func TestRequestReply(t *testing.T) {
 	switch msg := respMsg.(type) {
 	case jms20subset.TextMessage:
 		assert.Equal(t, "ReplyMsg", *msg.GetText())
-		assert.Equal(t, msgId, msg.GetJMSCorrelationID())
+		assert.Equal(t, msgID, msg.GetJMSCorrelationID())
 	default:
 		assert.Fail(t, "Got something other than a text message")
 	}
@@ -120,8 +121,8 @@ func replyToMessage(t *testing.T, cf jms20subset.ConnectionFactory, requestQueue
 	}
 	reqMsg, err := requestConsumer.ReceiveNoWait()
 	assert.Nil(t, err)
-	reqMsgId := reqMsg.GetJMSMessageID()
-	assert.NotEqual(t, "", reqMsgId)
+	reqMsgID := reqMsg.GetJMSMessageID()
+	assert.NotEqual(t, "", reqMsgID)
 
 	// Get the replyTo queue and request MsgID
 	replyDest := reqMsg.GetJMSReplyTo()
@@ -131,7 +132,7 @@ func replyToMessage(t *testing.T, cf jms20subset.ConnectionFactory, requestQueue
 	replyMsgBody := "ReplyMsg"
 	replyMsg := rrContext.CreateTextMessageWithString(replyMsgBody)
 	assert.Equal(t, "", replyMsg.GetJMSCorrelationID())
-	replyMsg.SetJMSCorrelationID(reqMsgId)
+	replyMsg.SetJMSCorrelationID(reqMsgID)
 	assert.NotEqual(t, "", replyMsg.GetJMSCorrelationID())
 
 	// Send the reply message back to the original application