Merge pull request #54 from Particular/release-5.2

Release 5.2

Author: andreasohlund

src/NServiceBus.Testing.Tests/SagaTests.cs

@@ -170,6 +170,46 @@ public void ShouldPassExpectNotForwardCurrentMessageToIfMessageForwardedToUnexpe
                 .ExpectNotForwardCurrentMessageTo(dest => dest == "expectedDestination")
                 .When(s => s.Handle(new StartsSaga()));
         }
+
+        [Test]
+        public void ShouldFailExpectReplyToOriginatorIfNotRepliedToOriginator()
+        {
+            Assert.Throws<Exception>(() => Test.Saga<SagaThatDoesAReply>()
+                .ExpectReplyToOriginator<ResponseToOriginator>()
+                .When(s => s.Handle(new MyRequest())));
+        }
+
+        [Test]
+        public void ShouldFailExpectNotReplyToOriginatorIfRepliedToOriginator()
+        {
+            Assert.Throws<Exception>(() => Test.Saga<MySaga>()
+                .ExpectNotReplyToOriginator<ResponseToOriginator>()
+                .When(s => s.Handle(new StartsSaga())));
+        }
+
+        [Test]
+        public void ShouldPassExpectNotReplyToOriginatorIfUsingReply()
+        {
+            Test.Saga<SagaThatDoesAReply>()
+                .ExpectNotReplyToOriginator<ResponseToOriginator>()
+                .When(s => s.Handle(new MyRequest()));
+        }
+
+        [Test]
+        public void ShouldPassExpectNotReplyToOriginatorIfNotReplyingToOriginator()
+        {
+            Test.Saga<MySagaWithInterface>()
+                .ExpectNotReplyToOriginator<ResponseToOriginator>()
+                .WhenHandling<StartsSagaWithInterface>();
+        }
+
+        [Test]
+        public void ShouldPassExpectNotReplyToOriginatorIfFailingCheck()
+        {
+            Test.Saga<MySaga>()
+                .ExpectNotReplyToOriginator<ResponseToOriginator>(m => false)
+                .When(s => s.Handle(new StartsSaga()));
+        }
     }
 
 

src/NServiceBus.Testing.Tests/TestHandlerFixture.cs

@@ -30,22 +30,6 @@ public void ShouldAssertHandleCurrentMessageLaterWasCalled()
                 .OnMessage<TestMessage>();
         }
 
-        [Test]
-        public void ShouldFailAssertingSendToSitesWasCalled()
-        {
-            Assert.Throws<Exception>(() => Test.Handler<EmptyHandler>()
-                .ExpectSendToSites<TestMessage>((m, a) => true)
-                .OnMessage<TestMessage>());
-        }
-
-        [Test]
-        public void ShouldAssertSendToSitesWasNotCalled()
-        {
-            Test.Handler<EmptyHandler>()
-                .ExpectNotSendToSites<TestMessage>((m, a) => true)
-                .OnMessage<TestMessage>();
-        }
-
         [Test]
         public void ShouldAssertDeferWasCalledWithTimeSpan()
         {

src/NServiceBus.Testing/Handler.cs

@@ -154,24 +154,6 @@ public Handler<T> ExpectHandleCurrentMessageLater()
             return this;
         }
 
-        /// <summary>
-        /// Check that the handler sends a message of the given type to sites.
-        /// </summary>
-        public Handler<T> ExpectSendToSites<TMessage>(Func<TMessage, IEnumerable<string>, bool> check)
-        {
-            expectedInvocations.Add(new ExpectedSendToSitesInvocation<TMessage> { Check = check });
-            return this;
-        }
-
-        /// <summary>
-        /// Check that the handler doesn't send a message of the given type to sites.
-        /// </summary>
-        public Handler<T> ExpectNotSendToSites<TMessage>(Func<TMessage, IEnumerable<string>, bool> check)
-        {
-            expectedInvocations.Add(new ExpectedNotSendToSitesInvocation<TMessage> { Check = check });
-            return this;
-        }
-
         /// <summary>
         /// Check that the handler defers a message of the given type.
         /// </summary>

src/NServiceBus.Testing/Invocations.cs

@@ -199,6 +199,11 @@ public ExpectedNotDeferMessageInvocation()
 
     class ExpectedReplyToOriginatorInvocation<M> : ExpectedInvocation<ReplyToOriginatorInvocation<M>>
     {
+        public ExpectedReplyToOriginatorInvocation(bool negate = false)
+        {
+            Negate = negate;
+        }
+
         public Func<M, Address, string, bool> Check { get; set; }
 
         protected override bool Validate(ReplyToOriginatorInvocation<M> invocation)

src/NServiceBus.Testing/Saga.cs

@@ -7,7 +7,7 @@ namespace NServiceBus.Testing
     /// <summary>
     /// Saga unit testing framework.
     /// </summary>
-    public class Saga<T> where T : Saga, new()
+    public class Saga<T> where T : Saga
     {
         private readonly T saga;
         private readonly StubBus bus;
@@ -249,7 +249,36 @@ public Saga<T> ExpectReplyToOriginator<TMessage>(Action<TMessage> check)
         {
             return ExpectReplyToOriginator(CheckActionToFunc(check));
         }
-        
+
+        /// <summary>
+        /// Check that the saga does not reply to the originator with the given message type.
+        /// </summary>
+        public Saga<T> ExpectNotReplyToOriginator<TMessage>(Func<TMessage, bool> check = null)
+        {
+            expectedInvocations.Add(new ExpectedReplyToOriginatorInvocation<TMessage>(negate:true)
+            {
+                Check = (message, address, correlationId) =>
+                {
+                    if (address == Address.Parse(saga.Entity.Originator) && correlationId == saga.Entity.OriginalMessageId)
+                    {
+                        check = check ?? (m => true);
+                        return check(message);
+                    }
+
+                    return true;
+                }
+            });
+            return this;
+        }
+
+        /// <summary>
+        /// Check that the saga does not reply to the originator with the given message type.
+        /// </summary>
+        public Saga<T> ExpectNotReplyToOriginator<TMessage>(Action<TMessage> check)
+        {
+            return ExpectNotReplyToOriginator(CheckActionToFunc(check));
+        }
+
         /// <summary>
         /// Check that the saga publishes a message of the given type complying with the given predicate.
         /// </summary>

src/NServiceBus.Testing/Test.cs

@@ -143,7 +143,7 @@ public static void Initialize(params Type[] types)
         ///     Begin the test script for the passed in saga instance.
         ///     Callers need to instantiate the saga's data class as well as give it an ID.
         /// </summary>
-        public static Saga<T> Saga<T>(T saga) where T : Saga, new()
+        public static Saga<T> Saga<T>(T saga) where T : Saga
         {
             bus = new StubBus(messageCreator);