Fixing delegate tests

Adding all required Unity dlls so we can test them properly
ayende · Sep 9, 2009 · 7ba05f5 · 7ba05f5
1 parent 45dcef6
commit 7ba05f5
Show file tree

Hide file tree

Showing 6 changed files with 6,166 additions and 5 deletions.
diff --git a/Rhino.Mocks.Tests/MockingDelegatesTests.cs b/Rhino.Mocks.Tests/MockingDelegatesTests.cs
@@ -57,16 +57,17 @@ public void SetUp()
         public void CallingMockedDelegatesWithoutOn()
         {
             ObjectDelegateWithNoParams d1 = (ObjectDelegateWithNoParams)mocks.StrictMock(typeof(ObjectDelegateWithNoParams));
-            //Expect.Call(d1()).Return(1);
+            Expect.Call(d1()).Return(1);
 
-            //mocks.ReplayAll();
+            mocks.ReplayAll();
 
-            //Assert.AreEqual(1, d1());
+            Assert.AreEqual(1, d1());
         }
 
         [Test]
         public void MockTwoDelegatesWithTheSameName()
         {
+            SetUp();
             ObjectDelegateWithNoParams d1 = (ObjectDelegateWithNoParams)mocks.StrictMock(typeof(ObjectDelegateWithNoParams));
             Tests.ObjectDelegateWithNoParams d2 = (Tests.ObjectDelegateWithNoParams)mocks.StrictMock(typeof(Tests.ObjectDelegateWithNoParams));
 

diff --git a/Rhino.Mocks/MockRepository.cs b/Rhino.Mocks/MockRepository.cs
@@ -783,11 +783,12 @@ private object MockDelegate(CreateMockState mockStateFactory, Type type)
             RhinoInterceptor interceptor = new RhinoInterceptor(this, proxyInstance);
 
             Type[] types = new Type[] { typeof(IMockedObject) };
+            var delegateTargetInterface = delegateTargetInterfaceCreator.GetDelegateTargetInterface(type);
             object target = GetProxyGenerator(type).CreateInterfaceProxyWithoutTarget(
-                delegateTargetInterfaceCreator.GetDelegateTargetInterface(type),
+                delegateTargetInterface,
                 types, proxyGenerationOptions, interceptor);
 
-            proxy = Delegate.CreateDelegate(type, target, "Invoke");
+            proxy = Delegate.CreateDelegate(type, target, delegateTargetInterface.Name+ ".Invoke");
             delegateProxies.Add(target, proxy);
 
             IMockState value = mockStateFactory(GetMockedObject(proxy));

diff --git a/SharedLibs/Microsoft.Practices.ObjectBuilder2.dll b/SharedLibs/Microsoft.Practices.ObjectBuilder2.dll