roundtrip UserProperties / ApplicationProperties

message.go

@@ -399,6 +399,13 @@ func (m *Message) toMsg() (*amqp.Message, error) {
 	amqpMsg.Properties.ReplyTo = m.ReplyTo
 	amqpMsg.Properties.ReplyToGroupID = m.ReplyToGroupID
 
+	if len(m.UserProperties) > 0 {
+		amqpMsg.ApplicationProperties = make(map[string]interface{})
+		for key, value := range m.UserProperties {
+			amqpMsg.ApplicationProperties[key] = value
+		}
+	}
+
 	if m.SystemProperties != nil {
 		sysPropMap, err := encodeStructureToMap(m.SystemProperties)
 		if err != nil {

queue_test.go

@@ -442,7 +442,6 @@ func (suite *serviceBusSuite) TestQueueClient() {
 		"MessageProperties":      testMessageProperties,
 		"Retry":                  testRequeueOnFail,
 		"Defer":                  testDeferMessage,
-		"SendBatch_NoZeroCheck":  testSendBatch,
 	}
 
 	window := time.Duration(30 * time.Second)