Index: Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs =================================================================== diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs (.../TreeNodeInfo.cs) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891) +++ Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs (.../TreeNodeInfo.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -352,8 +352,8 @@ ? tag => treeNodeInfo.CanCheck((TData) tag) : (Func) null, CheckedState = treeNodeInfo.CheckedState != null - ? tag => treeNodeInfo.CheckedState((TData) tag) - : (Func) null, + ? tag => treeNodeInfo.CheckedState((TData) tag) + : (Func) null, OnNodeChecked = treeNodeInfo.OnNodeChecked != null ? (tag, parentTag) => treeNodeInfo.OnNodeChecked((TData) tag, parentTag) : (Action) null, Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs =================================================================== diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891) +++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -1024,7 +1024,7 @@ bool isOnCheckBox = IsOnCheckBox(point); if (treeNodeInfo.CanCheck != null && treeNodeInfo.CanCheck(clickedNode.Tag) && isOnCheckBox) { - clickedNode.Checked = !clickedNode.Checked; + clickedNode.Checked = !clickedNode.Checked; } } Index: Core/Common/test/Core.Common.Base.Test/CloneableObservableTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Base.Test/CloneableObservableTest.cs (.../CloneableObservableTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Base.Test/CloneableObservableTest.cs (.../CloneableObservableTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -56,7 +56,10 @@ object clone = original.Clone(); // Assert - CoreCloneAssert.AreObjectClones(original, clone, (o, c) => { CollectionAssert.IsEmpty(c.Observers); }); + CoreCloneAssert.AreObjectClones(original, clone, (o, c) => + { + CollectionAssert.IsEmpty(c.Observers); + }); mocks.VerifyAll(); } Index: Core/Common/test/Core.Common.Base.Test/ObserverTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -33,8 +33,11 @@ var counter = 0; // Call - using (var observer = new Observer(() => { counter++; })) + using (var observer = new Observer(() => { + counter++; + })) + { // Assert Assert.IsInstanceOf(observer); Assert.IsNull(observer.Observable); Index: Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs (.../RecursiveObserverTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs (.../RecursiveObserverTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -34,8 +34,11 @@ var counter = 0; // Call - using (var recursiveObserver = new RecursiveObserver(() => { counter++; }, GetChildren)) + using (var recursiveObserver = new RecursiveObserver(() => { + counter++; + }, GetChildren)) + { // Assert Assert.IsInstanceOf(recursiveObserver); Assert.IsNull(recursiveObserver.Observable); Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -280,16 +280,28 @@ new object() }, CanRename = (o1, o2) => true, - OnNodeRenamed = (o, newName) => { onNodeRenamedCounter++; }, + OnNodeRenamed = (o, newName) => + { + onNodeRenamedCounter++; + }, CanRemove = (o1, o2) => true, - OnNodeRemoved = (o1, o2) => { onNodeRemovedCounter++; }, + OnNodeRemoved = (o1, o2) => + { + onNodeRemovedCounter++; + }, CanCheck = o => true, CheckedState = o => TreeNodeCheckedState.Checked, - OnNodeChecked = (o1, o2) => { onNodeCheckedCounter++; }, + OnNodeChecked = (o1, o2) => + { + onNodeCheckedCounter++; + }, CanDrag = (o1, o2) => true, CanDrop = (o1, o2) => true, CanInsert = (o1, o2) => true, - OnDrop = (o1, o2, o3, index, tvc) => { onDropCounter++; } + OnDrop = (o1, o2, o3, index, tvc) => + { + onDropCounter++; + } }; // Precondition Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs (.../TreeViewControlTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs (.../TreeViewControlTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -1583,7 +1583,10 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - OnNodeChecked = (o, p) => { hit++; } + OnNodeChecked = (o, p) => + { + hit++; + } }; treeViewControl.RegisterTreeNodeInfo(treeNodeInfo); treeViewControl.Data = new object(); @@ -1627,7 +1630,7 @@ CheckedState = o => checkedState }; - var treeView = (System.Windows.Forms.TreeView)treeViewControl.Controls[0]; + var treeView = (System.Windows.Forms.TreeView) treeViewControl.Controls[0]; treeView.Name = identifier; WindowsFormsTestHelper.Show(treeViewControl); Index: Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs =================================================================== diff -u -r444796880375992cac66719b2e542a26cbb5edfe -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision 444796880375992cac66719b2e542a26cbb5edfe) +++ Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -40,11 +40,6 @@ { private MockRepository mocks; - public override void Setup() - { - mocks = new MockRepository(); - } - [Test] public void CreateNewProject_SavedProjectThenNewProject_NewProjectAndPathAreSet() { @@ -1030,6 +1025,11 @@ mocks.VerifyAll(); } + public override void Setup() + { + mocks = new MockRepository(); + } + private static IEnumerable GetExceptions() { const string exceptionMessage = "I am an error message"; Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs (.../TreeViewContextMenuItemFactoryTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs (.../TreeViewContextMenuItemFactoryTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -36,11 +36,6 @@ { private MockRepository mocks; - public override void Setup() - { - mocks = new MockRepository(); - } - [Test] public void Constructor_WithoutDataObject_ThrowsArgumentNullException() { @@ -256,5 +251,10 @@ TestHelper.AssertImagesAreEqual(Resources.CollapseAllIcon, item.Image); Assert.AreEqual(hasChildren, item.Enabled); } + + public override void Setup() + { + mocks = new MockRepository(); + } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs (.../DialogBasedInquiryHelperTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs (.../DialogBasedInquiryHelperTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -36,17 +36,6 @@ private IWin32Window dialogParent; private MockRepository mocks; - public override void Setup() - { - mocks = new MockRepository(); - dialogParent = mocks.StrictMock(); - } - - public override void TearDown() - { - mocks.VerifyAll(); - } - [Test] public void Constructor_WithoutDialogParent_ThrowsArgumentNullException() { @@ -311,5 +300,16 @@ Assert.AreEqual(query, actualQuery); mocks.VerifyAll(); } + + public override void Setup() + { + mocks = new MockRepository(); + dialogParent = mocks.StrictMock(); + } + + public override void TearDown() + { + mocks.VerifyAll(); + } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs (.../MessageWindowTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs (.../MessageWindowTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -36,17 +36,6 @@ { private GuiFormsMessageWindow.MessageWindowLogAppender originalValue; - public override void Setup() - { - originalValue = GuiFormsMessageWindow.MessageWindowLogAppender.Instance; - } - - public override void TearDown() - { - base.TearDown(); - GuiFormsMessageWindow.MessageWindowLogAppender.Instance = originalValue; - } - [Test] public void ParameteredConstructor_ExpectedValues() { @@ -558,6 +547,17 @@ } } + public override void Setup() + { + originalValue = GuiFormsMessageWindow.MessageWindowLogAppender.Instance; + } + + public override void TearDown() + { + base.TearDown(); + GuiFormsMessageWindow.MessageWindowLogAppender.Instance = originalValue; + } + private static void AddMessages(GuiFormsMessageWindow.MessageWindow messageWindow) { messageWindow.AddMessage(Level.Info, new DateTime(), "Info message"); Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -133,7 +133,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestView; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -196,7 +199,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestView; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -253,7 +259,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestViewDerivative; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -292,7 +301,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestView; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -331,7 +343,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestViewDerivative; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -416,7 +431,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestView; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -462,7 +480,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestView; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -515,7 +536,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestView; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -569,7 +593,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + view = invocation.Arguments[0] as TestViewDerivative; + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -877,7 +904,10 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(documentViews); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); }).Repeat.Twice(); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + documentViews.Add(invocation.Arguments[0] as TestView); + }).Repeat.Twice(); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments().Repeat.Twice(); mocks.ReplayAll(); @@ -915,9 +945,15 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(documentViews); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); }).Repeat.Twice(); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + documentViews.Add(invocation.Arguments[0] as TestView); + }).Repeat.Twice(); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments().Repeat.Twice(); - viewHost.Expect(vh => vh.Remove(Arg.Is.NotNull)).WhenCalled(invocation => { documentViews.Remove(invocation.Arguments[0] as TestView); }); + viewHost.Expect(vh => vh.Remove(Arg.Is.NotNull)).WhenCalled(invocation => + { + documentViews.Remove(invocation.Arguments[0] as TestView); + }); mocks.ReplayAll(); @@ -956,9 +992,15 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(documentViews); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); }).Repeat.Twice(); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + documentViews.Add(invocation.Arguments[0] as TestView); + }).Repeat.Twice(); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments().Repeat.Twice(); - viewHost.Expect(vh => vh.Remove(Arg.Is.NotNull)).WhenCalled(invocation => { documentViews.Remove(invocation.Arguments[0] as TestView); }).Repeat.Twice(); + viewHost.Expect(vh => vh.Remove(Arg.Is.NotNull)).WhenCalled(invocation => + { + documentViews.Remove(invocation.Arguments[0] as TestView); + }).Repeat.Twice(); mocks.ReplayAll(); var viewInfos = new ViewInfo[] @@ -1013,9 +1055,15 @@ viewHost.Stub(vh => vh.ViewClosed += null).IgnoreArguments(); viewHost.Stub(vh => vh.ViewClosed -= null).IgnoreArguments(); viewHost.Stub(vh => vh.DocumentViews).Return(documentViews); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { documentViews.Add(invocation.Arguments[0] as TestView); }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => + { + documentViews.Add(invocation.Arguments[0] as TestView); + }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); - viewHost.Expect(vh => vh.Remove(Arg.Is.NotNull)).WhenCalled(invocation => { documentViews.Remove(invocation.Arguments[0] as TestView); }); + viewHost.Expect(vh => vh.Remove(Arg.Is.NotNull)).WhenCalled(invocation => + { + documentViews.Remove(invocation.Arguments[0] as TestView); + }); mocks.ReplayAll(); Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs =================================================================== diff -u -rdfb4f0a3852713c94afdf2d51bb616b9991fde4e -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs (.../TestHelperTest.cs) (revision dfb4f0a3852713c94afdf2d51bb616b9991fde4e) +++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs (.../TestHelperTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -208,7 +208,7 @@ Assert.IsTrue(Directory.Exists(path)); path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.IO); Assert.IsTrue(Directory.Exists(path)); - + path = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO); Assert.IsTrue(Directory.Exists(path)); @@ -632,7 +632,10 @@ // Setup const string someMessage = "Exception"; const string differentMessage = "Different"; - TestDelegate t = () => { throw new ArgumentException(someMessage); }; + TestDelegate t = () => + { + throw new ArgumentException(someMessage); + }; // Call TestDelegate call = () => TestHelper.AssertThrowsArgumentExceptionAndTestMessage(t, differentMessage); @@ -648,7 +651,10 @@ { // Setup const string someMessage = "Exception"; - TestDelegate t = () => { throw new ArgumentException(someMessage, argument); }; + TestDelegate t = () => + { + throw new ArgumentException(someMessage, argument); + }; // Call & Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(t, someMessage); @@ -661,7 +667,10 @@ { // Setup string someMessage = string.Join(Environment.NewLine, "Exception", "second line"); - TestDelegate t = () => { throw new ArgumentException(someMessage, argument); }; + TestDelegate t = () => + { + throw new ArgumentException(someMessage, argument); + }; // Call & Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(t, someMessage); @@ -674,7 +683,10 @@ const string someMessage = "Exception"; var argumentException = new ArgumentException(someMessage); - TestDelegate t = () => { throw argumentException; }; + TestDelegate t = () => + { + throw argumentException; + }; // Call var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(t, someMessage); Index: Core/Common/test/Core.Common.TestUtil.Test/WindowsFormsTestHelperTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.TestUtil.Test/WindowsFormsTestHelperTest.cs (.../WindowsFormsTestHelperTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.TestUtil.Test/WindowsFormsTestHelperTest.cs (.../WindowsFormsTestHelperTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -35,7 +35,10 @@ var form = new Form(); var callCount = 0; - WindowsFormsTestHelper.Show(form, delegate { callCount++; }); + WindowsFormsTestHelper.Show(form, delegate + { + callCount++; + }); Assert.AreEqual(1, callCount); @@ -48,7 +51,10 @@ var uc = new UserControl(); var callCount = 0; - WindowsFormsTestHelper.Show(uc, delegate { callCount++; }); + WindowsFormsTestHelper.Show(uc, delegate + { + callCount++; + }); Assert.AreEqual(1, callCount); @@ -61,7 +67,10 @@ var form = new Form(); var callCount = 0; - WindowsFormsTestHelper.Show(form, delegate { callCount++; }); + WindowsFormsTestHelper.Show(form, delegate + { + callCount++; + }); Assert.AreEqual(1, callCount); @@ -105,7 +114,10 @@ { var callCount = 0; - WindowsFormsTestHelper.ShowModal(new Form(), delegate { callCount++; }); + WindowsFormsTestHelper.ShowModal(new Form(), delegate + { + callCount++; + }); Assert.AreEqual(1, callCount); } @@ -116,7 +128,10 @@ var callCount = 0; var form = new Form(); - form.Shown += delegate { callCount++; }; + form.Shown += delegate + { + callCount++; + }; WindowsFormsTestHelper.ShowModal(form); @@ -128,7 +143,10 @@ { // Setup var form = new Form(); - form.Shown += delegate { Assert.Fail(); }; + form.Shown += delegate + { + Assert.Fail(); + }; // Call TestDelegate call = () => WindowsFormsTestHelper.ShowModal(form); Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs =================================================================== diff -u -r7cccf01a440147650e4b26354de5035b4ed5f608 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 7cccf01a440147650e4b26354de5035b4ed5f608) +++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -561,7 +561,10 @@ }; var timerEnded = false; - timer.Elapsed += (sender, args) => { timerEnded = true; }; + timer.Elapsed += (sender, args) => + { + timerEnded = true; + }; callAction(); timer.Start(); Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -160,8 +160,14 @@ SetStyle(ControlStyles.SupportsTransparentBackColor, true); - Paint += delegate { wasShown = true; }; - VisibleChanged += delegate { wasShown = true; }; + Paint += delegate + { + wasShown = true; + }; + VisibleChanged += delegate + { + wasShown = true; + }; Show(); @@ -170,8 +176,14 @@ private void ShowTopLevelControl(Control control, bool modal) { - control.Paint += delegate { wasShown = true; }; - control.VisibleChanged += delegate { wasShown = true; }; + control.Paint += delegate + { + wasShown = true; + }; + control.VisibleChanged += delegate + { + wasShown = true; + }; control.Show(); @@ -234,7 +246,10 @@ AddAllNodes(treeView1.Nodes, itemsToShow); - treeView1.NodeMouseClick += delegate { PropertyGrid.SelectedObject = treeView1.SelectedNode.Tag; }; + treeView1.NodeMouseClick += delegate + { + PropertyGrid.SelectedObject = treeView1.SelectedNode.Tag; + }; } private static void AddAllNodes(TreeNodeCollection nodes, IEnumerable itemsToShow) Index: Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs (.../WpfTestHelper.xaml.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs (.../WpfTestHelper.xaml.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -127,7 +127,10 @@ private void ShowControlInTestForm(bool modal) { - IsVisibleChanged += delegate { wasShown = true; }; + IsVisibleChanged += delegate + { + wasShown = true; + }; Show(); @@ -156,7 +159,10 @@ wasShown = true; } }; - window.ContentRendered += delegate { wasShown = true; }; + window.ContentRendered += delegate + { + wasShown = true; + }; window.Show(); Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs =================================================================== diff -u -rdf4b8185584046d57926f8be9b6e8fc86cda1711 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs (.../WmtsLocationControlTest.cs) (revision df4b8185584046d57926f8be9b6e8fc86cda1711) +++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs (.../WmtsLocationControlTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -58,19 +58,6 @@ private ITileSourceFactory tileFactory; private IWmtsCapabilityFactory wmtsCapabilityFactory; - public override void Setup() - { - mockRepository = new MockRepository(); - tileFactory = mockRepository.StrictMock(); - wmtsCapabilityFactory = mockRepository.StrictMock(); - } - - public override void TearDown() - { - mockRepository.VerifyAll(); - base.TearDown(); - } - [Test] public void Constructor_WmtsCapabilityFactoryNull_ThrowArgumentNullException() { @@ -896,6 +883,19 @@ } } + public override void Setup() + { + mockRepository = new MockRepository(); + tileFactory = mockRepository.StrictMock(); + wmtsCapabilityFactory = mockRepository.StrictMock(); + } + + public override void TearDown() + { + mockRepository.VerifyAll(); + base.TearDown(); + } + private static WmtsCapability CreateWmtsCapability(ITileSource tileSource) { var wmtsTileSchema = (WmtsTileSchema) tileSource.Schema; Index: Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs =================================================================== diff -u -rdf4b8185584046d57926f8be9b6e8fc86cda1711 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs (.../MapDataCollectionTest.cs) (revision df4b8185584046d57926f8be9b6e8fc86cda1711) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs (.../MapDataCollectionTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -128,7 +128,7 @@ // Precondition Assert.IsFalse(nestedCollection.IsVisible); - + // Call bool isVisible = collection.IsVisible; @@ -268,7 +268,7 @@ { var nestedCollection = new MapDataCollection("test"); nestedCollection.Add(new TestMapData()); - nestedCollection .Add(new TestMapData + nestedCollection.Add(new TestMapData { IsVisible = false }); Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs =================================================================== diff -u -r54d2453c0bea232c1c507ef9996143e6af8e3a61 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs (.../ChartLegendView.cs) (revision 54d2453c0bea232c1c507ef9996143e6af8e3a61) +++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs (.../ChartLegendView.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -115,7 +115,7 @@ ChildNodeObjects = ChartDataContextGetChildNodeObjects, CanDrag = (context, o) => !(context.WrappedData is ChartMultipleAreaData), CanCheck = context => !(context.WrappedData is ChartDataCollection), - CheckedState = context => context.WrappedData.IsVisible ? TreeNodeCheckedState.Checked : TreeNodeCheckedState.Unchecked, + CheckedState = context => context.WrappedData.IsVisible ? TreeNodeCheckedState.Checked : TreeNodeCheckedState.Unchecked, OnNodeChecked = ChartDataContextOnNodeChecked, CanDrop = ChartDataContextCanDropAndInsert, CanInsert = ChartDataContextCanDropAndInsert, Index: Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapPointDataContext.cs =================================================================== diff -u -r54d2453c0bea232c1c507ef9996143e6af8e3a61 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapPointDataContext.cs (.../MapPointDataContext.cs) (revision 54d2453c0bea232c1c507ef9996143e6af8e3a61) +++ Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapPointDataContext.cs (.../MapPointDataContext.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -36,7 +36,7 @@ /// The parent /// the belongs to. /// Thrown when any parameter is null. - public MapPointDataContext(MapPointData wrappedData, MapDataCollectionContext parentMapData) + public MapPointDataContext(MapPointData wrappedData, MapDataCollectionContext parentMapData) : base(wrappedData, parentMapData) {} } } \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/FeatureBasedMapDataContextTreeNodeInfoTest.cs =================================================================== diff -u -r6ad1923251c39f361b8ba43addbcfdf148bbaf57 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/FeatureBasedMapDataContextTreeNodeInfoTest.cs (.../FeatureBasedMapDataContextTreeNodeInfoTest.cs) (revision 6ad1923251c39f361b8ba43addbcfdf148bbaf57) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/FeatureBasedMapDataContextTreeNodeInfoTest.cs (.../FeatureBasedMapDataContextTreeNodeInfoTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -227,7 +227,7 @@ mocks.VerifyAll(); } - [Test] + [Test] public void CanRemove_WithRemovableDataAndCollection_ReturnTrue() { // Setup Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -r6ad1923251c39f361b8ba43addbcfdf148bbaf57 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs (.../MapDataCollectionContextTreeNodeInfoTest.cs) (revision 6ad1923251c39f361b8ba43addbcfdf148bbaf57) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs (.../MapDataCollectionContextTreeNodeInfoTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -57,27 +57,6 @@ private TreeNodeInfo info; private IContextMenuBuilderProvider contextMenuBuilderProvider; - public override void Setup() - { - mocks = new MockRepository(); - contextMenuBuilderProvider = mocks.Stub(); - mocks.ReplayAll(); - - mapLegendView = new MapLegendView(contextMenuBuilderProvider); - - var treeViewControl = TypeUtils.GetField(mapLegendView, "treeViewControl"); - var treeNodeInfoLookup = TypeUtils.GetField>(treeViewControl, "tagTypeTreeNodeInfoLookup"); - - info = treeNodeInfoLookup[typeof(MapDataCollectionContext)]; - } - - public override void TearDown() - { - mapLegendView.Dispose(); - - mocks.VerifyAll(); - } - [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -149,7 +128,7 @@ CollectionAssert.AreEqual(new MapDataContext[] { new MapPolygonDataContext(mapPolygonData, parentCollectionContext), - GetContext(nestedCollection, parentCollectionContext), + GetContext(nestedCollection, parentCollectionContext), new MapLineDataContext(mapLineData, parentCollectionContext), new MapPointDataContext(mapPointData, parentCollectionContext) }, objects); @@ -459,7 +438,7 @@ MapDataCollectionContext parentContext = GetContext(parentMapDataCollection); MapDataCollectionContext context = GetContext(mapDataCollection1); - + parentMapDataCollection.Attach(observer); using (var treeViewControl = new TreeViewControl()) @@ -653,7 +632,7 @@ }; var mapDataCollection = new MapDataCollection("test data"); mapDataCollection.Add(featureBasedMapData); - + using (var treeViewControl = new TreeViewControl()) { var builder = new CustomItemsOnlyContextMenuBuilder(); @@ -730,6 +709,27 @@ } } + public override void Setup() + { + mocks = new MockRepository(); + contextMenuBuilderProvider = mocks.Stub(); + mocks.ReplayAll(); + + mapLegendView = new MapLegendView(contextMenuBuilderProvider); + + var treeViewControl = TypeUtils.GetField(mapLegendView, "treeViewControl"); + var treeNodeInfoLookup = TypeUtils.GetField>(treeViewControl, "tagTypeTreeNodeInfoLookup"); + + info = treeNodeInfoLookup[typeof(MapDataCollectionContext)]; + } + + public override void TearDown() + { + mapLegendView.Dispose(); + + mocks.VerifyAll(); + } + private static MapDataCollectionContext GetContext(MapDataCollection mapDataCollection, MapDataCollectionContext parentMapDataCollectionContext = null) { return new MapDataCollectionContext(mapDataCollection, parentMapDataCollectionContext ?? new MapDataCollectionContext(new MapDataCollection("test"), null)); Index: Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs =================================================================== diff -u -r6ad1923251c39f361b8ba43addbcfdf148bbaf57 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision 6ad1923251c39f361b8ba43addbcfdf148bbaf57) +++ Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -35,7 +35,6 @@ using Core.Common.Gui.TestUtil; using Core.Common.Util.Reflection; using Core.Components.DotSpatial.Forms; -using Core.Components.Gis.Data; using Core.Components.Gis.Forms; using Core.Plugins.Map.Legend; using Core.Plugins.Map.PresentationObjects; Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs =================================================================== diff -u -r6ad1923251c39f361b8ba43addbcfdf148bbaf57 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 --- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs (.../MapDataContextTest.cs) (revision 6ad1923251c39f361b8ba43addbcfdf148bbaf57) +++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs (.../MapDataContextTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) @@ -46,7 +46,7 @@ private class TestMapDataContext : MapDataContext { - public TestMapDataContext(MapData wrappedData) + public TestMapDataContext(MapData wrappedData) : base(wrappedData) {} public override MapDataCollectionContext ParentMapData { get; }