Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineExporterTest.cs
===================================================================
diff -u -r28ab332db2d96ad9e766f19677af1c00fc88a644 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineExporterTest.cs (.../ReferenceLineExporterTest.cs) (revision 28ab332db2d96ad9e766f19677af1c00fc88a644)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineExporterTest.cs (.../ReferenceLineExporterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -112,7 +112,7 @@
Action call = () => isExported = exporter.Export();
// Assert
- string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'.\r\nEr is geen referentielijn geëxporteerd.";
+ string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'.{Environment.NewLine}Er is geen referentielijn geëxporteerd.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage);
Assert.IsFalse(isExported);
}
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs
===================================================================
diff -u -r28ab332db2d96ad9e766f19677af1c00fc88a644 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs (.../DuneLocationsExporterTest.cs) (revision 28ab332db2d96ad9e766f19677af1c00fc88a644)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs (.../DuneLocationsExporterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -106,12 +106,12 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Kv\tNr\tRp\tHs\tTp\tTm-1,0\tD50\r\n" +
- "*[-]\t[dam]\t[m+NAP]\t[m]\t[s]\t[s]\t[m]\r\n" +
- "9\t9740\t*\t*\t*\t*\t0.000196\r\n" +
- "10\t9770.1\t*\t*\t*\t*\t0.000196\r\n" +
- "11\t9771.3\t5.89\t8.53\t14.11\t*\t0.000134\r\n",
- fileContent);
+ string expectedText = $"Kv\tNr\tRp\tHs\tTp\tTm-1,0\tD50{Environment.NewLine}" +
+ $"*[-]\t[dam]\t[m+NAP]\t[m]\t[s]\t[s]\t[m]{Environment.NewLine}" +
+ $"9\t9740\t*\t*\t*\t*\t0.000196{Environment.NewLine}" +
+ $"10\t9770.1\t*\t*\t*\t*\t0.000196{Environment.NewLine}" +
+ $"11\t9771.3\t5.89\t8.53\t14.11\t*\t0.000134{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs
===================================================================
diff -u -r28ab332db2d96ad9e766f19677af1c00fc88a644 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs (.../DuneLocationsWriterTest.cs) (revision 28ab332db2d96ad9e766f19677af1c00fc88a644)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs (.../DuneLocationsWriterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -158,12 +158,12 @@
// Assert
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Kv\tNr\tRp\tHs\tTp\tTm-1,0\tD50\r\n" +
- "*[-]\t[dam]\t[m+NAP]\t[m]\t[s]\t[s]\t[m]\r\n" +
- "9\t9740\t*\t*\t*\t*\t0.000196\r\n" +
- "10\t9770.1\t*\t*\t*\t*\t0.000196\r\n" +
- "11\t9771.3\t5.89\t8.53\t14.11\t*\t0.000134\r\n",
- fileContent);
+ string expectedText = $"Kv\tNr\tRp\tHs\tTp\tTm-1,0\tD50{Environment.NewLine}" +
+ $"*[-]\t[dam]\t[m+NAP]\t[m]\t[s]\t[s]\t[m]{Environment.NewLine}" +
+ $"9\t9740\t*\t*\t*\t*\t0.000196{Environment.NewLine}" +
+ $"10\t9770.1\t*\t*\t*\t*\t0.000196{Environment.NewLine}" +
+ $"11\t9771.3\t5.89\t8.53\t14.11\t*\t0.000134{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
finally
{
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs
===================================================================
diff -u -r0d0b747c9b4d6769f09e0dad0a0b7690b7b5755d -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 0d0b747c9b4d6769f09e0dad0a0b7690b7b5755d)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -76,8 +76,9 @@
public void Export_CalculationsWithoutOutput_FileWithOnlyHeader()
{
// Setup
- string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader));
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader)))
+ const string folderName = nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader);
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -95,16 +96,18 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n", fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
[Test]
public void Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader()
{
// Setup
- string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader));
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader)))
+ const string folderName = nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader);
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -125,17 +128,18 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n", fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
[Test]
public void Export_ValidData_ValidFile()
{
// Setup
- string subFolder = $"{nameof(GrassCoverErosionOutwardsWaveConditionsExporterTest)}.{nameof(Export_ValidData_ValidFile)}";
- string directoryPath = TestHelper.GetScratchPadPath(subFolder);
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), subFolder))
+ string folderName = $"{nameof(GrassCoverErosionOutwardsWaveConditionsExporterTest)}.{nameof(Export_ValidData_ValidFile)}";
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -173,9 +177,9 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" +
- "aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Gras, 1.10, 2.20, 3.30, 4.40, 5.50\r\n",
- fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}" +
+ $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Gras, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Ringtoets.GrassCoverErosionOutwards.IO.Test.csproj
===================================================================
diff -u -rb731017e828e47ed72aa803dfcc7eeaa7f770933 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Ringtoets.GrassCoverErosionOutwards.IO.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.IO.Test.csproj) (revision b731017e828e47ed72aa803dfcc7eeaa7f770933)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Ringtoets.GrassCoverErosionOutwards.IO.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.IO.Test.csproj) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -83,7 +83,7 @@
Ringtoets.Common.Data.TestUtil
- {33508D7C-1602-4C0D-8503-73AAE98C19E5}
+ {33508d7c-1602-4c0d-8503-73aae98c19e5}
Ringtoets.Common.IO.TestUtil
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProviderTest.cs
===================================================================
diff -u -rec3096516cbba4c5b7b45bf4d35ad5b1230b1c55 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProviderTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProviderTest.cs) (revision ec3096516cbba4c5b7b45bf4d35ad5b1230b1c55)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProviderTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProviderTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
using NUnit.Framework;
using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
@@ -86,8 +87,7 @@
var message = provider.GetCalculationFailedMessage(name, failureMessage);
// Assert
- var expectedMessage = string.Format("Er is een fout opgetreden tijdens de Waterstand bij doorsnede-eis berekening '{0}'. Bekijk het foutrapport door op details te klikken.\r\n{1}",
- name, failureMessage);
+ var expectedMessage = $"Er is een fout opgetreden tijdens de Waterstand bij doorsnede-eis berekening '{name}'. Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs
===================================================================
diff -u -rc7d39e2c22a5df98a9f398cab98040a51faba283 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs) (revision c7d39e2c22a5df98a9f398cab98040a51faba283)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
using NUnit.Framework;
using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
@@ -86,8 +87,7 @@
var message = provider.GetCalculationFailedMessage(name, failureMessage);
// Assert
- var expectedMessage = string.Format("Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening '{0}'. Bekijk het foutrapport door op details te klikken.\r\n{1}",
- name, failureMessage);
+ var expectedMessage = $"Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening '{name}'. Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs
===================================================================
diff -u -rb66269d1c3435557b993a5daa333612017f6ccfd -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (.../DesignWaterLevelCalculationMessageProviderTest.cs) (revision b66269d1c3435557b993a5daa333612017f6ccfd)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (.../DesignWaterLevelCalculationMessageProviderTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
using NUnit.Framework;
using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.Integration.Service.MessageProviders;
@@ -86,8 +87,7 @@
var message = provider.GetCalculationFailedMessage(name, failureMessage);
// Assert
- var expectedMessage = string.Format("Er is een fout opgetreden tijdens de toetspeil berekening '{0}'. Bekijk het foutrapport door op details te klikken.\r\n{1}",
- name, failureMessage);
+ var expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}'. Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs
===================================================================
diff -u -rb66269d1c3435557b993a5daa333612017f6ccfd -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs (.../WaveHeightCalculationMessageProviderTest.cs) (revision b66269d1c3435557b993a5daa333612017f6ccfd)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs (.../WaveHeightCalculationMessageProviderTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
using NUnit.Framework;
using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.Integration.Service.MessageProviders;
@@ -103,8 +104,7 @@
var message = provider.GetCalculationFailedMessage(name, failureMessage);
// Assert
- var expectedMessage = string.Format("Er is een fout opgetreden tijdens de golfhoogte berekening '{0}'. Bekijk het foutrapport door op details te klikken.\r\n{1}",
- name, failureMessage);
+ var expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}'. Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs
===================================================================
diff -u -r7c433a2fecb8c13011283032fefffa662b43c8f5 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -160,7 +160,7 @@
messages =>
{
string[] messageArray = messages.ToArray();
- string message = $"{string.Empty} \r\nHet bestand wordt overgeslagen.";
+ string message = $"{string.Empty} {Environment.NewLine}Het bestand wordt overgeslagen.";
StringAssert.EndsWith(message, messageArray[0]);
});
Assert.AreEqual(1, progress);
@@ -196,7 +196,7 @@
messages =>
{
string[] messageArray = messages.ToArray();
- string message = $"{string.Empty} \r\nHet bestand wordt overgeslagen.";
+ string message = $"{string.Empty} {Environment.NewLine}Het bestand wordt overgeslagen.";
StringAssert.EndsWith(message, messageArray[0]);
});
Assert.AreEqual(1, progress);
@@ -545,7 +545,7 @@
.Build("Ondergrondschematisatie bevat geen geldige waarde in kolom \'IntersectionX\'.");
var expectedLogMessagesAndLevel = new[]
{
- Tuple.Create($"{internalErrorMessage} \r\nDeze ondergrondschematisatie wordt overgeslagen.", LogLevelConstant.Error),
+ Tuple.Create($"{internalErrorMessage} {Environment.NewLine}Deze ondergrondschematisatie wordt overgeslagen.", LogLevelConstant.Error),
Tuple.Create("Het stochastische ondergrondmodel \'Name\' heeft een ongespecificeerde ondergrondschematisatie. Dit model wordt overgeslagen.", LogLevelConstant.Warn)
};
TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 2);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Exporters/WaveConditionsExporterBaseTest.cs
===================================================================
diff -u -r96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Exporters/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision 96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Exporters/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -157,10 +157,10 @@
// Assert
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" +
- "blocksName, , 0.000, 0.000, , nee, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.40, 5.56\r\n" +
- "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.20, 6.67\r\n",
- fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}" +
+ $"blocksName, , 0.000, 0.000, , nee, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.40, 5.56{Environment.NewLine}" +
+ $"columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.20, 6.67{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Writers/WaveConditionsWriterTest.cs
===================================================================
diff -u -r96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Writers/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision 96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Writers/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -180,10 +180,10 @@
// Assert
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" +
- "blocksName, , 0.000, 0.000, , ja, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.40, 5.56\r\n" +
- "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.20, 6.67\r\n",
- fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}" +
+ $"blocksName, , 0.000, 0.000, , ja, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.40, 5.56{Environment.NewLine}" +
+ $"columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.20, 6.67{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs
===================================================================
diff -u -r0d0b747c9b4d6769f09e0dad0a0b7690b7b5755d -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision 0d0b747c9b4d6769f09e0dad0a0b7690b7b5755d)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -69,8 +69,9 @@
public void Export_CalculationsWithoutOutput_FileWithOnlyHeader()
{
// Setup
- string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader));
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader)))
+ const string folderName = nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader);
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -88,16 +89,18 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n", fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
[Test]
public void Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader()
{
// Setup
- string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader));
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader)))
+ const string folderName = nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader);
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -118,17 +121,18 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n", fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
[Test]
public void Export_ValidData_ValidFile()
{
// Setup
- string subFolder = $"{nameof(StabilityStoneCoverWaveConditionsExporterTest)}.{nameof(Export_ValidData_ValidFile)}";
- string directoryPath = TestHelper.GetScratchPadPath(subFolder);
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), subFolder))
+ string folderName = $"{nameof(StabilityStoneCoverWaveConditionsExporterTest)}.{nameof(Export_ValidData_ValidFile)}";
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -169,10 +173,10 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" +
- "aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Steen (zuilen), 1.10, 2.20, 3.30, 4.40, 5.50\r\n" +
- "aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Steen (blokken), 1.10, 2.20, 3.30, 4.40, 5.50\r\n",
- fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}" +
+ $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Steen (zuilen), 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}" +
+ $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Steen (blokken), 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
}
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Ringtoets.StabilityStoneCover.IO.Test.csproj
===================================================================
diff -u -rb731017e828e47ed72aa803dfcc7eeaa7f770933 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Ringtoets.StabilityStoneCover.IO.Test.csproj (.../Ringtoets.StabilityStoneCover.IO.Test.csproj) (revision b731017e828e47ed72aa803dfcc7eeaa7f770933)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Ringtoets.StabilityStoneCover.IO.Test.csproj (.../Ringtoets.StabilityStoneCover.IO.Test.csproj) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -82,7 +82,7 @@
Ringtoets.Common.Data.TestUtil
- {33508D7C-1602-4C0D-8503-73AAE98C19E5}
+ {33508d7c-1602-4c0d-8503-73aae98c19e5}
Ringtoets.Common.IO.TestUtil
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs
===================================================================
diff -u -r0d0b747c9b4d6769f09e0dad0a0b7690b7b5755d -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs) (revision 0d0b747c9b4d6769f09e0dad0a0b7690b7b5755d)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -80,8 +80,9 @@
public void Export_CalculationsWithoutOutput_FileWithOnlyHeader()
{
// Setup
- string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader));
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader)))
+ const string folderName = nameof(Export_CalculationsWithoutOutput_FileWithOnlyHeader);
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -99,16 +100,18 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n", fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
[Test]
public void Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader()
{
// Setup
- string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader));
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader)))
+ const string folderName = nameof(Export_CalculationsWithoutHydraulicBoundaryLocation_FileWithOnlyHeader);
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -129,17 +132,18 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n", fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
[Test]
public void Export_ValidData_ValidFile()
{
// Setup
- string subFolder = $"{nameof(WaveImpactAsphaltCoverWaveConditionsExporterTest)}.{nameof(Export_ValidData_ValidFile)}";
- string directoryPath = TestHelper.GetScratchPadPath(subFolder);
- using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), subFolder))
+ string folderName = $"{nameof(WaveImpactAsphaltCoverWaveConditionsExporterTest)}.{nameof(Export_ValidData_ValidFile)}";
+ string directoryPath = TestHelper.GetScratchPadPath(folderName);
+ using (new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), folderName))
{
string filePath = Path.Combine(directoryPath, "test.csv");
@@ -177,9 +181,9 @@
Assert.IsTrue(isExported);
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
- Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" +
- "aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Asfalt, 1.10, 2.20, 3.30, 4.40, 5.50\r\n",
- fileContent);
+ string expectedText = $"Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}" +
+ $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Asfalt, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}";
+ Assert.AreEqual(expectedText, fileContent);
}
}
}
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Ringtoets.WaveImpactAsphaltCover.IO.Test.csproj
===================================================================
diff -u -rb731017e828e47ed72aa803dfcc7eeaa7f770933 -r4a94b04e58009fa943f7db933c59bdd680621ff2
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Ringtoets.WaveImpactAsphaltCover.IO.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.IO.Test.csproj) (revision b731017e828e47ed72aa803dfcc7eeaa7f770933)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Ringtoets.WaveImpactAsphaltCover.IO.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.IO.Test.csproj) (revision 4a94b04e58009fa943f7db933c59bdd680621ff2)
@@ -82,7 +82,7 @@
Ringtoets.Common.Data.TestUtil
- {33508D7C-1602-4C0D-8503-73AAE98C19E5}
+ {33508d7c-1602-4c0d-8503-73aae98c19e5}
Ringtoets.Common.IO.TestUtil