Index: test/Common/DelftTools.TestUtils/WindowsFormsTestHelper.cs =================================================================== diff -u -r98210d0d98d36f2d3da5136cb69428125455fe55 -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.TestUtils/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 98210d0d98d36f2d3da5136cb69428125455fe55) +++ test/Common/DelftTools.TestUtils/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -5,7 +5,6 @@ using System.Reflection; using System.Windows.Forms; using NUnit.Framework; -using Rhino.Mocks; namespace DelftTools.TestUtils { @@ -35,23 +34,6 @@ public PropertyGrid PropertyGrid { get; private set; } - public static void ShowPropertyGridForObject(object selectedObject) - { - var mockrepos = new MockRepository(); - - /* TODO: review with Bas - var guiMock = mockrepos.Stub(); - var grid = new DeltaShell.Gui.Forms.PropertyGrid.PropertyGrid(guiMock) { Data = new DynamicPropertyBag(selectedObject) }; - */ - - var grid = new PropertyGrid - { - SelectedObject = selectedObject - }; - - ShowModal(grid); - } - public static void Show(Control control, Action
formVisibleChangedAction, params object[] propertyObjects) { new WindowsFormsTestHelper().ShowTopLevel(control, propertyObjects, false, formVisibleChangedAction); Index: test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs =================================================================== diff -u -r716173ea7d18bb5436050eed3def1c53ac8f8aac -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs (.../EntityAttributeTest.cs) (revision 716173ea7d18bb5436050eed3def1c53ac8f8aac) +++ test/Common/DelftTools.Utils.Tests/Aop/EntityAttributeTest.cs (.../EntityAttributeTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -210,7 +210,7 @@ { for (int i = 0; i < 1000000; i++) { - var t = new T(); + new T(); } } Index: test/Common/DelftTools.Utils.Tests/Binding/EnumBindingHelperTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.Utils.Tests/Binding/EnumBindingHelperTest.cs (.../EnumBindingHelperTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/Binding/EnumBindingHelperTest.cs (.../EnumBindingHelperTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -33,7 +33,7 @@ { //datetime is a struct but not an enum. Would be nice to get compile time checking //but for now this is OK - var list = EnumBindingHelper.ToList(); + EnumBindingHelper.ToList(); } } } \ No newline at end of file Index: test/Common/DelftTools.Utils.Tests/General/TypeConverterTest.cs =================================================================== diff -u -r7eed8f9cfa868b199699b1fbf58bcde2c9271d84 -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.Utils.Tests/General/TypeConverterTest.cs (.../TypeConverterTest.cs) (revision 7eed8f9cfa868b199699b1fbf58bcde2c9271d84) +++ test/Common/DelftTools.Utils.Tests/General/TypeConverterTest.cs (.../TypeConverterTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -24,8 +24,6 @@ //char c = TConverter.ConvertValueToTargetType("x"); Assert.AreEqual('x', TypeConverter.ConvertValueToTargetType("x")); - Guid g = TypeConverter.ConvertValueToTargetType("{32F92EEB-A703-4eb7-A9F8-62E09F87D03F}"); - Version v = TypeConverter.ConvertValueToTargetType("1.2.3.4"); Assert.AreEqual(1, v.Major); Assert.AreEqual(2, v.Minor); Index: test/Common/DelftTools.Utils.Tests/IO/FileUtilsTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.Utils.Tests/IO/FileUtilsTest.cs (.../FileUtilsTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/IO/FileUtilsTest.cs (.../FileUtilsTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -141,7 +141,7 @@ public void GetUniqueFileNameReturnsTheSameNameWhenNoFileIsFound() { const string someFileName = "somefile.nc"; - string newName = FileUtils.GetUniqueFileName(someFileName); + Assert.AreEqual(someFileName, FileUtils.GetUniqueFileName(someFileName)); } [Test] @@ -177,7 +177,7 @@ [ExpectedException(typeof(ArgumentNullException))] public void GetUniqueFileNameThrowsArgumentNullExceptionOnNullArgument() { - string newName = FileUtils.GetUniqueFileName(null); + FileUtils.GetUniqueFileName(null); } [Test] Index: test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicDataItemPropertyBagTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicDataItemPropertyBagTest.cs (.../DynamicDataItemPropertyBagTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicDataItemPropertyBagTest.cs (.../DynamicDataItemPropertyBagTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -67,7 +67,6 @@ var propertyDescriptorCollection = ((ICustomTypeDescriptor) dynamicDataItemPropertyBag).GetProperties(); var namePropertyDescriptor = propertyDescriptorCollection.Find("Name", false); - var namePropertyValue = namePropertyDescriptor.GetValue(dynamicDataItemPropertyBag); // asserts namePropertyDescriptor.Attributes.Matches(new DynamicReadOnlyAttribute()) Index: test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -64,8 +64,9 @@ var propertyDescriptorCollection = ((ICustomTypeDescriptor) dynamicPropertyBag).GetProperties(); var namePropertyDescriptor = propertyDescriptorCollection.Find("Name", false); - var namePropertyValue = namePropertyDescriptor.GetValue(dynamicPropertyBag); + namePropertyDescriptor.GetValue(dynamicPropertyBag); + // asserts namePropertyDescriptor.Attributes.Matches(new DynamicReadOnlyAttribute()) .Should("Dynamic ReadOnly attribute was not added").Be.True(); @@ -83,7 +84,7 @@ var namePropertyDescriptor = propertyDescriptorCollection.Find("Name", false); - var nameValue = namePropertyDescriptor.GetValue(dynamicPropertyBag); + namePropertyDescriptor.GetValue(dynamicPropertyBag); // asserts namePropertyDescriptor.Attributes.Matches(new DynamicReadOnlyAttribute()) @@ -128,7 +129,8 @@ var dynamicPropertyBag = new DynamicPropertyBag(new TestWithoutValidationMethodClassProperties()); var propertyDescriptorCollection = ((ICustomTypeDescriptor) dynamicPropertyBag).GetProperties(); var namePropertyDescriptor = propertyDescriptorCollection.Find("Name", false); - var nameValue = namePropertyDescriptor.GetValue(dynamicPropertyBag); + + namePropertyDescriptor.GetValue(dynamicPropertyBag); } [Test] @@ -191,7 +193,8 @@ var dynamicPropertyBag = new DynamicPropertyBag(new TestInvalidValidationMethodClassProperties()); var propertyDescriptorCollection = ((ICustomTypeDescriptor) dynamicPropertyBag).GetProperties(); var namePropertyDescriptor = propertyDescriptorCollection.Find("Name", false); - var nameValue = namePropertyDescriptor.GetValue(dynamicPropertyBag); + + namePropertyDescriptor.GetValue(dynamicPropertyBag); } [Test] @@ -213,7 +216,8 @@ var propertyDescriptorCollection = ((ICustomTypeDescriptor) dynamicPropertyBag).GetProperties(); var namePropertyDescriptor = propertyDescriptorCollection.Find("Name", false); - var nameValue = namePropertyDescriptor.GetValue(dynamicPropertyBag); + + namePropertyDescriptor.GetValue(dynamicPropertyBag); } #region Test Classes Index: test/Common/DelftTools.Utils.Tests/Reflection/TypeUtilsTest.cs =================================================================== diff -u -r98210d0d98d36f2d3da5136cb69428125455fe55 -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/DelftTools.Utils.Tests/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 98210d0d98d36f2d3da5136cb69428125455fe55) +++ test/Common/DelftTools.Utils.Tests/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -54,7 +54,7 @@ [Test] public void GetPrivateStaticField() { - TestClass testClass = new TestClass(22, 23); + new TestClass(22, 23); Assert.AreEqual(23, TypeUtils.GetStaticField(typeof(TestClass), "privateStaticInt")); } Index: test/Common/NetTopologySuite.Tests/Geometry/GeometryTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/NetTopologySuite.Tests/Geometry/GeometryTest.cs (.../GeometryTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/NetTopologySuite.Tests/Geometry/GeometryTest.cs (.../GeometryTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -30,7 +30,7 @@ var g1 = wktReader.Read("POLYGON((0.0000001 -3,5 -3,5 -7,0.000001 -7,0.0000001 -3))"); var g2 = wktReader.Read("POLYGON((5 -10,2 -10,0.000001 0,0.000001 1,5 1,5 -10))"); - var diff = g1.Difference(g2); + g1.Difference(g2); } /// Index: test/Common/SharpMap.Tests/Data/Providers/QuadTreeTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/SharpMap.Tests/Data/Providers/QuadTreeTest.cs (.../QuadTreeTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/SharpMap.Tests/Data/Providers/QuadTreeTest.cs (.../QuadTreeTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -56,7 +56,7 @@ for (int i = 0; i < queryRectangles.Length; i++) { var rect = queryRectangles[i]; - var res = quadTree.GetIndices(ref rect, 0f).ToList(); + quadTree.GetIndices(ref rect, 0f).ToList(); } }); } Index: test/Common/SharpMap.UI.Tests/Forms/MapControlTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/Common/SharpMap.UI.Tests/Forms/MapControlTest.cs (.../MapControlTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/SharpMap.UI.Tests/Forms/MapControlTest.cs (.../MapControlTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -41,11 +41,6 @@ } }; - var mapControl = new MapControl - { - Map = map - }; - var viewEnvelope = new Envelope(10000, 10010, 10000, 10010); map.ZoomToFit(viewEnvelope); Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Commands/MapZoomToFeatureCommandTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r3c68575d4782dec22cd26172a45fcaa90eb12013 --- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Commands/MapZoomToFeatureCommandTest.cs (.../MapZoomToFeatureCommandTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Commands/MapZoomToFeatureCommandTest.cs (.../MapZoomToFeatureCommandTest.cs) (revision 3c68575d4782dec22cd26172a45fcaa90eb12013) @@ -56,8 +56,9 @@ IFeature feature = mocks.Stub(); var point = new Point(42, 24); - var envelope = new Envelope(point.X - envelopeExpansion, point.X + envelopeExpansion, point.Y - envelopeExpansion, point.Y + envelopeExpansion); + new Envelope(point.X - envelopeExpansion, point.X + envelopeExpansion, point.Y - envelopeExpansion, point.Y + envelopeExpansion); + Expect.Call(gui.ToolWindowViews).Return(viewList).Repeat.Any(); Expect.Call(gui.DocumentViews).Return(viewList).Repeat.Any();