From f01987327a0ca8b9e787d2025922f810cf9345e3 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Wed, 14 Jul 2010 00:45:14 -0700
Subject: [PATCH] Fix Unit Tests

--HG--
branch : dev
---
 .../Environment/State/DefaultProcessingEngineTests.cs    | 4 +++-
 .../Utility/Extensions/StringExtensionsTests.cs          | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
index 55ed31bdf..06af55624 100644
--- a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
+++ b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Autofac;
 using Moq;
 using NUnit.Framework;
@@ -66,7 +67,8 @@ namespace Orchard.Tests.Environment.State {
         [Test]
         public void CallingExecuteCausesEventToFireAndPendingFlagToBeCleared() {
             _container.Mock<IEventBus>()
-                .Setup(x => x.Notify(It.IsAny<string>(), It.IsAny<Dictionary<string, object>>()));
+                .Setup(x => x.Notify(It.IsAny<string>(), It.IsAny<IDictionary<string, object>>()))
+                .Returns(Enumerable.Empty<object>());
 
             var engine = _container.Resolve<IProcessingEngine>();
             var pending1 = engine.AreTasksPending();
diff --git a/src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs b/src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs
index d609c2ccb..2d5d3de90 100644
--- a/src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs
+++ b/src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs
@@ -28,16 +28,19 @@ namespace Orchard.Tests.Utility.Extensions {
         [Test]
         public void OrDefault_ReturnsDefaultForNull() {
             const string s = null;
-            Assert.That(s.OrDefault(new LocalizedString("test")), Is.SameAs("test"));
+            var def = new LocalizedString("test");
+            Assert.That(s.OrDefault(def).Text, Is.SameAs("test"));
         }
         [Test]
         public void OrDefault_ReturnsDefault() {
-            Assert.That("".OrDefault(new LocalizedString("test")), Is.SameAs("test"));
+            var def = new LocalizedString("test");
+            Assert.That("".OrDefault(def).Text, Is.SameAs("test"));
         }
 
         [Test]
         public void OrDefault_ReturnsString() {
-            Assert.That("bar".OrDefault(new LocalizedString("test")), Is.SameAs("bar"));
+            var def = new LocalizedString("test");
+            Assert.That("bar".OrDefault(def).Text, Is.SameAs("bar"));
         }
         [Test]
         public void IsNullOrEmptyTrimmed_EmptyStringReturnsTrue() {