Merge branch 'release-5.1'

Particular · Oct 27, 2015 · ce651b6 · ce651b6
2 parents 993b097 + e27a929
commit ce651b6
Show file tree

Hide file tree

Showing 6 changed files with 225 additions and 71 deletions.
diff --git a/src/NServiceBus.Testing.Tests/InvocationTests.cs b/src/NServiceBus.Testing.Tests/InvocationTests.cs
@@ -25,33 +25,30 @@ public void PublishValuePositive()
         }
 
         [Test]
-        [ExpectedException]
         public void PublishBasicNegativeCheck()
         {
             var i = new PublishInvocation<MessageA> {Message = new MessageA()};
             var exp = new ExpectedPublishInvocation<MessageA> {Check = m => false};
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]
-        [ExpectedException]
         public void PublishValueNegativeCheck()
         {
             var i = new PublishInvocation<MessageA> {Message = new MessageA {Value = 2}};
             var exp = new ExpectedPublishInvocation<MessageA> {Check = m => m.Value == 3};
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]
-        [ExpectedException]
         public void PublishBasicNegativeType()
         {
             var i = new PublishInvocation<MessageA> {Message = new MessageA()};
             var exp = new ExpectedPublishInvocation<MessageB> {Check = m => true};
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]
@@ -75,33 +72,30 @@ public void PublishValueMultiplePositive()
         }
 
         [Test]
-        [ExpectedException]
         public void NotPublishBasicNegative()
         {
             var i = new PublishInvocation<MessageA> {Message = new MessageA()};
             var exp = new ExpectedNotPublishInvocation<MessageA> {Check = m => true};
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]
-        [ExpectedException]
         public void SendPublishMismatchOne()
         {
             var i = new SendInvocation<MessageA> {Message = new MessageA()};
             var exp = new ExpectedPublishInvocation<MessageA> {Check = m => true};
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]
-        [ExpectedException]
         public void SendPublishMismatchTwo()
         {
             var i = new PublishInvocation<MessageA> {Message = new MessageA()};
             var exp = new ExpectedSendInvocation<MessageA> {Check = m => true};
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]
@@ -133,23 +127,21 @@ public void SendToSitesBasicPositive()
         }
 
         [Test]
-        [ExpectedException]
         public void SendToSitesBasicNegativeCheck()
         {
             var i = new SendToSitesInvocation<MessageA> { Message = new MessageA() , Value = new[] { "SiteA" } };
             var exp = new ExpectedSendToSitesInvocation<MessageA> { Check = (m, a) => false };
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]
-        [ExpectedException]
         public void NotSendToSitesBasicNegative()
         {
             var i = new SendToSitesInvocation<MessageA> { Message = new MessageA(), Value = new[] { "SiteA" } };
             var exp = new ExpectedNotSendToSitesInvocation<MessageA> { Check = (m, a) => true };
 
-            exp.Validate(i);
+            Assert.Throws<Exception>(() => exp.Validate(i));
         }
 
         [Test]

diff --git a/src/NServiceBus.Testing.Tests/SagaTests.cs b/src/NServiceBus.Testing.Tests/SagaTests.cs
@@ -112,7 +112,6 @@ public void RemoteOrderWithAssertions()
                 .When(s => s.Handle(new SubmitOrder { Total = total, IsRemoteOrder = true }));
         }
 
-
         [Test]
         public void DiscountTestWithSpecificTimeout()
         {
@@ -131,13 +130,46 @@ public void DiscountTestWithSpecificTimeout()
                 .ExpectTimeoutToBeSetIn<SubmitOrder>((state, span) => span == TimeSpan.FromDays(7))
                 .When(s => s.Handle(new SubmitOrder {Total = 200}));
         }
+
         [Test]
         public void TestNullReferenceException()
         {
             Test.Initialize();
             var saga = new MySaga();
             Assert.DoesNotThrow(() => Test.Saga(saga));
         }
+
+        [Test]
+        public void ShouldFailExpectForwardCurrentMessageToIfMessageForwardedToUnexpectedDestination()
+        {
+            Assert.Throws<Exception>(() => Test.Saga<MySaga>()
+                .ExpectForwardCurrentMessageTo(dest => dest == "expectedDestination")
+                .When(s => s.Handle(new StartsSaga())));
+        }
+
+        [Test]
+        public void ShouldPassExpectForwardCurrentMessageToIfMessageForwardedToExpectedDestination()
+        {
+            Test.Saga<MySaga>()
+                .ExpectForwardCurrentMessageTo(dest => dest == "forwardingDestination")
+                .When(s => s.Handle(new StartsSaga()));
+        }
+
+        [Test]
+        public void ShouldFailExpectNotForwardCurrentMessageToIfMessageForwardedToExpectedDestination()
+        {
+            Assert.Throws<Exception>(() => Test.Saga<MySaga>()
+                .ExpectNotForwardCurrentMessageTo(dest => dest == "forwardingDestination")
+                .When(s => s.Handle(new StartsSaga())));
+        }
+
+        [Test]
+        public void ShouldPassExpectNotForwardCurrentMessageToIfMessageForwardedToUnexpectedDestination()
+        {
+            Test.Saga<MySaga>()
+                .ExpectNotForwardCurrentMessageTo(dest => dest == "expectedDestination")
+                .When(s => s.Handle(new StartsSaga()));
+        }
     }
 
 
@@ -198,6 +230,7 @@ public void Handle(StartsSaga message)
             ReplyToOriginator(new ResponseToOriginator());
             Bus.Publish<Event>();
             Bus.Send<Command>(null);
+            Bus.ForwardCurrentMessageTo("forwardingDestination");
             RequestTimeout(TimeSpan.FromDays(7), message);
         }