Fisheye: Tag 3008 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/TestData/StiImporter/InvalidYieldStressVersionWithYieldStresses.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r3006 -r3008
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 3006)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 3008)
@@ -728,9 +728,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
Index: DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/StiFileValidatorTest.cs
===================================================================
diff -u -r3007 -r3008
--- DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/StiFileValidatorTest.cs (.../StiFileValidatorTest.cs) (revision 3007)
+++ DamClients/DamUI/trunk/src/Dam/Tests/StiImporter/StiFileValidatorTest.cs (.../StiFileValidatorTest.cs) (revision 3008)
@@ -30,13 +30,12 @@
[TestFixture]
public class StiFileValidatorTest
{
- private const string testDataFolder = @"TestData\StiImporter\";
+ private const string TestDataFolder = @"TestData\StiImporter\";
private static IEnumerable GetUnsupportedFileVersions()
{
yield return new TestCaseData("InvalidSoilVersion.sti", "Soil");
yield return new TestCaseData("InvalidGeometryVersion.sti", "Geometry");
- yield return new TestCaseData("InvalidYieldStressVersionWithYieldStresses.sti", "Preconsolidation stress");
}
[Test]
@@ -76,7 +75,7 @@
public void GivenValidatorWithSupportedFileVersions_WhenValidateCalled_ThenNoValidationMessages(string fileName)
{
// Setup
- string filePath = Path.Combine(testDataFolder, fileName);
+ string filePath = Path.Combine(TestDataFolder, fileName);
var fileValidator = new StiFileValidator(filePath);
// Call
@@ -90,7 +89,7 @@
public void GivenValidatorWithSupportedFormat_WhenValidateFileFormatCalled_ThenNoValidationMessages()
{
// Setup
- string filePath = Path.Combine(testDataFolder, "Tutorial-1a 10.1.4.3.sti");
+ string filePath = Path.Combine(TestDataFolder, "Tutorial-1a 10.1.4.3.sti");
var fileValidator = new StiFileValidator(filePath);
// Call
@@ -107,7 +106,7 @@
string propertyName)
{
// Given
- string filePath = Path.Combine(testDataFolder, fileName);
+ string filePath = Path.Combine(TestDataFolder, fileName);
var fileValidator = new StiFileValidator(filePath);
// When
@@ -127,7 +126,7 @@
public void GivenValidatorWithUnsupportedFormat_WhenValidateFileFormatCalled_ThenLogMessagesGenerated(string fileName)
{
// Given
- string filePath = Path.Combine(testDataFolder, fileName);
+ string filePath = Path.Combine(TestDataFolder, fileName);
var fileValidator = new StiFileValidator(filePath);
// When
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/StiFileValidator.cs
===================================================================
diff -u -r3007 -r3008
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/StiFileValidator.cs (.../StiFileValidator.cs) (revision 3007)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/StiFileValidator.cs (.../StiFileValidator.cs) (revision 3008)
@@ -43,11 +43,9 @@
// Parameter "SoilAdditionalFactorLEM" (ignored, not present in Soil)
private const int HighestSupportedSoilVersion = 1003;
private const int HighestSupportedGeometryVersion = 1000;
- private const int HighestSupportedYieldStressVersion = 1000;
private readonly DSerieFileInfo fileInfo;
private readonly string filePath;
- private readonly DSerieImporterHelper importerHelper;
///
/// Creates a new instance of .
@@ -65,7 +63,7 @@
var fileContent = ReadFileContent(filePath);
- importerHelper = new DSerieImporterHelper();
+ var importerHelper = new DSerieImporterHelper();
fileInfo = importerHelper.ReadVersionInfo(string.Empty, fileContent); // Filename is not used for this operation and can be kept empty
this.filePath = filePath;
@@ -96,11 +94,6 @@
messages.Add(GenerateUnsupportedVersionMessage("Geometry"));
}
- if (fileInfo.HasYieldStressData && !IsVersionValid(fileInfo.YieldStressVersionNumber, HighestSupportedYieldStressVersion))
- {
- messages.Add(GenerateUnsupportedVersionMessage("Preconsolidation stress"));
- }
-
return messages;
}