Index: Rhino.Mocks.Tests/BeforeExtensionMethodTest.cs =================================================================== --- Rhino.Mocks.Tests/BeforeExtensionMethodTest.cs (revision 0) +++ Rhino.Mocks.Tests/BeforeExtensionMethodTest.cs (revision 0) @@ -0,0 +1,47 @@ +#if DOTNET35 +using MbUnit.Framework; +using Rhino.Mocks.Exceptions; + +namespace Rhino.Mocks.Tests +{ + [TestFixture] public class BeforeExtensionMethodTest + { + public interface IBefore + { + void MethodBefore(); + } + + public interface IAfter + { + void MethodAfter(); + } + + [Test] public void Before_succeeds_if_beforeCalls_occured_before_afterCalls() + { + var mockBefore = MockRepository.GenerateStub(); + var mockAfter = MockRepository.GenerateStub(); + mockBefore.MethodBefore(); + mockBefore.MethodBefore(); + mockAfter.MethodAfter(); + mockAfter.MethodAfter(); + mockAfter.MethodAfter(); + mockBefore.AssertWasCalled(b => b.MethodBefore()) + .Before(mockAfter.AssertWasCalled(a => a.MethodAfter())); + } + + [ExpectedException(typeof(ExpectationViolationException))] + [Test] public void Before_chokes_if_one_of_beforeCalls_occured_after_any_of_afterCalls() + { + var mockBefore = MockRepository.GenerateStub(); + var mockAfter = MockRepository.GenerateStub(); + mockBefore.MethodBefore(); + mockAfter.MethodAfter(); + mockBefore.MethodBefore(); + mockAfter.MethodAfter(); + mockAfter.MethodAfter(); + mockBefore.AssertWasCalled(b => b.MethodBefore()) + .Before(mockAfter.AssertWasCalled(a => a.MethodAfter())); + } + } +} +#endif Index: Rhino.Mocks.Tests/Rhino.Mocks.Tests 3.5.csproj =================================================================== --- Rhino.Mocks.Tests/Rhino.Mocks.Tests 3.5.csproj (revision 2212) +++ Rhino.Mocks.Tests/Rhino.Mocks.Tests 3.5.csproj (working copy) @@ -117,6 +117,7 @@ + Code Index: Rhino.Mocks/CallRecord.cs =================================================================== --- Rhino.Mocks/CallRecord.cs (revision 0) +++ Rhino.Mocks/CallRecord.cs (revision 0) @@ -0,0 +1,23 @@ +using System.Reflection; +using System.Threading; +using Rhino.Mocks.Interfaces; + +namespace Rhino.Mocks +{ + /// + /// Record about information of a specific method invokation + /// + public class CallRecord + { + private static long sequencer = long.MinValue; + + internal CallRecord() + { + Sequence = Interlocked.Increment(ref sequencer); + } + internal object[] Arguments { get; set; } + internal long Sequence { get; private set; } + internal MethodInfo Method { get; set; } + internal IMockedObject MockObject { get; set; } + } +} \ No newline at end of file Index: Rhino.Mocks/ExpectationVerificationInformation.cs =================================================================== --- Rhino.Mocks/ExpectationVerificationInformation.cs (revision 2212) +++ Rhino.Mocks/ExpectationVerificationInformation.cs (working copy) @@ -10,6 +10,23 @@ private IList argumentsForAllCalls; public IExpectation Expected { get { return expected; } set { expected = value; } } - public IList ArgumentsForAllCalls { get { return argumentsForAllCalls; } set { argumentsForAllCalls = value; } } + public ICollection AllCallRecords { get; set; } + public IList ArgumentsForAllCalls + { + get + { + if (argumentsForAllCalls==null) + { + var allCalls = AllCallRecords; + var a = new List(allCalls.Count); + foreach (var call in allCalls) + { + a.Add(call.Arguments); + } + argumentsForAllCalls = a; + } + return argumentsForAllCalls; + } + } } } Index: Rhino.Mocks/Impl/ProxyInstance.cs =================================================================== --- Rhino.Mocks/Impl/ProxyInstance.cs (revision 2212) +++ Rhino.Mocks/Impl/ProxyInstance.cs (working copy) @@ -51,7 +51,7 @@ private IDictionary eventsSubscribers; private readonly Type[] implemented; - private readonly IDictionary> methodToActualCalls = new Dictionary>(); + private readonly IDictionary> methodToActualCalls = new Dictionary>(); private object[] constructorArguments = new object[0]; private IList dependentMocks = new List(); @@ -284,10 +284,10 @@ /// /// Only method calls in replay mode are counted /// - public ICollection GetCallArgumentsFor(MethodInfo method) + public ICollection GetCallArgumentsFor(MethodInfo method) { if (methodToActualCalls.ContainsKey(method) == false) - return new List(); + return new List(); return methodToActualCalls[method]; } @@ -302,8 +302,12 @@ if(repository.IsInReplayMode(this)==false) return; if (methodToActualCalls.ContainsKey(method) == false) - methodToActualCalls[method] = new List(); - methodToActualCalls[method].Add(args); + methodToActualCalls[method] = new List(); + methodToActualCalls[method].Add(new CallRecord{ + Arguments = args, + Method = method, + MockObject = this, + }); } /// Index: Rhino.Mocks/Interfaces/IMockedObject.cs =================================================================== --- Rhino.Mocks/Interfaces/IMockedObject.cs (revision 2212) +++ Rhino.Mocks/Interfaces/IMockedObject.cs (working copy) @@ -128,7 +128,7 @@ /// /// Only method calls in replay mode are counted /// - ICollection GetCallArgumentsFor(MethodInfo method); + ICollection GetCallArgumentsFor(MethodInfo method); /// /// Records the method call Index: Rhino.Mocks/Rhino.Mocks 3.5.csproj =================================================================== --- Rhino.Mocks/Rhino.Mocks 3.5.csproj (revision 2212) +++ Rhino.Mocks/Rhino.Mocks 3.5.csproj (working copy) @@ -52,7 +52,7 @@ true false false - false + true 4 pdbonly Rhino.Mocks.XML @@ -77,6 +77,7 @@ + Code Index: Rhino.Mocks/RhinoMocksExtensions.cs =================================================================== --- Rhino.Mocks/RhinoMocksExtensions.cs (revision 2212) +++ Rhino.Mocks/RhinoMocksExtensions.cs (working copy) @@ -213,9 +213,9 @@ /// /// The mock. /// The action. - public static void AssertWasCalled(this T mock, Action action) + public static IList AssertWasCalled(this T mock, Action action) { - AssertWasCalled(mock, action, DefaultConstraintSetup); + return AssertWasCalled(mock, action, DefaultConstraintSetup); } private static void DefaultConstraintSetup(IMethodOptions options) @@ -230,19 +230,20 @@ /// The mock. /// The action. /// The setup constraints. - public static void AssertWasCalled(this T mock, Action action, Action> setupConstraints) + public static IList AssertWasCalled(this T mock, Action action, Action> setupConstraints) { ExpectationVerificationInformation verificationInformation = GetExpectationsToVerify(mock, action, setupConstraints); - - foreach (var args in verificationInformation.ArgumentsForAllCalls) + List records = new List(); + foreach (var record in verificationInformation.AllCallRecords) { - if (verificationInformation.Expected.IsExpected(args)) + if (verificationInformation.Expected.IsExpected(record.Arguments)) { verificationInformation.Expected.AddActualCall(); + records.Add(record); } } if (verificationInformation.Expected.ExpectationSatisfied) - return; + return records; throw new ExpectationViolationException(verificationInformation.Expected.BuildVerificationFailureMessage()); } @@ -253,10 +254,10 @@ /// /// The mock. /// The action. - public static void AssertWasCalled(this T mock, Func action) + public static IList AssertWasCalled(this T mock, Func action) { var newAction = new Action(t => action(t)); - AssertWasCalled(mock, newAction, DefaultConstraintSetup); + return AssertWasCalled(mock, newAction, DefaultConstraintSetup); } /// @@ -267,10 +268,10 @@ /// The mock. /// The action. /// The setup constraints. - public static void AssertWasCalled(this T mock, Func action, Action> setupConstraints) + public static IList AssertWasCalled(this T mock, Func action, Action> setupConstraints) { var newAction = new Action(t => action(t)); - AssertWasCalled(mock, newAction, setupConstraints); + return AssertWasCalled(mock, newAction, setupConstraints); } @@ -361,10 +362,10 @@ throw new InvalidOperationException( "The expectation was removed from the waiting expectations list, did you call Repeat.Any() ? This is not supported in AssertWasCalled()"); IExpectation expected = expectationsToVerify[0]; - ICollection argumentsForAllCalls = mockedObject.GetCallArgumentsFor(expected.Method); + ICollection argumentsForAllCalls = mockedObject.GetCallArgumentsFor(expected.Method); return new ExpectationVerificationInformation { - ArgumentsForAllCalls = new List(argumentsForAllCalls), + AllCallRecords = new List(argumentsForAllCalls), Expected = expected }; } @@ -449,6 +450,51 @@ eventRaiser.Raise(args); } + /// + /// Assert that all calls specified by + /// happened before all calls specified by + /// + /// + /// Calls that happens before + /// + /// + /// Calls that happens after + /// + public static void Before(this IList beforeCalls, IList afterCalls) + { + long maxBefore = long.MinValue; + CallRecord latestBeforeCall = null; + foreach (var call in beforeCalls) + { + var sequence = call.Sequence; + if (sequence > maxBefore) + { + maxBefore = sequence; + latestBeforeCall = call; + } + } + + long minAfter = long.MaxValue; + CallRecord earliestAfterCall = null; + foreach (var call in afterCalls) + { + var sequence = call.Sequence; + if (sequence < minAfter) + { + minAfter = sequence; + earliestAfterCall = call; + } + } + if (maxBefore>minAfter) + { + throw new ExpectationViolationException( + "Expected that calls to " + latestBeforeCall.Method + + " occurs before " + earliestAfterCall.Method + + ", but the expectation is not satisfied."); + + } + } + private static void AssertExactlySingleExpectaton(MockRepository mocks, T mockToRecordExpectation) { if (mocks.Replayer.GetAllExpectationsForProxy(mockToRecordExpectation).Count == 0)