Merge pull request #215 from Particular/release-3.3

1.x compatible TransportMessage

Author: SeanFeldman

src/NServiceBus.AmazonSQS.Tests/API/APIApprovals.ApproveSqsTransport.approved.txt

@@ -23,6 +23,7 @@ namespace NServiceBus
     public class static SqsTransportSettings
     {
         public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> CredentialSource(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, NServiceBus.SqsCredentialSource credentialSource) { }
+        public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> EnableV1CompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> MaxTTLDays(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, int maxTtlDays) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> NativeDeferral(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, bool use = True) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> Proxy(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, string proxyHost, int proxyPort) { }

src/NServiceBus.AmazonSQS.Tests/MessageDispatcherTests.cs

@@ -0,0 +1,91 @@
+namespace NServiceBus.AmazonSQS.Tests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Extensibility;
+    using Newtonsoft.Json.Linq;
+    using NUnit.Framework;
+    using Routing;
+    using Settings;
+    using Transport;
+    using Transports.SQS;
+
+    [TestFixture]
+    public partial class MessageDispatcherTests
+    {
+        static TimeSpan expectedTtbr = TimeSpan.MaxValue.Subtract(TimeSpan.FromHours(1));
+        const string expectedReplyToAddress = "TestReplyToAddress";
+
+        [Test]
+        public async Task Sends_V1_compatible_payload_when_configured()
+        {
+            var settings = new SettingsHolder();
+            settings.Set(SettingsKeys.V1CompatibilityMode, true);
+
+            var mockSqsClient = new MockSqsClient();
+
+            var dispatcher = new MessageDispatcher(new ConnectionConfiguration(settings), null, mockSqsClient, new QueueUrlCache(mockSqsClient));
+
+            var transportOperations = new TransportOperations(
+                new TransportOperation(
+                    new OutgoingMessage("1234", new Dictionary<string, string>
+                    {
+                        {TransportHeaders.TimeToBeReceived, expectedTtbr.ToString()},
+                        {Headers.ReplyToAddress, expectedReplyToAddress}                        
+                    }, Encoding.Default.GetBytes("{}")), 
+                    new UnicastAddressTag("address")));
+
+            var transportTransaction = new TransportTransaction();
+            var context = new ContextBag();
+
+            await dispatcher.Dispatch(transportOperations, transportTransaction, context);
+
+            Assert.IsNotEmpty(mockSqsClient.RequestsSent, "No requests sent");
+            var request = mockSqsClient.RequestsSent.First();
+
+            var bodyJson = JObject.Parse(request.MessageBody);
+
+            Assert.IsTrue(bodyJson.ContainsKey("TimeToBeReceived"), "TimeToBeReceived not serialized");
+            Assert.AreEqual(expectedTtbr.ToString(), bodyJson["TimeToBeReceived"].Value<string>(), "Expected TTBR mismatch");
+
+            Assert.IsTrue(bodyJson.ContainsKey("ReplyToAddress"), "ReplyToAddress not serialized");
+            Assert.AreEqual(expectedReplyToAddress, bodyJson["ReplyToAddress"].Value<string>(), "Expected ReplyToAddress mismatch");
+        }
+
+
+        [Test]
+        public async Task Does_not_send_extra_properties_in_payload_by_default()
+        {
+            var settings = new SettingsHolder();
+
+            var mockSqsClient = new MockSqsClient();
+
+            var dispatcher = new MessageDispatcher(new ConnectionConfiguration(settings), null, mockSqsClient, new QueueUrlCache(mockSqsClient));
+
+            var transportOperations = new TransportOperations(
+                new TransportOperation(
+                    new OutgoingMessage("1234", new Dictionary<string, string>
+                    {
+                        {TransportHeaders.TimeToBeReceived, expectedTtbr.ToString()},
+                        {Headers.ReplyToAddress, expectedReplyToAddress}
+                    }, Encoding.Default.GetBytes("{}")),
+                    new UnicastAddressTag("address")));
+
+            var transportTransaction = new TransportTransaction();
+            var context = new ContextBag();
+
+            await dispatcher.Dispatch(transportOperations, transportTransaction, context);
+
+            Assert.IsNotEmpty(mockSqsClient.RequestsSent, "No requests sent");
+            var request = mockSqsClient.RequestsSent.First();
+
+            var bodyJson = JObject.Parse(request.MessageBody);
+
+            Assert.IsFalse(bodyJson.ContainsKey("TimeToBeReceived"), "TimeToBeReceived serialized");
+            Assert.IsFalse(bodyJson.ContainsKey("ReplyToAddress"), "ReplyToAddress serialized");
+        }
+    }
+}