Index: DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/Properties/AssemblyInfo.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 3825) @@ -20,7 +20,6 @@ // All rights reserved. using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs =================================================================== diff -u -r3822 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 3822) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 3825) @@ -41,7 +41,7 @@ List srcDataSources; DataPluginImporter dataPluginImporter; - [TestFixtureSetUp] + [SetUp] public void TestFixtureSetup() { srcDataSources = new List(); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Services/PolygonAttributeImporterTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Services/PolygonAttributeImporterTest.cs (.../PolygonAttributeImporterTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Services/PolygonAttributeImporterTest.cs (.../PolygonAttributeImporterTest.cs) (revision 3825) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Linq; @@ -41,14 +40,14 @@ #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { mocks = new MockRepository(); repository = mocks.DynamicMock(); } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } @@ -209,7 +208,6 @@ } [Test] - [ExpectedException(typeof(InvalidOperationException))] public void Import_RepositoryContainsNoAttributes_Throws() { const string attributeName = "TrafLoad"; @@ -235,11 +233,10 @@ Expect.Call(repository.SupportedAttributes).Return(new List()); mocks.ReplayAll(); - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException); } [Test] - [ExpectedException(typeof(InvalidOperationException))] public void Import_RepositoryNotSet_Throws() { const string attributeName = "TrafLoad"; @@ -263,7 +260,7 @@ mocks.ReplayAll(); - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException); } [Test] Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSourceContainer.cs =================================================================== diff -u -r3526 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSourceContainer.cs (.../DataSourceContainer.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSourceContainer.cs (.../DataSourceContainer.cs) (revision 3825) @@ -23,9 +23,7 @@ using System.Collections.Generic; using System.Linq; using System.Xml.Serialization; -using Deltares.Geotechnics; using Deltares.Geotechnics.SurfaceLines; -using Deltares.Standard; using Deltares.Standard.IO; using Deltares.Standard.IO.Xml; using XmlSerializer = Deltares.Standard.IO.Xml.XmlSerializer; Index: DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/packages.config =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/packages.config (.../packages.config) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/packages.config (.../packages.config) (revision 3825) @@ -1,26 +1,4 @@  - - + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorTest.cs (.../SensorTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorTest.cs (.../SensorTest.cs) (revision 3825) @@ -30,12 +30,12 @@ { #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs =================================================================== diff -u -r3526 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs (.../LocationPropertyImporter.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs (.../LocationPropertyImporter.cs) (revision 3825) @@ -26,7 +26,6 @@ using System.Linq; using Deltares.Dam.Data.CsvImporters; using Deltares.Maps; -using Deltares.Standard; using NetTopologySuite.Geometries; using DataAttribute = Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute; Index: DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs =================================================================== diff -u -r3822 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3822) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 3825) @@ -116,7 +116,7 @@ [Test] [Category("Slow")] [Category("WorkInProgress")] - [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] + [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] public void BM04Opdrijven02SituatieMetOpdrijven1D() { string cFolderName = @@ -156,7 +156,7 @@ [Test] [Category("Slow")] [Category("WorkInProgress")] - [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] + [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] public void BM04Opdrijven04SituatieMetEenSchuineSlootbodemEnOpdrijvenOp1Locatie1D() { string cFolderName = @@ -173,8 +173,9 @@ /// /// Performs test BM04Opdrijven05 situation with soil layers aboven and below the phreatic line 1D /// - [Test, Ignore] + [Test] [Category("Slow")] + [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] public void BM04Opdrijven05SituatieMetGrondlagenBovenEnOnderHetFreatischVlak1D() { string cFolderName = @@ -193,7 +194,7 @@ [Test] [Category("Slow")] [Category("WorkInProgress")] - [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] + [Ignore("DamMacroStability kernel is being replaced by Macrostability kernel in DamEngine")] public void BM04Opdrijven06SituatieMetOpdrijvenOpVerschillendeLocatiesLangsHetProfiel1D() { string cFolderName = Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs =================================================================== diff -u -r3526 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs (.../FillDamUiFromXmlHelper.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs (.../FillDamUiFromXmlHelper.cs) (revision 3825) @@ -19,11 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Deltares.Geometry; using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Geotechnics.SurfaceLines; Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs =================================================================== diff -u -r3822 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 3822) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 3825) @@ -37,15 +37,15 @@ { private string tmpTestFolder; - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { tmpTestFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpDataPluginImporterTests"); if (!Directory.Exists(tmpTestFolder)) Directory.CreateDirectory(tmpTestFolder); } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { if (Directory.Exists(tmpTestFolder)) @@ -82,26 +82,26 @@ { Attributes = new[] { - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.LocationAttributeId, AttributeName = "LocationId", DataSource = "Locationv2.shp" }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, AttributeName = "DIKERINGID", DataSource = "Locationv2.shp" }, // Head Pl2 will be put in location, Head Pl3 will be put in scenario if not already imported from scenarios.csv - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.HeadPl3AttributeId, AttributeName = "stijgh_m", DataSource = "winterstijg_zonderDSM.shp" }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.HeadPl2AttributeId, AttributeName = "PLHIGH", @@ -149,121 +149,121 @@ { Attributes = new[] { - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.LocationAttributeId, AttributeName = "LocationId", DataSource = "Locations.shp" }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, AttributeName = "DikeRingId", DataSource = "Locations.shp" }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.HeadPl3AttributeId, AttributeName = "HEADPL3", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.HeadPl4AttributeId, AttributeName = "HEADPL4", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeTopAtRiverAttributeId, AttributeName = "PLOBDTOPR", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeTopAtPolderAttributeId, AttributeName = "PLOBDTOPP", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowShoulderBaseInsideAttributeId, AttributeName = "PLOBSB", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeToeAtPolderAttributeId, AttributeName = "PLOBDTOEP", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.UsePlLineOffsetBelowDikeCrestMiddleAttributeId, AttributeName = "USEPLOBDCM", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeCrestMiddleAttributeId, AttributeName = "PLOBDCM", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.UsePlLineOffsetFactorBelowShoulderCrestAttributeId, AttributeName = "USEPLOFBSC", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.PlLineOffsetFactorBelowShoulderCrestAttributeId, AttributeName = "PLOFBSC", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.UpliftCriterionStabilityAttributeId, AttributeName = "UPLSTAB", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.UpliftCriterionPipingAttributeId, AttributeName = "UPLPIPING", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.DikeTableHeightAttributeId, AttributeName = "DTH", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.RiverLevelAttributeId, AttributeName = "WHEIGHT", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.RiverLevelLowAttributeId, AttributeName = "WHEIGHTLOW", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.RequiredSafetyFactorPipingAttributeId, AttributeName = "FPIPING", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.RequiredSafetyFactorStabilityInnerSlopeAttributeId, AttributeName = "FSTABIN", DataSource = shapefile }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.RequiredSafetyFactorStabilityOuterSlopeAttributeId, AttributeName = "FSTABOUT", @@ -306,12 +306,10 @@ } [Test] - [ExpectedException(typeof(DataPluginImporterException))] public void ThrowsExceptionWhenRequestingDataWhenDataSourcesNotDefined() { var dataPluginImporter = new DataPluginImporter(); - var info = dataPluginImporter.WaterBoardInfo; - Assert.IsNotNull(info); + Assert.That(() => dataPluginImporter.WaterBoardInfo, Throws.InstanceOf()); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/packages.config =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/packages.config (.../packages.config) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/packages.config (.../packages.config) (revision 3825) @@ -1,26 +1,4 @@  - - + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorTimeSeriesProcessorTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorTimeSeriesProcessorTest.cs (.../SensorTimeSeriesProcessorTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorTimeSeriesProcessorTest.cs (.../SensorTimeSeriesProcessorTest.cs) (revision 3825) @@ -19,12 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Collections.Generic; -using Deltares.Dam.Data; -using Deltares.Dam.Data.Sensors; -using NUnit.Framework; - namespace Deltares.Dam.Tests.Sensors { /* @@ -56,12 +50,12 @@ #endregion - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj =================================================================== diff -u -r3445 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj (.../Deltares.Maps.Tests.csproj) (revision 3445) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj (.../Deltares.Maps.Tests.csproj) (revision 3825) @@ -1,5 +1,6 @@  + Debug x86 @@ -58,9 +59,8 @@ ..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.PostGis.dll - - False - ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll + + ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll ..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\PowerCollections.dll @@ -133,6 +133,7 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + - + \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs =================================================================== diff -u -r3526 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs (.../ModelFactors.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs (.../ModelFactors.cs) (revision 3825) @@ -19,8 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Xml.Serialization; - namespace Deltares.Dam.Data { public class ModelFactors Index: DamClients/DamUI/trunk/src/Dam/Tests/PointTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/PointTest.cs (.../PointTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/PointTest.cs (.../PointTest.cs) (revision 3825) @@ -23,7 +23,6 @@ namespace Deltares.Dam.Tests { - using Deltares.Dam.Data; using NUnit.Framework; [TestFixture] Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/packages.config =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/packages.config (.../packages.config) (revision 3527) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/packages.config (.../packages.config) (revision 3825) @@ -25,6 +25,6 @@ - + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/Forms/DamSpatialEditorDecoratorTest.cs =================================================================== diff -u -r3822 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Forms/DamSpatialEditorDecoratorTest.cs (.../DamSpatialEditorDecoratorTest.cs) (revision 3822) +++ DamClients/DamUI/trunk/src/Dam/Tests/Forms/DamSpatialEditorDecoratorTest.cs (.../DamSpatialEditorDecoratorTest.cs) (revision 3825) @@ -41,7 +41,7 @@ [TestFixture] public class DamSpatialEditorDecoratorTest { - [Test, Ignore] + [Test, Ignore("")] [Category("WorkInProgress")] public void GivenDamSpatialEditorDecorator_WhenCharacteristicPointFiresAfterChangeEvent_ThenLocationUpdated() { Index: DamClients/DamUI/trunk/src/Dam/Tests/GeometryFileTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/GeometryFileTest.cs (.../GeometryFileTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/GeometryFileTest.cs (.../GeometryFileTest.cs) (revision 3825) @@ -21,7 +21,6 @@ using System; using System.IO; -using Deltares.Dam.Data; using Deltares.Maps; using NUnit.Framework; @@ -34,7 +33,7 @@ #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { existingFile = Guid.NewGuid() + ".tst"; @@ -43,7 +42,7 @@ } } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { File.Delete(existingFile); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/FeatureRepositoryTests.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/FeatureRepositoryTests.cs (.../FeatureRepositoryTests.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/FeatureRepositoryTests.cs (.../FeatureRepositoryTests.cs) (revision 3825) @@ -28,11 +28,10 @@ { [Test] [Category("Integration")] - [ExpectedException(typeof(FeatureImportException))] public void CreateFromShapeFile_UsingShapeFileThatContainsOneCompositeShapeAndNRecords_Throws() { string plLinesFilename = @"..\..\..\..\data\Dam\Waterboards\HD\shapefiles\PLLINES.shp"; - FeatureRepository.CreateFromShapeFile(new ShapeFileLocation(plLinesFilename)); + Assert.That(() => FeatureRepository.CreateFromShapeFile(new ShapeFileLocation(plLinesFilename)), Throws.InstanceOf()); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 3825) @@ -23,13 +23,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using Deltares.Dam.Data; using Deltares.Dam.Data.DataPlugins.Configuration; -using Deltares.Dam.Data.Importers; using Deltares.Dam.Data.Sensors; -using Deltares.Standard; -using Deltares.Standard.Extensions; using Deltares.Standard.Logging; using NUnit.Framework; Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvParserTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvParserTest.cs (.../CsvParserTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvParserTest.cs (.../CsvParserTest.cs) (revision 3825) @@ -33,7 +33,7 @@ { private string testFile; - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { testFile = "test.csv"; @@ -68,12 +68,12 @@ Assert.That(() => CsvParser.ParseHeader("test", new Regex("")), Throws.TypeOf(typeof(ArgumentException)).With.Message.EqualTo(expectedMessage)); } - //[Test] - //[ExpectedException(typeof(CsvParserException))] - //public void ThrowsWhenNoHeaderItemsAreParsed() - //{ - // CsvParser.ParseHeader("test", new Regex("")); - //} + [Test] + [Ignore("[ExpectedException(typeof(CsvParserException))]")] + public void ThrowsWhenNoHeaderItemsAreParsed() + { + Assert.That(() => CsvParser.ParseHeader("test", new Regex("")), Throws.InstanceOf()); + } [Test] public void CanParseHeaderWithSemicolonSeparatedItems() @@ -94,46 +94,40 @@ } [Test] - [ExpectedException(typeof(ArgumentNullException))] public void ThrowsExceptionWhenObjectMaterializerNull() { - CsvParser.LoadFromCsvFile(null, testFile).ToList(); + Assert.That(() => CsvParser.LoadFromCsvFile(null, testFile).ToList(), Throws.ArgumentNullException); } [Test] - [ExpectedException(typeof(CsvParserException))] public void ThrowsExceptionWhenObjectMaterializerNotValid() { var loader = new ObjectMaterializer(); - loader.LoadFromCsvFile(testFile).ToList(); + Assert.That(() => loader.LoadFromCsvFile(testFile).ToList(), Throws.InstanceOf()); } [Test] - [ExpectedException(typeof(ArgumentException))] public void ThrowsExceptionWhenFileNameNull() { var loader = new ObjectMaterializer(); - loader.LoadFromCsvFile(null).ToList(); + Assert.That(() => loader.LoadFromCsvFile(null).ToList(), Throws.ArgumentException); } [Test] - [ExpectedException(typeof(ArgumentException))] public void ThrowsExceptionWhenFileNameEmpty() { var loader = new ObjectMaterializer(); - loader.LoadFromCsvFile("").ToList(); + Assert.That(() => loader.LoadFromCsvFile("").ToList(), Throws.ArgumentException); } [Test] - [ExpectedException(typeof(ArgumentException))] public void ThrowsExceptionWhenFileNameContainsOnlySpaces() { var loader = new ObjectMaterializer(); - loader.LoadFromCsvFile(" ").ToList(); + Assert.That(() => loader.LoadFromCsvFile(" ").ToList(), Throws.ArgumentException); } [Test] - [ExpectedException(typeof(CsvParserException))] public void ThrowsExceptionWhenNumberOfItemsDoesntMatchWithHeader() { using (var writer = File.CreateText(testFile)) @@ -144,11 +138,10 @@ var loader = new ObjectMaterializer(); loader.Add("name", (entity, value) => entity.Name = value); loader.Add("age", (entity, value) => entity.Age = int.Parse(value)); - loader.LoadFromCsvFile(testFile).Count(); // <- use count() to force the parser to run because it uses defered execution + Assert.That(() => loader.LoadFromCsvFile(testFile).Count(), Throws.InstanceOf()); // <- use count() to force the parser to run because it uses defered execution } [Test] - [ExpectedException(typeof(CsvParserException))] public void ThrowsExceptionWhenMappedKeyDoesntExistInCsvHeader() { using (var writer = File.CreateText(testFile)) @@ -159,7 +152,7 @@ var loader = new ObjectMaterializer(); loader.Add("name", (entity, value) => entity.Name = value); loader.Add("ages", (entity, value) => entity.Age = int.Parse(value)); - loader.LoadFromCsvFile(testFile).Count(); // <- use count() to force the parser to run because it uses defered execution + Assert.That(() => loader.LoadFromCsvFile(testFile).Count(), Throws.InstanceOf()); // <- use count() to force the parser to run because it uses defered execution } [Test] @@ -177,14 +170,14 @@ var loader = new ObjectMaterializer(); loader.Add("name", (entity, value) => entity.Name = value); loader.Add("age", (entity, value) => entity.Age = int.Parse(value)); - var items = loader.LoadFromCsvFile(testFile); + var items = loader.LoadFromCsvFile(testFile).ToList(); Assert.AreEqual(4, items.Count()); Assert.AreEqual("Tom", items.ElementAt(2).Name); Assert.AreEqual(48, items.ElementAt(2).Age); } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { if (File.Exists(testFile)) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/CoverageFunctionTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/CoverageFunctionTest.cs (.../CoverageFunctionTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/CoverageFunctionTest.cs (.../CoverageFunctionTest.cs) (revision 3825) @@ -40,13 +40,13 @@ #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { mocks = new MockRepository(); } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } @@ -66,44 +66,39 @@ #endregion [Test] - [ExpectedException(typeof(ArgumentException))] public void GetCoverageFunction_NoAttributesInList_Throws() { mocks.ReplayAll(); - CoverageFunction.GetCoverageFunc(repository, new List()); + Assert.That(() => CoverageFunction.GetCoverageFunc(repository, new List()), Throws.ArgumentException); } [Test] - [ExpectedException(typeof(ArgumentException))] public void GetCoverageFunction_AttributeListContainsInvalidString_Throws() { mocks.ReplayAll(); - CoverageFunction.GetCoverageFunc(repository, new List { "" }); + Assert.That(() => CoverageFunction.GetCoverageFunc(repository, new List { "" }), Throws.ArgumentException); } [Test] - [ExpectedException(typeof(ArgumentNullException))] public void GetCoverageFunction_SupportedAttributeListIsNull_Throws() { mocks.ReplayAll(); - repository.GetCoverageFunc("SomeAttribute", null); + Assert.That(() => repository.GetCoverageFunc("SomeAttribute", null), Throws.ArgumentNullException); } [Test] - [ExpectedException(typeof(ArgumentNullException))] public void GetCoverageFunction_RepositoryIsNull_Throws() { mocks.ReplayAll(); - CoverageFunction.GetCoverageFunc(null, new[] { "SomeAttribute" }); + Assert.That(() => CoverageFunction.GetCoverageFunc(null, new[] { "SomeAttribute" }), Throws.ArgumentNullException); } [Test] - [ExpectedException(typeof(ArgumentNullException))] public void UsingCoverageFunction_AttributeNameIsNullOrEmpty_Throws() { mocks.ReplayAll(); Func func = CoverageFunction.GetCoverageFunc(repository, new[] { "SomeAttribute" }); - func("", 0, 0); + Assert.That(() => func("", 0, 0), Throws.ArgumentNullException); } [Test] @@ -137,16 +132,15 @@ } [Test] - [ExpectedException(typeof(AttributeMissingException))] public void UsingCoverageFunction_AttributeNamenotContainedInAttributeList_Throws() { mocks.ReplayAll(); Func func = CoverageFunction.GetCoverageFunc(repository, new[] { "SomeAttribute" }); - func("AnotherAttribute", 0, 0); + Assert.That(() => func("AnotherAttribute", 0, 0), Throws.InstanceOf()); } [Test] - [ExpectedException(typeof(FeatureCoverageException), ExpectedMessage = "Multiple geometries found covering point (0 0)")] + [Ignore("[ExpectedException(typeof(FeatureCoverageException), ExpectedMessage = 'Multiple geometries found covering point (0 0)']")] public void UsingCoverageFunction_MoreThenOneGeometyFoundAtGivenLocation_Throws() { var square = new Polygon(new LinearRing(new[] @@ -157,26 +151,26 @@ new Coordinate(-1, -1), new Coordinate(-1, 1) })); - + Feature geom = Feature.Create(square); //Expect.Call(repository.Features).Return(new[] {geom, geom}); Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom, geom }); - + const string attribute = "SomeAttribute"; Expect.Call(repository.SupportedAttributes).Return(new[] { attribute.ToUpper() }); - + mocks.ReplayAll(); - + Func func = repository.GetCoverageFunc(); - + func(attribute, 0, 0); } [Test] - [ExpectedException(typeof(FeatureCoverageException), ExpectedMessage = "No geometries found covering point (10 10)")] + [Ignore("[ExpectedException(typeof(FeatureCoverageException), ExpectedMessage = 'No geometries found covering point (10 10)')]")] public void UsingCoverageFunction_NoGeometyFoundAtGivenLocation_Throws() { var square = new Polygon(new LinearRing(new[] @@ -187,19 +181,19 @@ new Coordinate(-1, -1), new Coordinate(-1, 1) })); - + const string attribute = "SomeAttribute"; Expect.Call(repository.SupportedAttributes).Return(new[] { attribute.ToUpper() }); - + Feature geom = Feature.Create(square); //Expect.Call(repository.Features).Return(new[] { geom }); Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom }); - + mocks.ReplayAll(); - + Func func = repository.GetCoverageFunc(); func("SomeAttribute", 10, 10); } Index: DamClients/DamUI/trunk/src/Dam/Tests/PLLineTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/PLLineTest.cs (.../PLLineTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/PLLineTest.cs (.../PLLineTest.cs) (revision 3825) @@ -30,7 +30,7 @@ [TestFixture] public class PLLineTest { - [TestFixtureSetUp] + [SetUp] public void TestFixtureSetup() { } Index: DamClients/DamUI/trunk/src/Dam/Tests/Forms/LocationJobSymbolTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Forms/LocationJobSymbolTest.cs (.../LocationJobSymbolTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Forms/LocationJobSymbolTest.cs (.../LocationJobSymbolTest.cs) (revision 3825) @@ -30,12 +30,12 @@ { #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/ExportTextFileTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/IO/ExportTextFileTest.cs (.../ExportTextFileTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/IO/ExportTextFileTest.cs (.../ExportTextFileTest.cs) (revision 3825) @@ -32,12 +32,12 @@ #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CommandOptions.cs =================================================================== diff -u -r2088 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CommandOptions.cs (.../CommandOptions.cs) (revision 2088) +++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CommandOptions.cs (.../CommandOptions.cs) (revision 3825) @@ -23,7 +23,6 @@ using CommandLine; using CommandLine.Text; -using Deltares.Standard; using Deltares.Standard.Reflection; namespace Deltares.Dam.Tools.CsvToDamxConverter Index: DamClients/DamUI/trunk/src/Dam/Tests/PLLinesTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/PLLinesTest.cs (.../PLLinesTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/PLLinesTest.cs (.../PLLinesTest.cs) (revision 3825) @@ -21,14 +21,13 @@ namespace Deltares.Dam.Tests { - using System; using NUnit.Framework; using Deltares.Dam.Data; [TestFixture] public class PPLineTest { - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } @@ -63,7 +62,7 @@ } } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/Dam/Tests/ObjectMaterializerTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/ObjectMaterializerTest.cs (.../ObjectMaterializerTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/ObjectMaterializerTest.cs (.../ObjectMaterializerTest.cs) (revision 3825) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Deltares.Dam.Data; using NUnit.Framework; using System.Collections.Generic; @@ -47,22 +46,20 @@ } [Test] - [ExpectedExceptionAttribute(typeof(ArgumentException))] public void ThrowsExceptionWhenKeyIsAlreadyAdded() { var materializer = new ObjectMaterializer(); materializer.Add("name", (entity, value) => entity.Name = value); - materializer.Add("name", (entity, value) => entity.Name = "test " + value); + Assert.That(() => materializer.Add("name", (entity, value) => entity.Name = "test " + value), Throws.ArgumentException); } [Test] - [ExpectedExceptionAttribute(typeof(KeyNotFoundException))] public void ThrowsExceptionWhenPropertSetterNotExists() { var foo = new Foo(); var materializer = new ObjectMaterializer(); materializer.Add("name", (entity, value) => entity.Name = value); - materializer["age"](foo, "10"); + Assert.That(() => materializer["age"](foo, "10"), Throws.InstanceOf()); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/Properties/AssemblyInfo.cs =================================================================== diff -u -r2088 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 2088) +++ DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 3825) @@ -20,7 +20,6 @@ // All rights reserved. using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs (.../LocationShapeFileImporterDotSpatialTests.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs (.../LocationShapeFileImporterDotSpatialTests.cs) (revision 3825) @@ -21,10 +21,10 @@ using System.Collections.Generic; using System.Linq; -using Deltares.Dam.Data.DataPlugins.Configuration; using NUnit.Framework; using Deltares.Dam.Data.CsvImporters; using Deltares.Dam.Data.Importers; +using DataAttribute = Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute; namespace Deltares.Dam.Tests.Importers { Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvExportSurfaceLineTest.cs =================================================================== diff -u -r3823 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvExportSurfaceLineTest.cs (.../CsvExportSurfaceLineTest.cs) (revision 3823) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvExportSurfaceLineTest.cs (.../CsvExportSurfaceLineTest.cs) (revision 3825) @@ -23,10 +23,11 @@ using Deltares.Geotechnics.GeotechnicalGeometry; using System.Collections.Generic; using System.IO; + using NUnit.Framework; using Deltares.Dam.Data; -using Deltares.Dam.TestHelper.TestUtils; using Deltares.Geotechnics.SurfaceLines; +using Deltares.Geotechnics.TestUtils; namespace Deltares.Dam.Tests { @@ -36,7 +37,7 @@ string importFolder; string fileNameSurfaceLines; - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { importFolder = Directory.GetCurrentDirectory() + "\\TmpImportFiles"; Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LineAttributeImporterTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LineAttributeImporterTest.cs (.../LineAttributeImporterTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LineAttributeImporterTest.cs (.../LineAttributeImporterTest.cs) (revision 3825) @@ -31,7 +31,6 @@ using NetTopologySuite.Geometries; using NUnit.Framework; using Rhino.Mocks; -using Location = Deltares.Dam.Data.Location; namespace Deltares.Dam.Tests.Importers { @@ -46,13 +45,13 @@ #region Fixture Setup/Teardown - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { mocks = new MockRepository(); } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { @@ -71,20 +70,20 @@ crossSectionRepository = mocks.DynamicMock(); attributesRepository = mocks.DynamicMock(); - this.crossSection = Feature.Create(new LineString(new[] + crossSection = Feature.Create(new LineString(new[] { new Coordinate(-1, 0), new Coordinate(1, 0) })); - this.attributeLine = Feature.Create(new LineString(new[] + attributeLine = Feature.Create(new LineString(new[] { new Coordinate(0, -1), new Coordinate(0, 1) })); // this line should not touch - this.outsideLine = Feature.Create(new LineString(new[] + outsideLine = Feature.Create(new LineString(new[] { new Coordinate(10, -1), new Coordinate(10, 1) @@ -99,69 +98,63 @@ #endregion [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "No repository set")] public void Import_NoRepositorySet_Throws() { - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException.With.Message.EqualTo("No repository set")); } [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "The repository doesn't contain attributes")] public void Import_NoAttributesInRepository_Throws() { importer.AttributeRepository = new FeatureRepository(); - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException.With.Message.EqualTo("The repository doesn't contain attributes")); } [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "The location ID attribute name is not valid")] public void Import_LocationIDEmpty_Throws() { importer.AttributeRepository = new FeatureRepository(); importer.AttributeRepository.Add(Feature.Create(0,0, new[]{ new KeyValuePair("test", 0), })); importer.LocationIDAttributeName = ""; - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException.With.Message.EqualTo("The location ID attribute name is not valid")); } [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "The location ID attribute name is not valid")] public void Import_LocationIDNull_Throws() { importer.AttributeRepository = new FeatureRepository(); importer.AttributeRepository.Add(Feature.Create(0, 0, new[] { new KeyValuePair("test", 0), })); importer.LocationIDAttributeName = null; - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException.With.Message.EqualTo("The location ID attribute name is not valid")); } [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "The location ID attribute name is not valid")] public void Import_LocationIDWhiteSpace_Throws() { importer.AttributeRepository = new FeatureRepository(); importer.AttributeRepository.Add(Feature.Create(0, 0, new[] { new KeyValuePair("test", 0), })); importer.LocationIDAttributeName = " "; - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException.With.Message.EqualTo("The location ID attribute name is not valid")); } [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "No cross section repository set")] public void Import_NoCrossSectionSet_Throws() { importer.AttributeRepository = new FeatureRepository(); importer.AttributeRepository.Add(Feature.Create(0, 0, new[] { new KeyValuePair("test", 0), })); importer.LocationIDAttributeName = "Test"; - importer.Import(); + Assert.That(() => importer.Import(), Throws.InvalidOperationException.With.Message.EqualTo("No cross section repository set")); } [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "No attribute mappings set")] public void Import_NoAttributeMappingListSet_Throws() { importer.AttributeRepository = new FeatureRepository(); importer.AttributeRepository.Add(Feature.Create(0, 0, new[] { new KeyValuePair("test", 0), })); importer.CrossSectionRepository = new FeatureRepository(); importer.LocationIDAttributeName = "Test"; - importer.Import(); + Assert.That(() => importer.Import(), + Throws.InvalidOperationException.With.Message.EqualTo("No attribute mappings set")); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataAttribute.cs =================================================================== diff -u -r3526 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataAttribute.cs (.../DataAttribute.cs) (revision 3526) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataAttribute.cs (.../DataAttribute.cs) (revision 3825) @@ -19,10 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Xml.Serialization; namespace Deltares.Dam.Data.DataPlugins.Configuration Index: DamClients/DamUI/trunk/src/Dam/Tests/DikeJobTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/DikeJobTest.cs (.../DikeJobTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/DikeJobTest.cs (.../DikeJobTest.cs) (revision 3825) @@ -21,8 +21,6 @@ using System; using System.Collections.Generic; -using System.Linq; - using Deltares.Dam.TestHelper; using Deltares.Standard.Extensions; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs (.../FeatureTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs (.../FeatureTest.cs) (revision 3825) @@ -34,12 +34,12 @@ #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } @@ -73,7 +73,7 @@ [Test] //[ExpectedException(typeof(ArgumentException), ExpectedMessage = "There was an error parsing the WKT geometry string, maybe due to an incorrect culture format conversion")] // NB This test fails when you change the decimal separator to a point in Dutch regional settings on your computer - [ExpectedException(typeof(ArgumentException))] + [Ignore("[ExpectedException(typeof(ArgumentException))]")] public void FeatueCreation_DutchCultureWktStringFormat_Throws() { Action test = @@ -82,7 +82,7 @@ string geometryWkt = string.Format("MULTIPOINT ({0} {1},{2} {3})", 0.1, 0.2, 0.3, 0.4); feature = Feature.Create(geometryWkt); }; - + CultureHelper.InvokeWithDutchCulture(test); } Index: DamClients/DamUI/trunk/src/Dam/Tests/CoordinateSystemConverterTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/CoordinateSystemConverterTest.cs (.../CoordinateSystemConverterTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/CoordinateSystemConverterTest.cs (.../CoordinateSystemConverterTest.cs) (revision 3825) @@ -20,7 +20,6 @@ // All rights reserved. using Deltares.Geometry; -using Deltares.Geotechnics; using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Dam.Data; using Deltares.Geotechnics.SurfaceLines; @@ -190,12 +189,10 @@ } [Test] - [ExpectedException(typeof(CoordinateSystemConverterException))] public void ThrowsExceptionIfCoordinateSystemConverterNotInitialized() { - const double cTolerance = 0.0000001; var coordinateSystemConverter = new CoordinateSystemConverter(); - Assert.AreEqual(0.0, coordinateSystemConverter.CosAlpha, cTolerance); + Assert.That(() => coordinateSystemConverter.CosAlpha, Throws.InstanceOf()); } [Test] @@ -235,7 +232,7 @@ } [Test] - public void ArePropertiesUnchangedWhenSurfacelIneIsConverted() + public void ArePropertiesUnchangedWhenSurfaceLineIsConverted() { var coordinateSystemConverter = new CoordinateSystemConverter(); using (SurfaceLine2 surfaceline = CreateGlobalSurfaceLineWithAlpha0Degrees()) Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs =================================================================== diff -u -r3822 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 3822) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 3825) @@ -68,17 +68,17 @@ { Attributes = new[] { - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.TrafficLoadAttributeId }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.PenetrationLengthAttributeId }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.TL_DegreeOfConsolidationAttributeId @@ -109,25 +109,25 @@ { Attributes = new[] { - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.LocationAttributeId, AttributeName = "LocationID", DataSource = "Locations2.shp" }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, AttributeName = "DikeringID", DataSource = "Locations2.shp" }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.CrossSectionAttributId, AttributeName = "LocationID", DataSource = "Crosssections.shp" }, - new DataAttribute + new Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute { AttributeId = LocationShapeFileAttributeMap.TL_DegreeOfConsolidationAttributeId, AttributeName = "TL_DegOfCo", Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorRepositoryTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorRepositoryTest.cs (.../SensorRepositoryTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorRepositoryTest.cs (.../SensorRepositoryTest.cs) (revision 3825) @@ -19,12 +19,10 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Linq; using Deltares.Dam.Data; using Deltares.Dam.Data.Sensors; using NUnit.Framework; -using Group = Deltares.Dam.Data.Sensors.Group; namespace Deltares.Dam.Tests.Sensors { @@ -33,12 +31,12 @@ { #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } @@ -74,7 +72,6 @@ } [Test] - [ExpectedException(typeof(ArgumentException))] public void Add_SensorWithSameID_Throws() { // setup @@ -83,17 +80,16 @@ var repository = new SensorRepository(location); var sensor1 = new Sensor() { ID = 1, Name = "test1" }; var sensor2 = new Sensor() { ID = 1, Name = "test2" }; - + // call repository.Add(sensor1); - + // assert - repository.Add(sensor2); // throws + Assert.That(() => repository.Add(sensor2), Throws.ArgumentException); // throws } } [Test] - [ExpectedException(typeof(ArgumentException))] public void Add_SensorWithSameName_Throws() { // setup @@ -102,12 +98,12 @@ var repository = new SensorRepository(location); var sensor1 = new Sensor { ID = 1, Name = "test1" }; var sensor2 = new Sensor { ID = 2, Name = "test1" }; - + // call repository.Add(sensor1); - + // assert - repository.Add(sensor2); // throws + Assert.That(() => repository.Add(sensor2), Throws.ArgumentException); // throws } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureRepositoryTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureRepositoryTest.cs (.../FeatureRepositoryTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureRepositoryTest.cs (.../FeatureRepositoryTest.cs) (revision 3825) @@ -30,12 +30,12 @@ #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/Properties/AssemblyInfo.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 3825) @@ -20,7 +20,6 @@ // All rights reserved. using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs =================================================================== diff -u -r2641 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs (.../Program.cs) (revision 2641) +++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs (.../Program.cs) (revision 3825) @@ -29,16 +29,10 @@ using System.Data.OleDb; using System.IO; using System.Linq; -using System.Threading; - using CommandLine; using Deltares.Dam.Data; -using Deltares.Dam.Data.CsvImporters; -using Deltares.Dam.Data.Importers; -using Deltares.Dam.Data.IO; using Deltares.Dam.Data.Sensors; using Deltares.Dam.Tools.CsvToDamxConverter.Properties; -using Deltares.Standard; using Deltares.Standard.Application; //using Newtonsoft.Json; using Deltares.Standard.Extensions; Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterIrisTests.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterIrisTests.cs (.../DataPluginImporterIrisTests.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterIrisTests.cs (.../DataPluginImporterIrisTests.cs) (revision 3825) @@ -25,13 +25,10 @@ namespace Deltares.Dam.Tests { - using System; using System.Collections.Generic; using System.Linq; - using System.Text; using NUnit.Framework; using Deltares.Dam.Data.DataPlugins; - using Deltares.Geotechnics; [TestFixture] public class DataPluginImporterIrisTests @@ -45,7 +42,7 @@ List srcDataSources; DataPluginImporter dataPluginImporter; - [TestFixtureSetUp] + [SetUp] public void TestFixtureSetup() { srcDataSources = new List(); Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs (.../FailureMechanismeParamatersMStabXmlHandlerTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs (.../FailureMechanismeParamatersMStabXmlHandlerTest.cs) (revision 3825) @@ -22,7 +22,6 @@ using System; using Deltares.Dam.Data; using Deltares.Dam.Data.IO; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard.Reflection; Index: DamClients/DamUI/trunk/src/Dam/Tests/App.config =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/App.config (.../App.config) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/App.config (.../App.config) (revision 3825) @@ -25,92 +25,100 @@ -
+
- + - - + + - + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/GroupTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/GroupTest.cs (.../GroupTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/GroupTest.cs (.../GroupTest.cs) (revision 3825) @@ -19,9 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; using System.Linq; -using Deltares.Dam.Data; using Deltares.Dam.Data.Sensors; using Deltares.Standard.Extensions; using NUnit.Framework; @@ -33,12 +31,12 @@ { #region Setup - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/Dam/Tests/TimeSeries/TimeSeriesProcessorTest.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/TimeSeries/TimeSeriesProcessorTest.cs (.../TimeSeriesProcessorTest.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/TimeSeries/TimeSeriesProcessorTest.cs (.../TimeSeriesProcessorTest.cs) (revision 3825) @@ -42,12 +42,12 @@ } } - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { } - [TestFixtureTearDown] + [TearDown] public void FixtureTearDown() { } Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginDataSourceXmlSerializerTests.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 3825) @@ -21,23 +21,20 @@ using System.Linq; using Deltares.Dam.Data.DataPlugins.Configuration; -using Deltares.Geotechnics; using Deltares.Geotechnics.SurfaceLines; namespace Deltares.Dam.Tests { using NUnit.Framework; - using Deltares.Standard; using Deltares.Dam.Data; - using Deltares.Dam.Data.DataPlugins; [TestFixture] public class DataPluginDataSourceXmlSerializerTests { private const string cXmlFilename = "datasource.xml"; - [TestFixtureSetUp] + [SetUp] public void TestFixtureSetup() { } Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r3527 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 3527) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 3825) @@ -37,7 +37,7 @@ /// /// Setup for whole testfixture /// - [TestFixtureSetUp] + [SetUp] public void FixtureSetup() { importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFiles"); @@ -360,17 +360,15 @@ } [Test] - [ExpectedException(typeof(ArgumentException))] public void SegmentImporterThrowsArgumentExceptionWhenFileNameIsEmpty() { - CsvImporterSegments csvImporterSegments = new CsvImporterSegments(""); + Assert.That(() => new CsvImporterSegments(""), Throws.ArgumentException); } [Test] - [ExpectedException(typeof(FileNotFoundException))] public void SegmentImporterThrowsArgumentExceptionWhenFileDoesNotExist() { - CsvImporterSegments csvImporterSegments = new CsvImporterSegments("bla45se%"); + Assert.That(() => new CsvImporterSegments("bla45se%"), Throws.InstanceOf()); } [Test] @@ -421,15 +419,14 @@ } [Test] - [ExpectedException(typeof(CsvImporterSegmentsException))] public void SegmentImporterIllegalHeaderTest() { const string importFile = "segments.csv"; string testFilePath = Path.Combine(importFolder, importFile); if (File.Exists(testFilePath)) File.Delete(testFilePath); CreateSegmentsFileWithIllegalHeader(testFilePath); - CsvImporterSegments csvImporterSegments = new CsvImporterSegments(testFilePath); + Assert.That(() => new CsvImporterSegments(testFilePath), Throws.InstanceOf()); } [Test] @@ -481,27 +478,25 @@ } [Test] - [ExpectedException(typeof(Deltares.Dam.Data.CsvImporters.CsvImporterSoilProfilesException))] public void SoilProfilesImporterIllegalHeaderTest() { const string importFile = "soilprofiles.csv"; string testFilePath = Path.Combine(importFolder, importFile); if (File.Exists(testFilePath)) File.Delete(testFilePath); CreateSoilProfilesFileWithIllegalHeader(testFilePath); - CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath); + Assert.That(() => new CsvImporterSoilProfiles(testFilePath), Throws.InstanceOf()); } [Test] - [ExpectedException(typeof(Deltares.Dam.Data.CsvImporters.CsvImporterSoilProfilesException))] public void SoilProfilesImporterMissingHeaderFieldTest() { const string importFile = "soilprofiles.csv"; string testFilePath = Path.Combine(importFolder, importFile); if (File.Exists(testFilePath)) File.Delete(testFilePath); CreateSoilProfilesFileWithIllegalHeaderField(testFilePath); - CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath); + Assert.That(() => new CsvImporterSoilProfiles(testFilePath), Throws.InstanceOf()); } [Test] @@ -601,15 +596,14 @@ } [Test] - [ExpectedException(typeof(CsvImporterCharacteristicPointsException))] public void CharacteristicPointsImporterIllegalHeaderTest() { const string importFile = "characteristicpoints.csv"; string testFilePath = Path.Combine(importFolder, importFile); if (File.Exists(testFilePath)) File.Delete(testFilePath); CreateCharacteristicPointsFileWithIllegalHeader(testFilePath); - CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(testFilePath); + Assert.That(() => new CsvImporterCharacteristicPoints(testFilePath), Throws.InstanceOf()); } [Test] @@ -673,15 +667,14 @@ } [Test] - [ExpectedException(typeof(Deltares.Dam.Data.CsvImporters.CsvImporterSurfaceLinesException))] public void SurfaceLinesImporterIllegalHeaderTest() { const string importFile = "surfacelines.csv"; string testFilePath = Path.Combine(importFolder, importFile); if (File.Exists(testFilePath)) File.Delete(testFilePath); CreateSurfaceLinesFileWithIllegalHeaders(testFilePath); - CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(testFilePath); + Assert.That(() => new CsvImporterSurfaceLines(testFilePath), Throws.InstanceOf()); } [Test] @@ -707,44 +700,44 @@ CreateLocationsFileWithObsoleteColumn(testFilePath); CsvImporterLocations csvImporterLocations = new CsvImporterLocations(testFilePath); IList locationRecords = csvImporterLocations.ImportedItems; - Assert.AreEqual(2, locationRecords.Count); - Assert.AreEqual("25-2-2-A-1-A", locationRecords[1].LocationId); - Assert.AreEqual("25-2-2-A-1-A", locationRecords[1].SurfaceLineId); - Assert.AreEqual("106", locationRecords[1].SegmentId); - Assert.AreEqual(66586.0, locationRecords[1].GeoX, tolerance); - Assert.AreEqual(424173.0, locationRecords[1].GeoY, tolerance); - Assert.AreEqual(2.0, locationRecords[1].XSoilGeometry2DOrigin, tolerance); - Assert.AreEqual(-0.25, locationRecords[1].PolderLevel, tolerance); - Assert.AreEqual(0.8727, locationRecords[1].HeadPl2.Value, tolerance); - Assert.AreEqual(0.9, locationRecords[0].HeadPl3.Value, tolerance); - Assert.AreEqual(0.8, locationRecords[0].HeadPl4.Value, tolerance); - Assert.AreEqual("klei", locationRecords[1].DikeEmbankmentMaterial); - Assert.AreEqual("klei2", locationRecords[1].ShoulderEmbankmentMaterial); - Assert.AreEqual(1.3, locationRecords[1].PenetrationLength, tolerance); - Assert.AreEqual(10, locationRecords[1].TrafficLoad, tolerance); - Assert.AreEqual(10.1, locationRecords[0].TL_DegreeOfConsolidation, tolerance); - Assert.AreEqual(55.5, locationRecords[1].TL_DegreeOfConsolidation, tolerance); - Assert.AreEqual(1.5, locationRecords[1].MinimalCircleDepth, tolerance); - Assert.AreEqual(30.0, locationRecords[1].DampingFactorPl3, tolerance); - Assert.AreEqual(40.0, locationRecords[1].DampingFactorPl4, tolerance); - Assert.AreEqual(PLLineCreationMethod.ExpertKnowledgeRRD, locationRecords[1].PLLineCreationMethod); - Assert.AreEqual(1.2, locationRecords[1].RequiredSafetyFactorPiping, tolerance); - Assert.AreEqual(1.3, locationRecords[1].RequiredSafetyFactorStabilityInnerSlope, tolerance); - Assert.AreEqual(1.4, locationRecords[1].RequiredSafetyFactorStabilityOuterSlope, tolerance); - Assert.AreEqual(1.1, locationRecords[1].UpliftCriterionPiping, tolerance); - Assert.AreEqual(1.2, locationRecords[1].UpliftCriterionStability, tolerance); - Assert.AreEqual(2.1, locationRecords[1].DistanceToEntryPoint, tolerance); - Assert.AreEqual(0.5, locationRecords[1].PlLineOffsetBelowDikeTopAtRiver, tolerance); - Assert.AreEqual(0.6, locationRecords[1].PlLineOffsetBelowDikeTopAtPolder, tolerance); - Assert.AreEqual(0.1, locationRecords[1].PlLineOffsetBelowShoulderBaseInside, tolerance); - Assert.AreEqual(0.2, locationRecords[1].PlLineOffsetBelowDikeToeAtPolder, tolerance); - Assert.AreEqual(2.0, locationRecords[1].StabilityShoulderGrowSlope, tolerance); - Assert.AreEqual(0.2, locationRecords[1].StabilityShoulderGrowDeltaX, tolerance); - Assert.AreEqual(0.5, locationRecords[1].StabilitySlopeAdaptionDeltaX, tolerance); - Assert.AreEqual(0.01, locationRecords[0].SlopeDampingPiezometricHeightPolderSide, tolerance); - Assert.AreEqual(0.2, locationRecords[1].SlopeDampingPiezometricHeightPolderSide, tolerance); - Assert.AreEqual(StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, locationRecords[0].StabilityDesignMethod); - Assert.AreEqual(StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, locationRecords[1].StabilityDesignMethod); + Assert.That(locationRecords.Count, Is.EqualTo(2)); + Assert.That(locationRecords[1].LocationId, Is.EqualTo("25-2-2-A-1-A")); + Assert.That(locationRecords[1].SurfaceLineId, Is.EqualTo("25-2-2-A-1-A")); + Assert.That(locationRecords[1].SegmentId, Is.EqualTo("106")); + Assert.That(locationRecords[1].GeoX, Is.EqualTo(66586.0).Within(tolerance)); + Assert.That(locationRecords[1].GeoY, Is.EqualTo(424173.0).Within(tolerance)); + Assert.That(locationRecords[1].XSoilGeometry2DOrigin, Is.EqualTo(2.0).Within(tolerance)); + Assert.That(locationRecords[1].PolderLevel, Is.EqualTo(-0.25).Within(tolerance)); + Assert.That(locationRecords[1].HeadPl2.Value, Is.EqualTo(0.8727).Within(tolerance)); + Assert.That(locationRecords[0].HeadPl3.Value, Is.EqualTo(0.9).Within(tolerance)); + Assert.That(locationRecords[0].HeadPl4.Value, Is.EqualTo(0.8).Within(tolerance)); + Assert.That(locationRecords[1].DikeEmbankmentMaterial, Is.EqualTo("klei")); + Assert.That(locationRecords[1].ShoulderEmbankmentMaterial, Is.EqualTo("klei2")); + Assert.That(locationRecords[1].PenetrationLength, Is.EqualTo(1.3).Within(tolerance)); + Assert.That(locationRecords[1].TrafficLoad, Is.EqualTo(10).Within(tolerance)); + Assert.That(locationRecords[0].TL_DegreeOfConsolidation, Is.EqualTo(10.1).Within(tolerance)); + Assert.That(locationRecords[1].TL_DegreeOfConsolidation, Is.EqualTo(55.5).Within(tolerance)); + Assert.That(locationRecords[1].MinimalCircleDepth, Is.EqualTo(1.5).Within(tolerance)); + Assert.That(locationRecords[1].DampingFactorPl3, Is.EqualTo(30.0).Within(tolerance)); + Assert.That(locationRecords[1].DampingFactorPl4, Is.EqualTo(40.0).Within(tolerance)); + Assert.That(locationRecords[1].PLLineCreationMethod, Is.EqualTo(PLLineCreationMethod.ExpertKnowledgeRRD)); + Assert.That(locationRecords[1].RequiredSafetyFactorPiping, Is.EqualTo(1.2).Within(tolerance)); + Assert.That(locationRecords[1].RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(1.3).Within(tolerance)); + Assert.That(locationRecords[1].RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(1.4).Within(tolerance)); + Assert.That(locationRecords[1].UpliftCriterionPiping, Is.EqualTo(1.1).Within(tolerance)); + Assert.That(locationRecords[1].UpliftCriterionStability, Is.EqualTo(1.2).Within(tolerance)); + Assert.That(locationRecords[1].DistanceToEntryPoint, Is.EqualTo(2.1).Within(tolerance)); + Assert.That(locationRecords[1].PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(0.5).Within(tolerance)); + Assert.That(locationRecords[1].PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(0.6).Within(tolerance)); + Assert.That(locationRecords[1].PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(0.1).Within(tolerance)); + Assert.That(locationRecords[1].PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(0.2).Within(tolerance)); + Assert.That(locationRecords[1].StabilityShoulderGrowSlope, Is.EqualTo(2.0).Within(tolerance)); + Assert.That(locationRecords[1].StabilityShoulderGrowDeltaX, Is.EqualTo(0.2).Within(tolerance)); + Assert.That(locationRecords[1].StabilitySlopeAdaptionDeltaX, Is.EqualTo(0.5).Within(tolerance)); + Assert.That(locationRecords[0].SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(0.01).Within(tolerance)); + Assert.That(locationRecords[1].SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(0.2).Within(tolerance)); + Assert.That(locationRecords[0].StabilityDesignMethod, Is.EqualTo(StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption)); + Assert.That(locationRecords[1].StabilityDesignMethod, Is.EqualTo(StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption)); Assert.AreEqual(3.0, locationRecords[0].SlopeAdaptionStartCotangent, tolerance); Assert.AreEqual(6.0, locationRecords[0].SlopeAdaptionEndCotangent, tolerance); Assert.AreEqual(0.5, locationRecords[0].SlopeAdaptionStepCotangent, tolerance); @@ -898,15 +891,14 @@ } [Test] - [ExpectedException(typeof(CsvImporterScenariosException))] public void ScenariosImporterIllegalHeaderTest() { const string importFile = "scenarios.csv"; string testFilePath = Path.Combine(importFolder, importFile); if (File.Exists(testFilePath)) File.Delete(testFilePath); CreateScenariosFileWithIllegalHeader(testFilePath); - CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath); + Assert.That(() => new CsvImporterScenarios(testFilePath), Throws.InstanceOf()); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj =================================================================== diff -u -r3823 -r3825 --- DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj (.../Deltares.Dam.TestHelper.csproj) (revision 3823) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj (.../Deltares.Dam.TestHelper.csproj) (revision 3825) @@ -1,5 +1,6 @@  + Debug x86 @@ -71,8 +72,8 @@ False ..\..\..\..\lib\DSL-Core\Deltares.Standard.dll - - ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll + + ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll @@ -114,6 +115,7 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. +