Index: Core/Common/test/Core.Common.Controls.Test/PresentationObjects/ObservableWrappedObjectContextBaseTest.cs =================================================================== diff -u -r817593259f188dfd979b6fa7a266ca87093b652f -r7eb571b4d12d03ff53c6d66b7a596160b37fca9e --- Core/Common/test/Core.Common.Controls.Test/PresentationObjects/ObservableWrappedObjectContextBaseTest.cs (.../ObservableWrappedObjectContextBaseTest.cs) (revision 817593259f188dfd979b6fa7a266ca87093b652f) +++ Core/Common/test/Core.Common.Controls.Test/PresentationObjects/ObservableWrappedObjectContextBaseTest.cs (.../ObservableWrappedObjectContextBaseTest.cs) (revision 7eb571b4d12d03ff53c6d66b7a596160b37fca9e) @@ -49,25 +49,14 @@ } [Test] - public void Observers_WhenAttachingObserver_ContainsExpectedObserver() + public void Observers_ValidWrappedObjectInstance_ReturnsObserversOfWrappedObject() { // Setup - var mocks = new MockRepository(); var sourceObject = new SimpleObservable(new object()); var context = new SimpleObservableWrappedObjectContext(sourceObject); - var observer = mocks.Stub(); - context.Attach(observer); - - mocks.ReplayAll(); - - // Call - IEnumerable observers = context.Observers; - - // Assert - Assert.AreSame(observer, observers.Single()); - - mocks.VerifyAll(); + // Call & Assert + Assert.AreSame(sourceObject.Observers, context.Observers); } [Test] Index: Core/Common/test/Core.Common.Data.TestUtil.Test/CoreCloneAssertTest.cs =================================================================== diff -u -r817593259f188dfd979b6fa7a266ca87093b652f -r7eb571b4d12d03ff53c6d66b7a596160b37fca9e --- Core/Common/test/Core.Common.Data.TestUtil.Test/CoreCloneAssertTest.cs (.../CoreCloneAssertTest.cs) (revision 817593259f188dfd979b6fa7a266ca87093b652f) +++ Core/Common/test/Core.Common.Data.TestUtil.Test/CoreCloneAssertTest.cs (.../CoreCloneAssertTest.cs) (revision 7eb571b4d12d03ff53c6d66b7a596160b37fca9e) @@ -246,7 +246,7 @@ } [Test] - public void AreEnumerationClones_ObservableObjectDifferentObservers_DoesNotThrow() + public void AreEnumerationClones_ObservableListDifferentObservers_DoesNotThrow() { // Setup var cloneableObservableList = new CloneableObservableList(); @@ -263,17 +263,17 @@ } [Test] - public void AreEnumerationClones_ObservableObjectSameObservers_ThrowsAssertionException() + public void AreEnumerationClones_ObservableListSameObservers_ThrowsAssertionException() { // Setup - var cloneableObservableList = new TestCloneableObservableList(); - var clonedCloneableObservableList = (TestCloneableObservableList) cloneableObservableList.Clone(); + var observableList = new TestObservableList(); + var clonedObservableList = (TestObservableList) observableList.Clone(); // Precondition - Assert.IsTrue(ReferenceEquals(cloneableObservableList.Observers, clonedCloneableObservableList.Observers)); + Assert.IsTrue(ReferenceEquals(observableList.Observers, clonedObservableList.Observers)); // Call - TestDelegate test = () => CoreCloneAssert.AreEnumerationClones(cloneableObservableList, clonedCloneableObservableList, (original, clone) => {}); + TestDelegate test = () => CoreCloneAssert.AreEnumerationClones(observableList, clonedObservableList, (original, clone) => {}); // Assert Assert.Throws(test); @@ -287,9 +287,9 @@ } } - private class TestCloneableObservableList : CloneableObservableList + private class TestObservableList : ObservableList, ICloneable { - public new object Clone() + public object Clone() { return MemberwiseClone(); }