Index: Core/Common/test/Core.Common.Base.Test/CloneableObservableTest.cs =================================================================== diff -u -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Base.Test/CloneableObservableTest.cs (.../CloneableObservableTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) +++ Core/Common/test/Core.Common.Base.Test/CloneableObservableTest.cs (.../CloneableObservableTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -56,10 +56,7 @@ 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/Geometry/Point3DExtensionsTest.cs =================================================================== diff -u -rca9659ebb5fefd1a32d8b665261ffb136c718297 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Base.Test/Geometry/Point3DExtensionsTest.cs (.../Point3DExtensionsTest.cs) (revision ca9659ebb5fefd1a32d8b665261ffb136c718297) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Point3DExtensionsTest.cs (.../Point3DExtensionsTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -76,7 +76,7 @@ double originalZ = new Random(21).NextDouble(); var pointToConvert = new Point3D(1.1, worldYCoordinate, originalZ); - + var startPoint = new Point2D(1.0, 1.0); var endPoint = new Point2D(3.0, 4.0); Index: Core/Common/test/Core.Common.Base.Test/ObserverTest.cs =================================================================== diff -u -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) +++ Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -33,11 +33,8 @@ var counter = 0; // Call - using (var observer = new Observer(() => + using (var observer = new Observer(() => { counter++; })) { - counter++; - })) - { // Assert Assert.IsInstanceOf(observer); Assert.IsNull(observer.Observable); Index: Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs =================================================================== diff -u -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs (.../RecursiveObserverTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) +++ Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs (.../RecursiveObserverTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -34,11 +34,8 @@ var counter = 0; // Call - using (var recursiveObserver = new RecursiveObserver(() => + using (var recursiveObserver = new RecursiveObserver(() => { counter++; }, GetChildren)) { - counter++; - }, GetChildren)) - { // Assert Assert.IsInstanceOf(recursiveObserver); Assert.IsNull(recursiveObserver.Observable); Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs =================================================================== diff -u -r7e233d5b78dacdf3fa81bf2929abcb9427221f87 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision 7e233d5b78dacdf3fa81bf2929abcb9427221f87) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -314,7 +314,7 @@ form.Controls.Add(control); form.Show(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); @@ -325,7 +325,7 @@ int index = control.AddTextBoxColumn(propertyName, headerText, false, autoSizeMode, minimumWidth, format); // Assert - Assert.AreEqual(i+1, dataGridView.ColumnCount); + Assert.AreEqual(i + 1, dataGridView.ColumnCount); var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[i]; Assert.AreEqual(index, columnData.Index); } @@ -404,7 +404,7 @@ form.Controls.Add(control); form.Show(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); @@ -416,7 +416,7 @@ // Assert Assert.AreEqual(i + 1, dataGridView.ColumnCount); - var columnData = (DataGridViewCheckBoxColumn)dataGridView.Columns[i]; + var columnData = (DataGridViewCheckBoxColumn) dataGridView.Columns[i]; Assert.AreEqual(index, columnData.Index); } } @@ -516,7 +516,7 @@ form.Controls.Add(control); form.Show(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); @@ -533,7 +533,7 @@ // Assert Assert.AreEqual(i + 1, dataGridView.ColumnCount); - var columnData = (DataGridViewComboBoxColumn)dataGridView.Columns[i]; + var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[i]; Assert.AreEqual(index, columnData.Index); } } @@ -580,7 +580,7 @@ form.Controls.Add(control); form.Show(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Precondition Assert.AreEqual(0, dataGridView.ColumnCount); @@ -592,7 +592,7 @@ // Assert Assert.AreEqual(i + 1, dataGridView.ColumnCount); - var columnData = (DataGridViewColorColumn)dataGridView.Columns[i]; + var columnData = (DataGridViewColorColumn) dataGridView.Columns[i]; Assert.AreEqual(index, columnData.Index); } } Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs =================================================================== diff -u -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) +++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -280,28 +280,16 @@ 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 -r56d072b8342f3e54ba89124ab918bd1529e257a3 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs (.../TreeViewControlTest.cs) (revision 56d072b8342f3e54ba89124ab918bd1529e257a3) +++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs (.../TreeViewControlTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -1583,10 +1583,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - OnNodeChecked = (o, p) => - { - hit++; - } + OnNodeChecked = (o, p) => { hit++; } }; treeViewControl.RegisterTreeNodeInfo(treeNodeInfo); treeViewControl.Data = new object(); Index: Core/Common/test/Core.Common.Geometry.Test/AdvancedMath2DTest.cs =================================================================== diff -u -red0d7390c14c7d453b3b21800a636de5c16e3ab5 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Geometry.Test/AdvancedMath2DTest.cs (.../AdvancedMath2DTest.cs) (revision ed0d7390c14c7d453b3b21800a636de5c16e3ab5) +++ Core/Common/test/Core.Common.Geometry.Test/AdvancedMath2DTest.cs (.../AdvancedMath2DTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -481,7 +481,7 @@ // Setup Point2D[] outerRing = CreateCustomPolygon(); Point2D[][] innerRings = CreateInnerRings(); - + // Call Point2D interiorPoint = AdvancedMath2D.GetPolygonInteriorPoint(outerRing, innerRings); Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs =================================================================== diff -u -r56d072b8342f3e54ba89124ab918bd1529e257a3 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 56d072b8342f3e54ba89124ab918bd1529e257a3) +++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -133,10 +133,7 @@ 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(); @@ -199,10 +196,7 @@ 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(); @@ -259,10 +253,7 @@ 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(); @@ -301,10 +292,7 @@ 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(); @@ -343,10 +331,7 @@ 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(); @@ -431,10 +416,7 @@ 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(); @@ -480,10 +462,7 @@ 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(); @@ -536,10 +515,7 @@ 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(); @@ -593,10 +569,7 @@ 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(); @@ -904,10 +877,7 @@ 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(); @@ -945,15 +915,9 @@ 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(); @@ -992,15 +956,9 @@ 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[] @@ -1055,15 +1013,9 @@ 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.Gui.Test/Helpers/ExportHelperTest.cs =================================================================== diff -u -r3318b4ee38520ce9232d5514736d071b32e1f9b2 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Gui.Test/Helpers/ExportHelperTest.cs (.../ExportHelperTest.cs) (revision 3318b4ee38520ce9232d5514736d071b32e1f9b2) +++ Core/Common/test/Core.Common.Gui.Test/Helpers/ExportHelperTest.cs (.../ExportHelperTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -40,10 +40,10 @@ [Test] [TestCase(null)] [TestCase("C:/test")] - public void GetFilePath_Always_ReturnsSelectedFilePath (string expectedFilePath) + public void GetFilePath_Always_ReturnsSelectedFilePath(string expectedFilePath) { // Setup - var fileFilterGenerator = new FileFilterGenerator("testExtension", "testDescription"); + var fileFilterGenerator = new FileFilterGenerator("testExtension", "testDescription"); var mocks = new MockRepository(); var inquiryHelper = mocks.StrictMock(); Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs =================================================================== diff -u -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) +++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -160,14 +160,8 @@ SetStyle(ControlStyles.SupportsTransparentBackColor, true); - Paint += delegate - { - wasShown = true; - }; - VisibleChanged += delegate - { - wasShown = true; - }; + Paint += delegate { wasShown = true; }; + VisibleChanged += delegate { wasShown = true; }; Show(); @@ -176,14 +170,8 @@ 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(); @@ -246,10 +234,7 @@ 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 -r5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs (.../WpfTestHelper.xaml.cs) (revision 5d1c27fcd23fe6cb8f12cd7cb78efb567d93d007) +++ Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs (.../WpfTestHelper.xaml.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -127,10 +127,7 @@ private void ShowControlInTestForm(bool modal) { - IsVisibleChanged += delegate - { - wasShown = true; - }; + IsVisibleChanged += delegate { wasShown = true; }; Show(); @@ -159,10 +156,7 @@ wasShown = true; } }; - window.ContentRendered += delegate - { - wasShown = true; - }; + window.ContentRendered += delegate { wasShown = true; }; window.Show(); Index: Core/Common/test/Core.Common.Util.Test/Reflection/AssemblyUtilsTest.cs =================================================================== diff -u -rc28b9dce56646dd5ff397b766d9217312582e590 -r44db8984e7c0c533ccd662506852ad10831af759 --- Core/Common/test/Core.Common.Util.Test/Reflection/AssemblyUtilsTest.cs (.../AssemblyUtilsTest.cs) (revision c28b9dce56646dd5ff397b766d9217312582e590) +++ Core/Common/test/Core.Common.Util.Test/Reflection/AssemblyUtilsTest.cs (.../AssemblyUtilsTest.cs) (revision 44db8984e7c0c533ccd662506852ad10831af759) @@ -21,6 +21,7 @@ using System; using System.IO; +using System.Reflection; using Core.Common.Util.Reflection; using NUnit.Framework; @@ -62,7 +63,7 @@ public void GetAssemblyInfo_ForThisTestProjectAssembly_ReturnAssemblyInfoWithExpectedValues() { // Setup - var assembly = System.Reflection.Assembly.GetAssembly(GetType()); + var assembly = Assembly.GetAssembly(GetType()); // Call AssemblyUtils.AssemblyInfo assemblyInfo = AssemblyUtils.GetAssemblyInfo(assembly); @@ -79,7 +80,7 @@ public void GetExecutingAssemblyInfo_ReturnAssemblyInfoForAssemblyUtilsAssembly() { // Setup - var assembly = System.Reflection.Assembly.GetAssembly(typeof(AssemblyUtils)); + var assembly = Assembly.GetAssembly(typeof(AssemblyUtils)); AssemblyUtils.AssemblyInfo assemblyInfo = AssemblyUtils.GetAssemblyInfo(assembly); // Call @@ -163,7 +164,7 @@ Assert.IsInstanceOf(exception.InnerException); } - private class MockedAssemblyWithoutLocation : System.Reflection.Assembly + private class MockedAssemblyWithoutLocation : Assembly { public override string Location => ""; }