Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -re96706d46bfd53d20b4010cc85444f5bee48a265 -r55fb3588aa79f2f6d1961ba15cfc46e33174373c
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision e96706d46bfd53d20b4010cc85444f5bee48a265)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 55fb3588aa79f2f6d1961ba15cfc46e33174373c)
@@ -331,7 +331,7 @@
// Assert
var configuration = (WaveConditionsCalculationConfiguration) readConfigurationItems.Single();
- AssertConfiguration(configuration);
+ AssertMigratedConfiguration(configuration);
Assert.IsNull(configuration.TargetProbability);
}
@@ -355,12 +355,12 @@
Assert.AreEqual(2.2, configuration.LowerBoundaryRevetment);
Assert.IsNull(configuration.UpperBoundaryWaterLevels);
Assert.IsNull(configuration.LowerBoundaryWaterLevels);
- Assert.AreEqual(0.5, configuration.StepSize);
+ Assert.AreEqual(0.33, configuration.StepSize);
Assert.IsNull(configuration.ForeshoreProfileId);
Assert.IsNull(configuration.Orientation);
Assert.IsTrue(configuration.WaveReduction.UseBreakWater);
Assert.AreEqual(ConfigurationBreakWaterType.Caisson, configuration.WaveReduction.BreakWaterType);
- Assert.AreEqual(3.3, configuration.WaveReduction.BreakWaterHeight);
+ Assert.AreEqual(4.4, configuration.WaveReduction.BreakWaterHeight);
Assert.IsNull(configuration.WaveReduction.UseForeshoreProfile);
}
@@ -372,6 +372,23 @@
Assert.AreEqual(2.2, configuration.LowerBoundaryRevetment);
Assert.AreEqual(3.3, configuration.UpperBoundaryWaterLevels);
Assert.AreEqual(4.4, configuration.LowerBoundaryWaterLevels);
+ Assert.AreEqual(0.55, configuration.StepSize);
+ Assert.AreEqual("Voorlandprofiel", configuration.ForeshoreProfileId);
+ Assert.AreEqual(6.6, configuration.Orientation);
+ Assert.IsTrue(configuration.WaveReduction.UseBreakWater);
+ Assert.AreEqual(ConfigurationBreakWaterType.Caisson, configuration.WaveReduction.BreakWaterType);
+ Assert.AreEqual(7.7, configuration.WaveReduction.BreakWaterHeight);
+ Assert.IsFalse(configuration.WaveReduction.UseForeshoreProfile);
+ }
+
+ private static void AssertMigratedConfiguration(WaveConditionsCalculationConfiguration configuration)
+ {
+ Assert.IsNotNull(configuration);
+ Assert.AreEqual("Locatie", configuration.HydraulicBoundaryLocationName);
+ Assert.AreEqual(1.1, configuration.UpperBoundaryRevetment);
+ Assert.AreEqual(2.2, configuration.LowerBoundaryRevetment);
+ Assert.AreEqual(3.3, configuration.UpperBoundaryWaterLevels);
+ Assert.AreEqual(4.4, configuration.LowerBoundaryWaterLevels);
Assert.AreEqual(0.5, configuration.StepSize);
Assert.AreEqual("Voorlandprofiel", configuration.ForeshoreProfileId);
Assert.AreEqual(5.5, configuration.Orientation);
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationWriterTest.cs
===================================================================
diff -u -r16a668f8e7d77ae95f3f11fa1f73dc9e081e8444 -r55fb3588aa79f2f6d1961ba15cfc46e33174373c
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationWriterTest.cs (.../WaveConditionsCalculationConfigurationWriterTest.cs) (revision 16a668f8e7d77ae95f3f11fa1f73dc9e081e8444)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationWriterTest.cs (.../WaveConditionsCalculationConfigurationWriterTest.cs) (revision 55fb3588aa79f2f6d1961ba15cfc46e33174373c)
@@ -90,7 +90,7 @@
LowerBoundaryRevetment = (RoundedDouble) 0.5,
UpperBoundaryWaterLevels = (RoundedDouble) 1.4,
LowerBoundaryWaterLevels = (RoundedDouble) 0.6,
- StepSize = (RoundedDouble) 1,
+ StepSize = (RoundedDouble) 0.15,
ForeshoreProfileId = "profiel1",
Orientation = (RoundedDouble) 67.1,
WaveReduction = new WaveReductionConfiguration
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml
===================================================================
diff -u -r63c0c4a746482e4369f67a5f59ecc0b7864bb3db -r55fb3588aa79f2f6d1961ba15cfc46e33174373c
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 63c0c4a746482e4369f67a5f59ecc0b7864bb3db)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 55fb3588aa79f2f6d1961ba15cfc46e33174373c)
@@ -7,13 +7,13 @@
2.2
3.3
4.4
- 0.5
+ 0.55
Voorlandprofiel
- 5.5
+ 6.6
true
caisson
- 6.6
+ 7.7
false
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml
===================================================================
diff -u -r63c0c4a746482e4369f67a5f59ecc0b7864bb3db -r55fb3588aa79f2f6d1961ba15cfc46e33174373c
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (.../validConfigurationFullCalculation_differentOrder.xml) (revision 63c0c4a746482e4369f67a5f59ecc0b7864bb3db)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (.../validConfigurationFullCalculation_differentOrder.xml) (revision 55fb3588aa79f2f6d1961ba15cfc46e33174373c)
@@ -3,13 +3,13 @@
false
- 6.6
+ 7.7
true
caisson
- 5.5
+ 6.6
Voorlandprofiel
- 0.5
+ 0.55
4.4
3.3
2.2
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationPartialCalculation.xml
===================================================================
diff -u -r6670858b51e8d838a50259eaa281eb3cf76d53e1 -r55fb3588aa79f2f6d1961ba15cfc46e33174373c
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision 6670858b51e8d838a50259eaa281eb3cf76d53e1)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision 55fb3588aa79f2f6d1961ba15cfc46e33174373c)
@@ -3,11 +3,11 @@
1.1
2.2
- 0.5
+ 0.33
true
caisson
- 3.3
+ 4.4
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationWriter/completeConfiguration.xml
===================================================================
diff -u -re5ae21624afdf7f1608f245f7719f9fe216a1bf2 -r55fb3588aa79f2f6d1961ba15cfc46e33174373c
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision e5ae21624afdf7f1608f245f7719f9fe216a1bf2)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 55fb3588aa79f2f6d1961ba15cfc46e33174373c)
@@ -7,7 +7,7 @@
0.5
1.4
0.6
- 1
+ 0.15
profiel1
67.1