Index: test/Common/DelftTools.TestUtils/ReflectionTestHelper.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.TestUtils/ReflectionTestHelper.cs (.../ReflectionTestHelper.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.TestUtils/ReflectionTestHelper.cs (.../ReflectionTestHelper.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -130,7 +130,7 @@ } catch (Exception) { - Console.WriteLine(String.Format("Unable to set property: {0}", prop)); + Console.WriteLine("Unable to set property: {0}", prop); } } } Index: test/Common/DelftTools.TestUtils/TestHelper.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.TestUtils/TestHelper.cs (.../TestHelper.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.TestUtils/TestHelper.cs (.../TestHelper.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -596,7 +596,7 @@ } } - string contents = ""; + string contents; float rank = machineRank*(useHddAccessRank ? machineHddRank : 1.0f); @@ -779,7 +779,7 @@ { if (!renderedMessages.Contains(message)) { - Assert.Fail(String.Format("Message \"{0}\" not found in messages of log4net", message)); + Assert.Fail("Message \"{0}\" not found in messages of log4net", message); } } } @@ -795,7 +795,7 @@ { if (messages.Contains(renderedMessage)) { - Assert.Fail(String.Format("Message \"{0}\" found in messages of log4net", renderedMessage)); + Assert.Fail("Message \"{0}\" found in messages of log4net", renderedMessage); } } } Index: test/Common/DelftTools.Tests/Controls/Swf/Table/TableViewTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Tests/Controls/Swf/Table/TableViewTest.cs (.../TableViewTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Tests/Controls/Swf/Table/TableViewTest.cs (.../TableViewTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -884,16 +884,8 @@ var table = new DataTable(); table.Columns.Add("column1", typeof(string)); table.Columns.Add("column2", typeof(string)); - table.Rows.Add(new object[] - { - "1", - "2" - }); - table.Rows.Add(new object[] - { - "3", - "4" - }); + table.Rows.Add("1", "2"); + table.Rows.Add("3", "4"); var tableView = new TableView { @@ -979,10 +971,7 @@ var table = new DataTable(); table.Columns.Add("readonlycolumn", typeof(string)); - table.Rows.Add(new object[] - { - "1" - }); + table.Rows.Add("1"); var tableView = new TableView { @@ -1003,10 +992,7 @@ var table = new DataTable(); table.Columns.Add("readonlycolumn", typeof(string)); - table.Rows.Add(new object[] - { - "1" - }); + table.Rows.Add("1"); var tableView = new TableView { @@ -1027,10 +1013,7 @@ var table = new DataTable(); table.Columns.Add("readonlycolumn", typeof(string)); - table.Rows.Add(new object[] - { - "1" - }); + table.Rows.Add("1"); var tableView = new TableView { @@ -1538,10 +1521,7 @@ var table = new DataTable(); table.Columns.Add("column", typeof(string)); - table.Rows.Add(new object[] - { - "1" - }); + table.Rows.Add("1"); var tableView = new TableView { @@ -1966,7 +1946,7 @@ Data = table, MultiSelect = true, RowSelect = true, ReadOnly = true }; var gridView = TypeUtils.GetField(tableView, "dxGridView"); - WindowsFormsTestHelper.ShowModal(tableView, (f) => + WindowsFormsTestHelper.ShowModal(tableView, f => { TypeUtils.CallPrivateMethod(gridView, "RaiseMouseDown", new MouseEventArgs(MouseButtons.Left, 1, 156, 76, 0)); Index: test/Common/DelftTools.Tests/Shell/Core/WorkFlow/AsyncActivityRunnerTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Tests/Shell/Core/WorkFlow/AsyncActivityRunnerTest.cs (.../AsyncActivityRunnerTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Tests/Shell/Core/WorkFlow/AsyncActivityRunnerTest.cs (.../AsyncActivityRunnerTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -17,7 +17,7 @@ { var activity = new CrashingActivity(); - var asynchTask = new AsyncActivityRunner(activity, (a) => a.Execute()); + var asynchTask = new AsyncActivityRunner(activity, a => a.Execute()); int callCount = 0; asynchTask.Completed += (s, e) => { Index: test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs (.../EntityAttributeTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs (.../EntityAttributeTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -186,12 +186,7 @@ [Test] public void ConstructingObjectsInSeveralThreadsShouldBeSafe() { - Task.WaitAll(new[] - { - Task.Factory.StartNew(CreateManyObjects), - Task.Factory.StartNew(CreateManyObjects), - Task.Factory.StartNew(CreateManyObjects) - }); + Task.WaitAll(Task.Factory.StartNew(CreateManyObjects), Task.Factory.StartNew(CreateManyObjects), Task.Factory.StartNew(CreateManyObjects)); } [Test] Index: test/Common/DelftTools.Utils.Tests/NamingHelperTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Utils.Tests/NamingHelperTest.cs (.../NamingHelperTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/NamingHelperTest.cs (.../NamingHelperTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -16,8 +16,7 @@ [ExpectedException(typeof(ArgumentException))] public void GetUniqueNameWithInvalidFilter() { - NamingHelper.GetUniqueName("invalidfilter", new INameable[] - {}, null); + NamingHelper.GetUniqueName("invalidfilter", new INameable[] { }); } [Test] Index: test/Common/DelftTools.Utils.Tests/Reflection/AssemblyBuilderTest.cs =================================================================== diff -u -r98210d0d98d36f2d3da5136cb69428125455fe55 -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Utils.Tests/Reflection/AssemblyBuilderTest.cs (.../AssemblyBuilderTest.cs) (revision 98210d0d98d36f2d3da5136cb69428125455fe55) +++ test/Common/DelftTools.Utils.Tests/Reflection/AssemblyBuilderTest.cs (.../AssemblyBuilderTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -1,17 +1,11 @@ using System; -using System.Diagnostics; using System.Reflection; using System.Reflection.Emit; using System.Runtime.InteropServices; using NUnit.Framework; namespace DelftTools.Utils.Tests.Reflection { - public abstract class A - { - - } - [TestFixture] public class AssemblyBuilderTest { @@ -26,10 +20,10 @@ ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, "Generated.dll"); TypeBuilder typeBuilder = - moduleBuilder.DefineType("DelftTools.Utils.Reflection.B", TypeAttributes.Public | TypeAttributes.Class, typeof(A)); + moduleBuilder.DefineType("DelftTools.Utils.Reflection.B", TypeAttributes.Public | TypeAttributes.Class, typeof(object)); typeBuilder.SetCustomAttribute( - new CustomAttributeBuilder(typeof(GuidAttribute).GetConstructor(new Type[] + new CustomAttributeBuilder(typeof(GuidAttribute).GetConstructor(new[] { typeof(string) }), @@ -56,7 +50,7 @@ MethodInfo getToolWindowName = type.GetMethod("GetToolWindowName"); object retval = getToolWindowName.Invoke(obj, null); - Trace.Assert(retval.Equals("Hello!")); + Assert.AreEqual("Hello!", retval); } } } \ No newline at end of file Index: test/Common/DelftTools.Utils.Tests/Reflection/DynamicTypeUtilsTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Utils.Tests/Reflection/DynamicTypeUtilsTest.cs (.../DynamicTypeUtilsTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/Reflection/DynamicTypeUtilsTest.cs (.../DynamicTypeUtilsTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -11,7 +11,7 @@ public void CreateDynamicEnum() { var enumType = DynamicTypeUtils.CreateDynamicEnum("MyEnum", - new int[] + new[] { 1, 2, @@ -35,7 +35,7 @@ [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Number of values / descriptions / displayNames does not match")] public void CreateDynamicEnumNotEnoughDescriptions() { - DynamicTypeUtils.CreateDynamicEnum("MyEnum", new int[] + DynamicTypeUtils.CreateDynamicEnum("MyEnum", new[] { 0, 1, Index: test/Common/DelftTools.Utils.Tests/Threading/ThreadedWorkerTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Utils.Tests/Threading/ThreadedWorkerTest.cs (.../ThreadedWorkerTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/Threading/ThreadedWorkerTest.cs (.../ThreadedWorkerTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -38,7 +38,7 @@ Console.WriteLine("Elapsed: " + stopwatch.ElapsedMilliseconds); Console.WriteLine("Max: " + maxTime); - Console.WriteLine(String.Format("Speedup: {0:N2}x", (double) sequentialTime/stopwatch.ElapsedMilliseconds)); + Console.WriteLine("Speedup: {0:N2}x", (double) sequentialTime/stopwatch.ElapsedMilliseconds); if (workerThreads <= 2) { Index: test/Common/DelftTools.Utils.Tests/WeakEventHandlerTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/DelftTools.Utils.Tests/WeakEventHandlerTest.cs (.../WeakEventHandlerTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/WeakEventHandlerTest.cs (.../WeakEventHandlerTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -247,7 +247,7 @@ public EventConsumerGeneric(EventSourceGeneric sourceGeneric) { sourceGeneric.theEvent += - new EventHandler(source_theEvent).MakeWeak((e) => sourceGeneric.theEvent -= e); + new EventHandler(source_theEvent).MakeWeak(e => sourceGeneric.theEvent -= e); } #region IEventConsumer Members @@ -267,7 +267,7 @@ public EventConsumerPropChange(EventSourcePropChange sourcePropChange) { sourcePropChange.theEvent += - new PropertyChangedEventHandler(source_theEvent).MakeWeak((e) => sourcePropChange.theEvent -= e); + new PropertyChangedEventHandler(source_theEvent).MakeWeak(e => sourcePropChange.theEvent -= e); } #region IEventConsumer Members Index: test/Common/NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs (.../GeometryHelperTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs (.../GeometryHelperTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -345,19 +345,17 @@ new Coordinate(0, 0), new Coordinate(10, 0) }); - Coordinate nullCoordinate = null; - Point nullGeometry = null; var distance = GeometryHelper.Distance(null, new Coordinate(0, 0)); Assert.AreEqual(double.MaxValue, distance); - distance = GeometryHelper.Distance(lineString, nullCoordinate); + distance = GeometryHelper.Distance(lineString, (Coordinate) null); Assert.AreEqual(double.MaxValue, distance); distance = GeometryHelper.Distance(null, new Point(0, 0)); Assert.AreEqual(double.MaxValue, distance); - distance = GeometryHelper.Distance(lineString, nullGeometry); + distance = GeometryHelper.Distance(lineString, (Point) null); Assert.AreEqual(double.MaxValue, distance); } Index: test/Common/SharpMap.Tests/Editors/FeatureInteractorTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/Common/SharpMap.Tests/Editors/FeatureInteractorTest.cs (.../FeatureInteractorTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/SharpMap.Tests/Editors/FeatureInteractorTest.cs (.../FeatureInteractorTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -64,8 +64,7 @@ [Test] public void CanDeleteAndMoveDoesNotCrashWithEmptyLayer() { - var editor = new TestFeatureInteractor(null, null, null, null) - {}; + var editor = new TestFeatureInteractor(null, null, null, null); Assert.IsFalse(editor.AllowDeletion()); Assert.IsFalse(editor.AllowMove()); Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Commands/CommandTests.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Commands/CommandTests.cs (.../CommandTests.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Commands/CommandTests.cs (.../CommandTests.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -30,8 +30,7 @@ string url = "http://www2.demis.nl/wms/wms.asp?wms=WorldMap&REQUEST=GetCapabilities"; var webBrowser = new WebBrowser(); - bool connectionAvailable = false; - connectionAvailable = ConnectionAvailable(url); + var connectionAvailable = ConnectionAvailable(url); webBrowser.DocumentCompleted += delegate { Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs (.../MapViewTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs (.../MapViewTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -95,7 +95,7 @@ var path = DataPath + filePath; - ShapeFile shp = null; + ShapeFile shp; Map.CoordinateSystemFactory = new OgrCoordinateSystemFactory(); var src = Map.CoordinateSystemFactory.CreateFromEPSG(4326 /* WGS84 */); Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs (.../VectorLayerAttributeTableViewTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs (.../VectorLayerAttributeTableViewTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -152,7 +152,7 @@ public CityProperties(City city) { - this.city = (City) city; + this.city = city; } [DisplayName("Name (read-only)")] Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/HibernateMappings/ThemeTypeConverterTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r65f2e7d6ac377e64d885b6379ba3553a2deef981 --- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/HibernateMappings/ThemeTypeConverterTest.cs (.../ThemeTypeConverterTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/HibernateMappings/ThemeTypeConverterTest.cs (.../ThemeTypeConverterTest.cs) (revision 65f2e7d6ac377e64d885b6379ba3553a2deef981) @@ -144,14 +144,14 @@ QuantityTheme theme = new QuantityTheme("column1", vectorStyle); theme.AddStyle(vectorStyle, new Interval(0, 100)); theme.AddStyle(vectorStyle, new Interval(101, 200)); - theme.NoDataValues = new int[] + theme.NoDataValues = new[] { -999 }; string xml = themeTC.ConvertToString(theme); QuantityTheme retrievedTheme = (QuantityTheme) themeTC.ConvertFromString(xml); - Assert.AreEqual(new int[] + Assert.AreEqual(new[] { -999 }, retrievedTheme.NoDataValues); @@ -164,14 +164,14 @@ QuantityTheme theme = new QuantityTheme("column1", vectorStyle); theme.AddStyle(vectorStyle, new Interval(0, 100)); theme.AddStyle(vectorStyle, new Interval(101, 200)); - theme.NoDataValues = new float[] + theme.NoDataValues = new[] { -999.0F }; string xml = themeTC.ConvertToString(theme); QuantityTheme retrievedTheme = (QuantityTheme) themeTC.ConvertFromString(xml); - Assert.AreEqual(new float[] + Assert.AreEqual(new[] { -999.0F }, retrievedTheme.NoDataValues);