Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/result NoOutput.sti =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/result NoOutput.sti (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/result NoOutput.sti (revision 434) @@ -0,0 +1 @@ \ No newline at end of file Fisheye: Tag 434 refers to a dead (removed) revision in file `dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt result.sti'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 434 refers to a dead (removed) revision in file `dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt result.std'. Fisheye: No comparison available. Pass `N' to diff? Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs =================================================================== diff -u -r432 -r434 --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs (.../DGeoStabilityResultReaderTests.cs) (revision 432) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs (.../DGeoStabilityResultReaderTests.cs) (revision 434) @@ -9,10 +9,11 @@ public class DGeoStabilityResultReaderTests { private const string TestFolder = @"..\..\Tests\Files"; - private const string TestFileInput = @"zuivering Gendt result.sti"; - private const string TestFileOutput = @"zuivering Gendt result.std"; - private const string TestFileInputNoOutput = @"zuivering Gendt result NoOutput.sti"; - private const string TestFileUplift = @"zuivering Gendt result Uplift.std"; + private const string TestFileInput = @"result NoUplift.sti"; + private const string TestFileOutput = @"result NoUplift.std"; + private const string TestFileInputNoOutput = @"result NoOutput.sti"; + private const string TestFileInputNoOutputWithErrorFile = @"result NoOutput WithErrorFile.sti"; + private const string TestFileUplift = @"result Uplift.std"; private const string TestFileWithZonePlot = @"damWithZonePlotEnabled.std"; private const string TestFileWithZonePlotUplift = @"damWithZonePlotEnabledUplift.std"; @@ -578,6 +579,15 @@ DGeoStabilityResultReader.ExtractStabilityResults(inputFileName); } + [Test] + [ExpectedException(typeof(DGeoStabilityResultReaderException), ExpectedMessage = "Een betrouwbaarheidsanalyse in combinatie met model \"Su berekend DOV\" is (nog) niet mogelijk. Selecteer alstublieft een ander schuifspanningsmodel.")] + [SetUICulture("nl-NL")] + public void TestThrowsExceptionWhenInputFileExistsButNoOuputFileWithErrorFile() + { + string inputFileName = Path.Combine(TestFolder, TestFileInputNoOutputWithErrorFile); + DGeoStabilityResultReader.ExtractStabilityResults(inputFileName); + } + #endregion } Fisheye: Tag 434 refers to a dead (removed) revision in file `dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt result Uplift.std'. Fisheye: No comparison available. Pass `N' to diff? Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/result NoOutput WithErrorFile.err =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/result NoOutput WithErrorFile.err (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/result NoOutput WithErrorFile.err (revision 434) @@ -0,0 +1,8 @@ +ERROR FILE OF D-GEO STABILITY: INPUT ERRORS +FILE : D:\aaaTmpFiles\DSerie\Fout.err +DATE : 06-09-2017 +TIME : 16:56:41 +******************************************************************************** +Een betrouwbaarheidsanalyse in combinatie met model "Su berekend DOV" is (nog) niet mogelijk. Selecteer alstublieft een ander schuifspanningsmodel. +******************************************************************************** +End of D-Geo Stability errorfile Fisheye: Tag 434 refers to a dead (removed) revision in file `dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt result NoOutput.sti'. Fisheye: No comparison available. Pass `N' to diff? Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs =================================================================== diff -u -r432 -r434 --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 432) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 434) @@ -471,7 +471,7 @@ { List messages = new List(); bool content = false; - foreach (string line in File.ReadAllLines(outputFile)) + foreach (string line in File.ReadAllLines(errorFile)) { if (line.StartsWith("**********")) {