Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs =================================================================== diff -u -r71d4e63c89a10c9d0ea8aa2535cde0bc973d9991 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision 71d4e63c89a10c9d0ea8aa2535cde0bc973d9991) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -200,7 +200,7 @@ if (databaseVersion > currentDatabaseVersion) { - string m = String.Format(Resources.StorageSqLite_ValidateDatabaseVersion_DatabaseVersion_0_higher_then_current_DatabaseVersion_1_, + string m = string.Format(Resources.StorageSqLite_ValidateDatabaseVersion_DatabaseVersion_0_higher_then_current_DatabaseVersion_1_, databaseVersion, currentDatabaseVersion); var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m); throw new StorageValidationException(message); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilisticAssessmentOutputCreateExtensionsTest.cs =================================================================== diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilisticAssessmentOutputCreateExtensionsTest.cs (.../ProbabilisticAssessmentOutputCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilisticAssessmentOutputCreateExtensionsTest.cs (.../ProbabilisticAssessmentOutputCreateExtensionsTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -70,7 +70,7 @@ public void Create_NaNValues_ReturnProbabilisticOutputEntityWithNullValues() { // Setup - var output = new ProbabilityAssessmentOutput(double.NaN, double.NaN, Double.NaN, + var output = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/SqLiteConnectionStringBuilderTest.cs =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/SqLiteConnectionStringBuilderTest.cs (.../SqLiteConnectionStringBuilderTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/SqLiteConnectionStringBuilderTest.cs (.../SqLiteConnectionStringBuilderTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -48,10 +48,10 @@ // Assert Assert.IsNotNullOrEmpty(connectionString); - StringAssert.Contains(String.Format("metadata=res://*/{0}.csdl|res://*/{0}.ssdl|res://*/{0}.msl;", "DbContext.RingtoetsEntities"), connectionString); + StringAssert.Contains(string.Format("metadata=res://*/{0}.csdl|res://*/{0}.ssdl|res://*/{0}.msl;", "DbContext.RingtoetsEntities"), connectionString); StringAssert.Contains("provider=System.Data.SQLite.EF6", connectionString); StringAssert.Contains("failifmissing=True", connectionString); - StringAssert.Contains(String.Format("data source={0}", pathToSqLiteFile), connectionString); + StringAssert.Contains(string.Format("data source={0}", pathToSqLiteFile), connectionString); StringAssert.Contains("read only=False", connectionString); StringAssert.Contains("foreign keys=True", connectionString); StringAssert.Contains("version=3", connectionString); @@ -69,10 +69,10 @@ // Assert Assert.IsNotNullOrEmpty(connectionString); - StringAssert.Contains(String.Format("metadata=res://*/{0}.csdl|res://*/{0}.ssdl|res://*/{0}.msl;", "DbContext.RingtoetsEntities"), connectionString); + StringAssert.Contains(string.Format("metadata=res://*/{0}.csdl|res://*/{0}.ssdl|res://*/{0}.msl;", "DbContext.RingtoetsEntities"), connectionString); StringAssert.Contains("provider=System.Data.SQLite.EF6", connectionString); StringAssert.Contains("failifmissing=True", connectionString); - StringAssert.Contains(String.Format(@"data source=\\{0}", uncPathToSqlFile), connectionString); + StringAssert.Contains(string.Format(@"data source=\\{0}", uncPathToSqlFile), connectionString); StringAssert.Contains("read only=False", connectionString); StringAssert.Contains("foreign keys=True", connectionString); StringAssert.Contains("version=3", connectionString); @@ -104,7 +104,7 @@ StringAssert.DoesNotContain("metadata=", connectionString); StringAssert.DoesNotContain("System.Data.SQLite.EF6", connectionString); StringAssert.Contains("failifmissing=True", connectionString); - StringAssert.Contains(String.Format("data source={0}", pathToSqLiteFile), connectionString); + StringAssert.Contains(string.Format("data source={0}", pathToSqLiteFile), connectionString); StringAssert.Contains("read only=False", connectionString); StringAssert.Contains("foreign keys=True", connectionString); StringAssert.Contains("version=3", connectionString); @@ -125,7 +125,7 @@ StringAssert.DoesNotContain("metadata=", connectionString); StringAssert.DoesNotContain("System.Data.SQLite.EF6", connectionString); StringAssert.Contains("failifmissing=True", connectionString); - StringAssert.Contains(String.Format(@"data source={0}", uncPathToSqlFile), connectionString); + StringAssert.Contains(string.Format(@"data source={0}", uncPathToSqlFile), connectionString); StringAssert.Contains("read only=False", connectionString); StringAssert.Contains("foreign keys=True", connectionString); StringAssert.Contains("version=3", connectionString); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs =================================================================== diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -170,7 +170,7 @@ public void LoadProject_DatabaseWithoutVersionEntities_ThrowStorageValidationException() { // Setup - string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': {1}", + string expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': {1}", tempRingtoetsFile, @"Database moet één rij in de VersionEntity tabel hebben."); @@ -200,7 +200,7 @@ public void LoadProject_DatabaseWithMultipleVersionEntities_ThrowStorageValidationException() { // Setup - string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': {1}", + string expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': {1}", tempRingtoetsFile, @"Database moet één rij in de VersionEntity tabel hebben."); @@ -239,7 +239,7 @@ // Setup string subMessage = string.Format("Database versie '{0}' is hoger dan de huidig ondersteunde versie ('1'). Update Ringtoets naar een nieuwere versie.", versionCode); - string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': {1}", + string expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': {1}", tempRingtoetsFile, subMessage); @@ -276,7 +276,7 @@ // Setup string subMessage = string.Format("Database versie '{0}' is niet valide. Database versie dient '1' of hoger te zijn.", versionCode); - string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': {1}", + string expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': {1}", tempRingtoetsFile, subMessage); Index: Core/Common/src/Core.Common.Base/Data/RoundedDouble.cs =================================================================== diff -u -r151bab16a7ebc1bffc0621ab56c6dc219db1e90f -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/src/Core.Common.Base/Data/RoundedDouble.cs (.../RoundedDouble.cs) (revision 151bab16a7ebc1bffc0621ab56c6dc219db1e90f) +++ Core/Common/src/Core.Common.Base/Data/RoundedDouble.cs (.../RoundedDouble.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -33,7 +33,7 @@ /// number of places. /// [TypeConverter(typeof(RoundedDoubleConverter))] - public struct RoundedDouble : IEquatable, IEquatable, IFormattable + public struct RoundedDouble : IEquatable, IEquatable, IFormattable { /// /// The maximum number of decimal places supported by this class. @@ -127,7 +127,7 @@ return d.value; } - public static explicit operator RoundedDouble(Double d) + public static explicit operator RoundedDouble(double d) { return new RoundedDouble(MaximumNumberOfDecimalPlaces, d); } Index: Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs =================================================================== diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision 0d22462e91eb69208ab2aee6ed2c621d31006b02) +++ Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -153,7 +153,7 @@ } var filePath = OpenProjectSaveFileDialog(project.Name); - if (String.IsNullOrWhiteSpace(filePath)) + if (string.IsNullOrWhiteSpace(filePath)) { return false; } @@ -167,7 +167,7 @@ projectOwner.ProjectFilePath = filePath; project.Name = Path.GetFileNameWithoutExtension(filePath); project.NotifyObservers(); - log.Info(String.Format(Resources.StorageCommandHandler_SaveProject_Succesfully_saved_project_0_, project.Name)); + log.Info(string.Format(Resources.StorageCommandHandler_SaveProject_Succesfully_saved_project_0_, project.Name)); return true; } @@ -191,7 +191,7 @@ return false; } - log.Info(String.Format(Resources.StorageCommandHandler_SaveProject_Succesfully_saved_project_0_, project.Name)); + log.Info(string.Format(Resources.StorageCommandHandler_SaveProject_Succesfully_saved_project_0_, project.Name)); return true; } Index: Core/Common/src/Core.Common.IO/Readers/StreamReaderHelper.cs =================================================================== diff -u -r9a4c74a9d2cc49987adf0049919baafa6e12a618 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/src/Core.Common.IO/Readers/StreamReaderHelper.cs (.../StreamReaderHelper.cs) (revision 9a4c74a9d2cc49987adf0049919baafa6e12a618) +++ Core/Common/src/Core.Common.IO/Readers/StreamReaderHelper.cs (.../StreamReaderHelper.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -57,7 +57,7 @@ } catch (IOException e) { - var message = new FileReaderErrorMessageBuilder(path).Build(String.Format(Resources.Error_General_IO_ErrorMessage_0_, e.Message)); + var message = new FileReaderErrorMessageBuilder(path).Build(string.Format(Resources.Error_General_IO_ErrorMessage_0_, e.Message)); throw new CriticalFileReadException(message, e); } } Index: Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs =================================================================== diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5) +++ Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -183,7 +183,7 @@ mocks.VerifyAll(); } - private class SimpleFileImporter : FileImporterBase + private class SimpleFileImporter : FileImporterBase { public override string Name { Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs =================================================================== diff -u -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -58,7 +58,7 @@ var importHandler = new GuiImportHandler(mainWindow, new List()); // Call - importHandler.ImportOn(typeof(Int64)); + importHandler.ImportOn(typeof(long)); // Assert Assert.AreEqual("Fout", messageBoxTitle); @@ -92,7 +92,7 @@ var importHandler = new GuiImportHandler(mainWindow, fileImporters); // Call - importHandler.ImportOn(typeof(Int64)); + importHandler.ImportOn(typeof(long)); // Assert Assert.AreEqual("Fout", messageBoxTitle); Index: Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs =================================================================== diff -u -rde4477561032a5d95d5e65e50b719724466648ed -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs (.../DoubleWithToleranceComparer.cs) (revision de4477561032a5d95d5e65e50b719724466648ed) +++ Core/Common/test/Core.Common.TestUtil/DoubleWithToleranceComparer.cs (.../DoubleWithToleranceComparer.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -53,7 +53,7 @@ { if (!(x is double) || !(y is double)) { - throw new ArgumentException(string.Format("Cannot compare objects other than {0} with this comparer.", typeof(Double))); + throw new ArgumentException(string.Format("Cannot compare objects other than {0} with this comparer.", typeof(double))); } return Compare((double)x, (double)y); } Index: Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs =================================================================== diff -u -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs (.../GuiTestHelper.cs) (revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5) +++ Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs (.../GuiTestHelper.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -79,7 +79,7 @@ return File.Exists("C:\\build.server") || File.Exists("D:\\build.server") || File.Exists("/tmp/build-server") - || !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILD_NUMBER")); + || !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILD_NUMBER")); } } Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs =================================================================== diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173) +++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -385,9 +385,9 @@ private static float GetMachineHddPerformanceRank() { string rank = Environment.GetEnvironmentVariable("MACHINE_HDD_PERFORMANCE_RANK"); - if (!String.IsNullOrEmpty(rank)) + if (!string.IsNullOrEmpty(rank)) { - return Single.Parse(rank); + return float.Parse(rank); } return 1.0f; Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs =================================================================== diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs (.../MapControl.cs) (revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92) +++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs (.../MapControl.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -131,7 +131,7 @@ private static void AddPadding(Extent extent) { var padding = Math.Min(extent.Height, extent.Width)*0.05; - if (Math.Max(extent.Height, extent.Width) + padding <= Double.MaxValue) + if (Math.Max(extent.Height, extent.Width) + padding <= double.MaxValue) { extent.ExpandBy(padding); } Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs (.../MapControlTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs (.../MapControlTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -232,8 +232,8 @@ [TestCase(5.0, 5.0)] [TestCase(5.0, 1.0)] [TestCase(1.0, 5.0)] - [TestCase(Double.MaxValue*0.96, Double.MaxValue*0.96)] - [TestCase(Double.MaxValue, Double.MaxValue)] + [TestCase(double.MaxValue*0.96, double.MaxValue*0.96)] + [TestCase(double.MaxValue, double.MaxValue)] public void ZoomToAllVisibleLayers_LayersOfVariousDimensions_ZoomToVisibleLayersExtent(double xMax, double yMax) { // Setup @@ -270,7 +270,7 @@ map.ZoomToAllVisibleLayers(); // Assert - if (Double.IsInfinity(expectedExtent.Height) || Double.IsInfinity(expectedExtent.Width)) + if (double.IsInfinity(expectedExtent.Height) || double.IsInfinity(expectedExtent.Width)) { Assert.AreEqual(mapView.GetMaxExtent(), mapView.ViewExtents); Assert.AreNotEqual(expectedExtent, mapView.ViewExtents); Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs =================================================================== diff -u -rcf2dc4330cecec3b8c8acae9e195280323fc2a50 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision cf2dc4330cecec3b8c8acae9e195280323fc2a50) +++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -100,7 +100,7 @@ private static string[] GetShapeFilesInFolder(string path) { - if (String.IsNullOrWhiteSpace(path)) + if (string.IsNullOrWhiteSpace(path)) { var message = new FileReaderErrorMessageBuilder(path).Build(Resources.Error_Path_must_be_specified); throw new ArgumentException(message); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r35baeb163866f62a72bccf6438ddc08b41407ecf -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 35baeb163866f62a72bccf6438ddc08b41407ecf) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -357,7 +357,7 @@ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex]; Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text); - StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image); Assert.IsFalse(contextMenuItem.Enabled); } @@ -508,7 +508,7 @@ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex]; Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text); - StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image); Assert.IsFalse(contextMenuItem.Enabled); } @@ -628,12 +628,12 @@ TestHelper.AssertLogMessages(action, messages => { var msgs = messages.ToArray(); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); - StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); }); Assert.IsNull(calculation.Output); @@ -700,8 +700,8 @@ TestHelper.AssertLogMessages(action, messages => { var msgs = messages.ToArray(); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); }); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r35baeb163866f62a72bccf6438ddc08b41407ecf -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 35baeb163866f62a72bccf6438ddc08b41407ecf) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -72,9 +72,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith("Validatie mislukt: Er is geen hydraulische randvoorwaardenlocatie geselecteerd.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[2]); }); Assert.AreEqual(ActivityState.Failed, activity.State); } @@ -178,11 +178,11 @@ { var msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -220,12 +220,12 @@ { var msgs = messages.ToArray(); Assert.AreEqual(6, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); - StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); }); Assert.AreEqual(ActivityState.Failed, activity.State); mocks.VerifyAll(); // Expect no calls on the observer @@ -271,13 +271,13 @@ { var msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[4]); - StringAssert.StartsWith(String.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[5]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[6]); + StringAssert.StartsWith(string.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[6]); }); Assert.AreEqual(ActivityState.Executed, activity.State); mocks.VerifyAll(); // Expect no calls on the observer Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationServiceIntegrationTest.cs =================================================================== diff -u -r35baeb163866f62a72bccf6438ddc08b41407ecf -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationServiceIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationServiceIntegrationTest.cs) (revision 35baeb163866f62a72bccf6438ddc08b41407ecf) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationServiceIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationServiceIntegrationTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -68,9 +68,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); StringAssert.StartsWith("Validatie mislukt: Er is geen hydraulische randvoorwaardenlocatie geselecteerd.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); }); Assert.IsFalse(isValid); } @@ -250,7 +250,7 @@ var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[0]); - StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[1]); }); Assert.IsNull(output); } @@ -335,7 +335,7 @@ var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[0]); - StringAssert.StartsWith(String.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[1]); }); Assert.IsNaN(output); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r35baeb163866f62a72bccf6438ddc08b41407ecf -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision 35baeb163866f62a72bccf6438ddc08b41407ecf) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -359,7 +359,7 @@ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex]; Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text); - StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image); Assert.IsFalse(contextMenuItem.Enabled); } @@ -511,7 +511,7 @@ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex]; Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text); - StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image); Assert.IsFalse(contextMenuItem.Enabled); } @@ -630,13 +630,13 @@ { var msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); - StringAssert.StartsWith(String.Format("De berekening voor hoogte kunstwerk '{0}' is niet gelukt.", calculation.Name), msgs[4]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); - StringAssert.StartsWith(String.Format("Uitvoeren van '{0}' is mislukt.", calculation.Name), msgs[6]); + StringAssert.StartsWith(string.Format("De berekening voor hoogte kunstwerk '{0}' is niet gelukt.", calculation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("Uitvoeren van '{0}' is mislukt.", calculation.Name), msgs[6]); }); Assert.IsNull(calculation.Output); @@ -702,8 +702,8 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); }); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs =================================================================== diff -u -rad11d25e651c47162ecf08d11a05d40bba0bebca -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision ad11d25e651c47162ecf08d11a05d40bba0bebca) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -111,7 +111,7 @@ { ValidateStochasticParametersForPiping(); - bottom = Double.MaxValue; + bottom = double.MaxValue; var result = new Collection(); if (OuterLoop != null) { Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -84,7 +84,7 @@ { if (!dataReader.HasRows) { - throw new CriticalFileReadException(String.Format( + throw new CriticalFileReadException(string.Format( Resources.PipingSoilProfileReader_Database_incorrect_version_requires_Version_0_, databaseRequiredVersion)); } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs =================================================================== diff -u -rad11d25e651c47162ecf08d11a05d40bba0bebca -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision ad11d25e651c47162ecf08d11a05d40bba0bebca) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -329,7 +329,7 @@ string line; while ((line = ReadLineAndHandleIOExceptions(reader, lineNumberForMessage)) != null) { - if (!String.IsNullOrWhiteSpace(line)) + if (!string.IsNullOrWhiteSpace(line)) { count++; } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/PipingSurfaceLinesCsvReader.cs =================================================================== diff -u -r27e5d9fb2ffd87ea219ecfb4217a8080f819df62 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/PipingSurfaceLinesCsvReader.cs (.../PipingSurfaceLinesCsvReader.cs) (revision 27e5d9fb2ffd87ea219ecfb4217a8080f819df62) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/PipingSurfaceLinesCsvReader.cs (.../PipingSurfaceLinesCsvReader.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -260,7 +260,7 @@ separator)); } return readText.Split(separator) - .TakeWhile(text => !String.IsNullOrEmpty(text)) + .TakeWhile(text => !string.IsNullOrEmpty(text)) .ToArray(); } @@ -332,7 +332,7 @@ try { return tokenizedString.Skip(startGeometryColumnIndex) - .Select(ts => Double.Parse(ts, CultureInfo.InvariantCulture)) + .Select(ts => double.Parse(ts, CultureInfo.InvariantCulture)) .ToArray(); } catch (FormatException e) @@ -427,7 +427,7 @@ string line; while ((line = ReadLineAndHandleIOExceptions(reader, lineNumberForMessage)) != null) { - if (!String.IsNullOrWhiteSpace(line)) + if (!string.IsNullOrWhiteSpace(line)) { count++; } Index: Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs =================================================================== diff -u -r0adc6562a9cedb81859034ef5d62e9b11db4d9c7 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs (.../InputParameterCalculationService.cs) (revision 0adc6562a9cedb81859034ef5d62e9b11db4d9c7) +++ Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs (.../InputParameterCalculationService.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -47,26 +47,26 @@ { var calculatorInput = new PipingCalculatorInput( waterVolumetricWeight, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, phreaticLevelExit, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, exitPointL, surfaceLine, soilProfile @@ -75,7 +75,7 @@ } catch (PipingCalculatorException) { - return Double.NaN; + return double.NaN; } } @@ -89,28 +89,28 @@ public static double CalculatePiezometricHeadAtExit(RoundedDouble assessmentLevel, RoundedDouble dampingFactorExit, RoundedDouble phreaticLevelExit) { var calculatorInput = new PipingCalculatorInput( - Double.NaN, - Double.NaN, - Double.NaN, + double.NaN, + double.NaN, + double.NaN, assessmentLevel, - Double.NaN, + double.NaN, dampingFactorExit, phreaticLevelExit, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, - Double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, + double.NaN, null, null ); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs =================================================================== diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -337,7 +337,7 @@ var derivedInput = new DerivedPipingInput(input); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -361,7 +361,7 @@ var derivedInput = new DerivedPipingInput(input); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -415,7 +415,7 @@ var derivedInput = new DerivedPipingInput(input); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -443,7 +443,7 @@ var derivedInput = new DerivedPipingInput(input); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -471,7 +471,7 @@ var derivedInput = new DerivedPipingInput(input); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.5) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -574,7 +574,7 @@ PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -597,7 +597,7 @@ PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -662,7 +662,7 @@ PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -689,7 +689,7 @@ PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.0) { @@ -716,7 +716,7 @@ PipingInput input = PipingCalculationFactory.CreateInputWithAquiferAndCoverageLayer(); input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(2.5) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -63,7 +63,7 @@ public void Constructor_WithNameBottomLayersEmpty_ThrowsArgumentException() { // Call - TestDelegate test = () => new PipingSoilProfile(String.Empty, Double.NaN, new Collection(), SoilProfileType.SoilProfile1D, 0); + TestDelegate test = () => new PipingSoilProfile(string.Empty, double.NaN, new Collection(), SoilProfileType.SoilProfile1D, 0); // Assert var expectedMessage = PrimitivesResources.Error_Cannot_Construct_PipingSoilProfile_Without_Layers; @@ -74,7 +74,7 @@ public void Constructor_WithNameBottomLayersNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new PipingSoilProfile(String.Empty, Double.NaN, null, SoilProfileType.SoilProfile1D, 0); + TestDelegate test = () => new PipingSoilProfile(string.Empty, double.NaN, null, SoilProfileType.SoilProfile1D, 0); // Assert var expectedMessage = PrimitivesResources.Error_Cannot_Construct_PipingSoilProfile_Without_Layers; @@ -123,7 +123,7 @@ }; // Call - TestDelegate test = () => new PipingSoilProfile(String.Empty, bottom, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); + TestDelegate test = () => new PipingSoilProfile(string.Empty, bottom, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Assert const string expectedMessage = "Eén of meerdere lagen hebben een top onder de bodem van de ondergrondschematisatie."; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -46,7 +46,7 @@ // Assert Assert.IsInstanceOf(surfaceLine); - Assert.AreEqual(String.Empty, surfaceLine.Name); + Assert.AreEqual(string.Empty, surfaceLine.Name); CollectionAssert.IsEmpty(surfaceLine.Points); Assert.IsNull(surfaceLine.StartingWorldPoint); Assert.IsNull(surfaceLine.EndingWorldPoint); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Segment2DLoopCollectionHelperTest.cs =================================================================== diff -u -rae09732abad92d670274d8661856965b59021cd5 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Segment2DLoopCollectionHelperTest.cs (.../Segment2DLoopCollectionHelperTest.cs) (revision ae09732abad92d670274d8661856965b59021cd5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Segment2DLoopCollectionHelperTest.cs (.../Segment2DLoopCollectionHelperTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -31,7 +31,7 @@ public void CreateFromString_OnePoint_ReturnsExpectedPoints() { // Call - var result = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + var result = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "3", "..1..", ".....", @@ -48,7 +48,7 @@ public void CreateFromString_TwoPoint_ReturnsExpectedPoints() { // Call - var result = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + var result = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "3", "..1..", ".....", @@ -67,7 +67,7 @@ public void CreateFromString_TwoPointReversed_ReturnsExpectedPoints() { // Call - var result = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + var result = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "3", "..2..", ".....", Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs =================================================================== diff -u -r2363244674e6b7b97bead9a6855806420d368d80 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision 2363244674e6b7b97bead9a6855806420d368d80) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -40,7 +40,7 @@ var top = 10.56; var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0.0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0.0, new[] { new PipingSoilLayer(top) { @@ -126,7 +126,7 @@ }); var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, -thicknessAquiferLayer, new[] + SoilProfile = new PipingSoilProfile(string.Empty, -thicknessAquiferLayer, new[] { new PipingSoilLayer(thicknessCoverageLayer) { @@ -158,7 +158,7 @@ }); var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(surfaceLineTopLevel + deltaAboveSurfaceLine + 2) { @@ -193,7 +193,7 @@ }); var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(4.3) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -225,7 +225,7 @@ RingtoetsPipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0); StochasticSoilProfile stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, random.NextDouble(), new[] + SoilProfile = new PipingSoilProfile(string.Empty, random.NextDouble(), new[] { new PipingSoilLayer(random.NextDouble()) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r92ce91281efab19772bd3e2d7ecea2c0a6c8ea97 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 92ce91281efab19772bd3e2d7ecea2c0a6c8ea97) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -571,12 +571,12 @@ { var msgs = messages.ToArray(); Assert.AreEqual(9, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validCalculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validCalculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", validCalculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", validCalculation.Name), msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidCalculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", invalidCalculation.Name), msgs[2]); // Some validation error from validation service - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidCalculation.Name), msgs[8]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", invalidCalculation.Name), msgs[8]); }); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs =================================================================== diff -u -r151aa9afb4f75944c93d38abd2c8b2dd0e7d93d3 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision 151aa9afb4f75944c93d38abd2c8b2dd0e7d93d3) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -423,7 +423,7 @@ public void AsPipingSoilLayers_OuterLoopComplex_ReturnsTwoLayers() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -455,7 +455,7 @@ public void AsPipingSoilLayers_OuterLoopInnerLoopSimple_ReturnsTwoLayers() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -464,7 +464,7 @@ "........", "..4..3..")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "...12...", @@ -497,7 +497,7 @@ public void AsPipingSoilLayers_OuterLoopInnerLoopComplex_ReturnsThreeLayers() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -506,7 +506,7 @@ "........", "..4..3..")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "...1.2..", @@ -540,7 +540,7 @@ public void AsPipingSoilLayers_OuterLoopMultipleInnerLoops_ReturnsThreeLayers() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -549,7 +549,7 @@ "........", "..4..3..")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "...12...", @@ -558,7 +558,7 @@ "........", "........")); - List innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "........", @@ -593,7 +593,7 @@ public void AsPipingSoilLayers_OuterLoopOverlappingInnerLoop_ReturnsOneLayer() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -602,7 +602,7 @@ ".4....3.", "........")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "........", @@ -634,7 +634,7 @@ public void AsPipingSoilLayers_OuterLoopOverlappingInnerLoopsFirstInnerLoopNotOverBottom_ReturnsOneLayer() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -643,7 +643,7 @@ ".4....3.", "........")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "...12...", @@ -652,7 +652,7 @@ "........", "........")); - List innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "........", @@ -685,7 +685,7 @@ public void AsPipingSoilLayers_OuterLoopInnerLoopOnBorderBottom_ReturnsTwoLayers() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -694,7 +694,7 @@ ".4....3.", "........")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "........", @@ -727,7 +727,7 @@ public void AsPipingSoilLayers_OuterLoopInnerLoopOverlapTop_ReturnsOneLayer() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "..1..2..", @@ -736,7 +736,7 @@ ".4....3.", "........")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "...43...", "........", @@ -768,7 +768,7 @@ public void AsPipingSoilLayers_OuterLoopInnerLoopOnBorderTop_ReturnsOneLayer() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -777,7 +777,7 @@ ".4....3.", "........")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "...43...", "........", @@ -810,7 +810,7 @@ { // Setup var atX = 2.0; - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -830,15 +830,15 @@ // Assert SoilLayerConversionException exception = Assert.Throws(test); - Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); + Assert.AreEqual(string.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); } [Test] public void AsPipingSoilLayers_InnerLoopVerticalAtX_ThrowsException() { // Setup var atX = 3.0; - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "..1..2..", "........", @@ -847,7 +847,7 @@ "........", "..4..3..")); - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "6", "........", "...1.2..", @@ -868,7 +868,7 @@ // Assert SoilLayerConversionException exception = Assert.Throws(test); - Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); + Assert.AreEqual(string.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs =================================================================== diff -u -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -149,7 +149,7 @@ var builder = new SoilProfileBuilder2D(profileName, 1.0, pipingSoilProfileId); builder.Add(new SoilLayer2D { - OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "10", "...", "...", @@ -163,7 +163,7 @@ "...")) }).Add(new SoilLayer2D { - OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "10", "...", "...", @@ -177,7 +177,7 @@ "...")) }).Add(new SoilLayer2D { - OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "10", "...", "1.2", @@ -215,7 +215,7 @@ var profileName = "SomeProfile"; const long pipingSoilProfileId = 1234L; var builder = new SoilProfileBuilder2D(profileName, 2.0, pipingSoilProfileId); - List loopHole = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + List loopHole = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "5", ".....", ".4.1.", @@ -224,7 +224,7 @@ ".....")); var soilLayer2D = new SoilLayer2D { - OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "5", "2...3", ".....", Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs =================================================================== diff -u -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -81,7 +81,7 @@ // Setup string dbFile = Path.Combine(testDataPath, dbName); string expectedMessage = new FileReaderErrorMessageBuilder(dbFile) - .Build(String.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); + .Build(string.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -143,7 +143,7 @@ // Assert CriticalFileReadException exception = Assert.Throws(test); - Assert.AreEqual(String.Format(Resources.PipingSoilProfileReader_Database_incorrect_version_requires_Version_0_, version), exception.Message); + Assert.AreEqual(string.Format(Resources.PipingSoilProfileReader_Database_incorrect_version_requires_Version_0_, version), exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } @@ -262,7 +262,7 @@ PipingSoilProfileReadException exception = Assert.Throws(profile); string message = new FileReaderErrorMessageBuilder(databaseFilePath) .WithSubject("ondergrondschematisatie 'Profile'") - .Build(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, 85.2)); + .Build(string.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, 85.2)); Assert.AreEqual(message, exception.Message); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -79,7 +79,7 @@ // Setup string dbFile = Path.Combine(testDataPath, dbName); string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build(String.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); + Build(string.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -100,7 +100,7 @@ // Setup string dbFile = Path.Combine(testDataPath, dbName); string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build(String.Format(Resources.StochasticSoilModelDatabaseReader_Failed_to_read_database, dbName)); + Build(string.Format(Resources.StochasticSoilModelDatabaseReader_Failed_to_read_database, dbName)); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs =================================================================== diff -u -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -79,7 +79,7 @@ // Setup var dbFile = Path.Combine(testDataPath, dbName); var expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build(String.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); + Build(string.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r2eef3f9d62c90adc922b6e38da1eb77924330311 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 2eef3f9d62c90adc922b6e38da1eb77924330311) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -84,7 +84,7 @@ var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { - SoilProfile = new PipingSoilProfile(String.Empty, 0, new[] + SoilProfile = new PipingSoilProfile(string.Empty, 0, new[] { new PipingSoilLayer(5) { @@ -135,7 +135,7 @@ PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue()); // Assert - Assert.IsFalse(Double.IsNaN(result)); + Assert.IsFalse(double.IsNaN(result)); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingProfileCreatorTest.cs =================================================================== diff -u -r375ff37edf7bfb578e804373044eab32700f0e07 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingProfileCreatorTest.cs (.../PipingProfileCreatorTest.cs) (revision 375ff37edf7bfb578e804373044eab32700f0e07) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingProfileCreatorTest.cs (.../PipingProfileCreatorTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -48,7 +48,7 @@ IsAquifer = true } }; - var soilProfile = new PipingSoilProfile(String.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D, pipingSoilProfileId); + var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D, pipingSoilProfileId); // Call PipingProfile actual = PipingProfileCreator.Create(soilProfile); @@ -87,7 +87,7 @@ new PipingSoilLayer(expectedTopC) }; - var soilProfile = new PipingSoilProfile(String.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D, pipingSoilProfileId); + var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D, pipingSoilProfileId); // Call PipingProfile actual = PipingProfileCreator.Create(soilProfile); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingInput.cs =================================================================== diff -u -r889b68c331c4545ddd9a6875d48cafd86f656494 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingInput.cs (.../TestPipingInput.cs) (revision 889b68c331c4545ddd9a6875d48cafd86f656494) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingInput.cs (.../TestPipingInput.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -125,7 +125,7 @@ private PipingSoilProfile CreateValidSoilProfile() { - return new PipingSoilProfile(String.Empty, -2, new[] + return new PipingSoilProfile(string.Empty, -2, new[] { new PipingSoilLayer(9), new PipingSoilLayer(4) Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs =================================================================== diff -u -rad11d25e651c47162ecf08d11a05d40bba0bebca -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs (.../PipingSurfaceLinesCsvImporterTest.cs) (revision ad11d25e651c47162ecf08d11a05d40bba0bebca) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs (.../PipingSurfaceLinesCsvImporterTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -194,7 +194,7 @@ if (callCount <= expectedNumberOfSurfaceLines) { - Assert.AreEqual(String.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Read_PipingSurfaceLines_0_, twovalidsurfacelinesCsv), currentStepName); + Assert.AreEqual(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Read_PipingSurfaceLines_0_, twovalidsurfacelinesCsv), currentStepName); } else if (callCount <= expectedNumberOfSurfaceLines + 1 + expectedNumberOfSurfaceLines) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -r8650820cbc2da7dcd34964bc92046fe66d14ec23 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 8650820cbc2da7dcd34964bc92046fe66d14ec23) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -95,13 +95,13 @@ { var msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidPipingCalculation.Name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", invalidPipingCalculation.Name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: ", msgs[1]); StringAssert.StartsWith("Validatie mislukt: ", msgs[2]); StringAssert.StartsWith("Validatie mislukt: ", msgs[3]); StringAssert.StartsWith("Validatie mislukt: ", msgs[4]); StringAssert.StartsWith("Validatie mislukt: ", msgs[5]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs.Last()); }); Assert.AreEqual(ActivityState.Failed, activity.State); Assert.AreEqual(originalOutput, invalidPipingCalculation.Output); @@ -126,10 +126,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validPipingCalculation.Name), msgs[0]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs[1]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingCalculation.Name), msgs[2]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs[3]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", validPipingCalculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", validPipingCalculation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs[3]); }); Assert.AreEqual(ActivityState.Executed, activity.State); Assert.IsNotNull(validPipingCalculation.Output); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r99f3b343f5ac4aed453d9f6d291217de76ef5314 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) @@ -53,8 +53,8 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); } @@ -94,13 +94,13 @@ { var msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Er is geen hydraulische randvoorwaardenlocatie geselecteerd.", msgs[1]); StringAssert.StartsWith("Validatie mislukt: Er is geen profielschematisatie geselecteerd.", msgs[2]); StringAssert.StartsWith("Validatie mislukt: Er is geen ondergrondschematisatie geselecteerd.", msgs[3]); StringAssert.StartsWith("Validatie mislukt: Er is geen waarde voor het intredepunt opgegeven.", msgs[4]); StringAssert.StartsWith("Validatie mislukt: Er is geen waarde voor het uittredepunt opgegeven.", msgs[5]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -124,9 +124,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Er is geen hydraulische randvoorwaardenlocatie geselecteerd.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -150,10 +150,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Kan het toetspeil niet afleiden op basis van de invoer.", msgs[1]); StringAssert.StartsWith("Validatie mislukt: Kan de stijghoogte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[2]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -177,9 +177,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Er is geen waarde voor het intredepunt opgegeven.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -203,9 +203,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Er is geen waarde voor het uittredepunt opgegeven.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -231,9 +231,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Er is geen profielschematisatie geselecteerd.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -258,9 +258,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Er is geen ondergrondschematisatie geselecteerd.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -295,12 +295,12 @@ { var msgs = messages.ToArray(); Assert.AreEqual(6, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Kan de dikte van het watervoerend pakket niet afleiden op basis van de invoer.", msgs[1]); StringAssert.StartsWith("Validatie mislukt: Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[2]); StringAssert.StartsWith("Validatie mislukt: Geen watervoerende laag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[3]); StringAssert.StartsWith("Validatie mislukt: Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[4]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -340,10 +340,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[1]); StringAssert.StartsWith("Validatie mislukt: Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[2]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -387,10 +387,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[1]); StringAssert.StartsWith("Validatie mislukt: Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[2]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -448,9 +448,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Kan de definitie voor het 70%-fraktiel van de korreldiameter van de watervoerende laag niet (volledig) afleiden.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -508,9 +508,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Kan de definitie voor de doorlatendheid van de watervoerende laag niet (volledig) afleiden.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -572,9 +572,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Validatie mislukt: Kan de definitie voor het verzadigd gewicht van de deklaag niet (volledig) afleiden.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } @@ -630,9 +630,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); StringAssert.StartsWith("Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaard deviaties en verschuivingen voor alle lagen gelijk zijn.", msgs[1]); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsTrue(isValid); } @@ -659,11 +659,11 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[1]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs[1]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", name), msgs[2]); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", name), msgs.Last()); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", name), msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", name), msgs.Last()); }); }