Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r5875 -r5999 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 5875) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 5999) @@ -208,18 +208,18 @@ })); } - [Test, Ignore("Is sti based, maybe replace with a test that uses stix files")] + [Test] public void GivenDamProjectWithValidLocationsWith2DProfiles_WhenCreatingInput_ThenSelectedLocationsSerialized() { // Given LogManager.Messages.Clear(); const string selectedLocationOneName = "SelectedLocationOne"; const string selectedSegmentOneName = "SelectedSegmentOne"; - const string segmentOneSoilProfileName = "Profile2D 1.sti"; + const string segmentOneSoilProfileName = "Profile2D 1.stix"; const string selectedLocationTwoName = "SelectedLocationTwo"; const string selectedSegmentTwoName = "SelectedSegmentTwo"; - const string segmentTwoSoilProfileName = "Profile2D 2.sti"; + const string segmentTwoSoilProfileName = "Profile2D 2.stix"; var selectedLocations = new HashSet(new[] { @@ -299,15 +299,15 @@ })); } - [Test, Ignore("Is sti based, maybe replace with a test that uses stix files")] + [Test] public void GivenDamProjectWithValidLocationsWithTheSame2DProfiles_WhenCreatingInput_ThenSelectedLocationsAndOneSoilProfileSerialized() { // Given LogManager.Messages.Clear(); const string selectedLocationOneName = "SelectedLocationOne"; const string selectedSegmentOneName = "SelectedSegmentOne"; - const string soilProfileName = "Profile2D 1.sti"; + const string soilProfileName = "Profile2D 1.stix"; const string selectedLocationTwoName = "SelectedLocationTwo"; const string selectedSegmentTwoName = "SelectedSegmentTwo"; @@ -375,18 +375,18 @@ })); } - [Test, Ignore("Is sti based, maybe replace with a test that uses stix files")] + [Test] public void GivenDamProjectWithInvalidLocationsWithoutScenariosWith2DProfiles_WhenCreatingInput_ThenOnlyValidLocationsSerializedAndLogsErrorMessage() { // Given LogManager.Messages.Clear(); const string selectedLocationOneName = "SelectedLocationOne"; const string selectedSegmentOneName = "SelectedSegmentOne"; - const string segmentOneSoilProfileName = "Profile2D 1.sti"; + const string segmentOneSoilProfileName = "Profile2D 1.stix"; const string selectedLocationTwoName = "SelectedLocationTwo"; const string selectedSegmentTwoName = "SelectedSegmentTwo"; - const string segmentTwoSoilProfileName = "Profile2D 2.sti"; // Soil profile also contains Soil 3 for its layers + const string segmentTwoSoilProfileName = "Profile2D 2.stix"; // Soil profile also contains Soil 3 for its layers // Add the locations with the segments var dike = new Dike @@ -403,7 +403,7 @@ CreateSimpleLocationWithSoilProfile2DSegment(selectedLocationOneName, selectedSegmentOneName, segmentOneSoilProfileName), // Soil profile will result in a read failure, because it does not exist. // However, this will not be visible in the log, as it is not selected to be calculated. - CreateSimpleLocationWithSoilProfile2DSegment("LocationTwo", "Segment", "DoesNotExist.sti"), + CreateSimpleLocationWithSoilProfile2DSegment("LocationTwo", "Segment", "DoesNotExist.stix"), CreateSimpleLocationWithSoilProfile2DSegment(selectedLocationTwoName, selectedSegmentTwoName, segmentTwoSoilProfileName) }); @@ -473,7 +473,7 @@ Assert.That(LogManager.Messages, Has.All.Property(nameof(LogMessage.Subject)).EqualTo(null)); } - [Test, Ignore("Is sti based, maybe replace with a test that uses stix files")] + [Test] public void GivenDamProjectWithInvalidLocationsWithScenariosWith2DProfiles_WhenCreatingInput_ThenOnlyValidLocationsSerializedAndLogsErrorMessage() { // Given @@ -482,7 +482,7 @@ // Add the locations with the segments const string selectedLocationOneName = "SelectedLocationOne"; const string selectedSegmentOneName = "SelectedSegmentOne"; - const string segmentOneSoilProfileName = "Profile2D 1.sti"; + const string segmentOneSoilProfileName = "Profile2D 1.stix"; Location validLocation = CreateSimpleLocationWithSoilProfile2DSegment(selectedLocationOneName, selectedSegmentOneName, segmentOneSoilProfileName); validLocation.Scenarios.AddRange(new[] { @@ -492,7 +492,7 @@ const string selectedLocationTwoName = "SelectedLocationTwo"; const string selectedSegmentTwoName = "SelectedSegmentTwo"; - const string segmentTwoSoilProfileName = "DoesNotExist.sti"; + const string segmentTwoSoilProfileName = "DoesNotExist.stix"; Location invalidLocation = CreateSimpleLocationWithSoilProfile2DSegment(selectedLocationTwoName, selectedSegmentTwoName, segmentTwoSoilProfileName); invalidLocation.Scenarios.AddRange(new[] {