Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileWithExtraOptions.txt
===================================================================
diff -u
--- dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileWithExtraOptions.txt (revision 0)
+++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileWithExtraOptions.txt (revision 428)
@@ -0,0 +1,12 @@
+[D-Geo Stability batch processing]
+InputFileName=..\..\Tests\Files\zuivering Gendt.sti
+Plot Critical Circle=1
+PlotWMF=1
+PlotJPeg=1
+
+[PlotHack]
+PlotHackOn=0
+PlotHackTop=200
+PlotHackLeft=100
+PlotHackHeight=1300
+PlotHackWidth=1700
\ No newline at end of file
Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.Designer.cs
===================================================================
diff -u -r425 -r428
--- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 425)
+++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 428)
@@ -61,7 +61,7 @@
}
///
- /// Looks up a localized string similar to Could not find DGeoStability.exe at location {0}.
+ /// Looks up a localized string similar to Could not find stability executable at location '{0}'.
///
internal static string DGeoStabilityExeRunner_RunDGeoStabilityProject_ExecutableNotFound {
get {
Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs
===================================================================
diff -u -r424 -r428
--- dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs (.../DGeoStabilityExeRunnerTests.cs) (revision 424)
+++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs (.../DGeoStabilityExeRunnerTests.cs) (revision 428)
@@ -51,6 +51,33 @@
}
}
+ [Test]
+ public void TestCreateDGeoStabilityIniFileWithExtraOptions()
+ {
+ string inifileName;
+ // change exe path where the DGeoStability.ini will be searched
+ // set it back later
+ var currentPath = runner.DGeoStabilityExePath;
+ try
+ {
+ runner.DGeoStabilityExePath = Path.Combine(TestFolder, "DGeoStability.exe");
+ inifileName = runner.CreateDGeoStabilityIniFile(Path.Combine(TestFolder, NormalTestFile));
+ }
+ finally
+ {
+ runner.DGeoStabilityExePath = currentPath;
+ }
+ Assert.IsTrue(File.Exists(inifileName));
+
+ string expectedFile = Path.Combine(TestFolder, "ExpectedIniFileWithExtraOptions.txt");
+ string[] expectedLines = File.ReadAllLines(expectedFile);
+ string[] resultLines = File.ReadAllLines(inifileName);
+ for (int i = 0; i < expectedLines.Length; i++)
+ {
+ Assert.AreEqual(expectedLines[i], resultLines[i]);
+ }
+ }
+
public void DeleteOutputFiles(string fileName)
{
string fileNameWithoutExtension = Path.Combine(Path.GetDirectoryName(fileName), Path.GetFileNameWithoutExtension(fileName));
@@ -149,16 +176,26 @@
}
[Test]
- [ExpectedException(typeof(FileNotFoundException))]
+ [ExpectedException(typeof(FileNotFoundException), ExpectedMessage = "Executable voor stabiliteitsberekening niet gevonden op '..\\DGeoStability.exe'")]
+ [SetUICulture("nl-NL")]
public void TestThrowsExecutableNotFound()
{
- runner.RunDGeoStabilityProject(@"..\DGeoStability.exe");
+ var currentPath = runner.DGeoStabilityExePath;
+ try
+ {
+ runner.DGeoStabilityExePath = @"..\DGeoStability.exe";
+ runner.RunDGeoStabilityProject(Path.Combine(TestFolder, NormalTestFile));
+ }
+ finally
+ {
+ runner.DGeoStabilityExePath = currentPath;
+ }
}
[Test]
public void TestDoesNotThrowExecutableExists()
{
- runner.RunDGeoStabilityProject(@"DGeoStability.exe");
+ runner.RunDGeoStabilityProject(Path.Combine(TestFolder, NormalTestFile));
}
#endregion
Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunner.cs
===================================================================
diff -u -r410 -r428
--- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunner.cs (.../DGeoStabilityExeRunner.cs) (revision 410)
+++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunner.cs (.../DGeoStabilityExeRunner.cs) (revision 428)
@@ -128,6 +128,8 @@
newIniContent += Environment.NewLine + "Plot Critical Circle=1";
newIniContent += Environment.NewLine + "PlotWMF=1";
newIniContent += Environment.NewLine + "PlotJPeg=1";
+ // When DGeoStability.ini file exist add the content to the ini file that runs DGeoStability
+ // This functionality was added for the so-called PlotHack options, see MWDAM-819
if (File.Exists(defaultIniFilename))
{
string iniContent = File.ReadAllText(defaultIniFilename);
Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r425 -r428
--- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 425)
+++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 428)
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- DGeoStability.exe niet gevonden in {0}
+ Executable voor stabiliteitsberekening niet gevonden op '{0}'
Projectnaam '{0}' is niet geldig
@@ -160,6 +160,6 @@
stabilityZone of stabilityFactorIndex niet gevonden
- Stability file does not contain identifier
+ Stabiliteitsbestand bevat geen identificator
\ No newline at end of file
Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.resx
===================================================================
diff -u -r425 -r428
--- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.resx (.../Resources.resx) (revision 425)
+++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.resx (.../Resources.resx) (revision 428)
@@ -124,7 +124,7 @@
Project '{0}' not found
- Could not find DGeoStability.exe at location {0}
+ Could not find stability executable at location '{0}'
Project filename '{0}' is not valid