Fisheye: Tag 3f40ee696a93367a869de85b3ed0fad2c54a23f2 refers to a dead (removed) revision in file `Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/ReadBreakWaterType.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/ReadWaveConditionsCalculation.cs
===================================================================
diff -u -r7594d7f46113b5c5f4f41bfbd0183a3789f648b9 -r3f40ee696a93367a869de85b3ed0fad2c54a23f2
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/ReadWaveConditionsCalculation.cs (.../ReadWaveConditionsCalculation.cs) (revision 7594d7f46113b5c5f4f41bfbd0183a3789f648b9)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/ReadWaveConditionsCalculation.cs (.../ReadWaveConditionsCalculation.cs) (revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
@@ -104,7 +104,7 @@
///
/// Gets the breakwater type of the read calculation.
///
- public ReadBreakWaterType BreakWaterType { get; }
+ public string BreakWaterType { get; }
///
/// Gets the breakwater height of the read calculation.
@@ -176,7 +176,7 @@
///
/// Gets or sets the value for .
///
- public ReadBreakWaterType BreakWaterType { internal get; set; }
+ public string BreakWaterType { internal get; set; }
///
/// Gets or sets the value for .
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r5a0ad0f264935355e5739924708870db8513d5c1 -r3f40ee696a93367a869de85b3ed0fad2c54a23f2
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs (.../WaveConditionsCalculationConfigurationReader.cs) (revision 5a0ad0f264935355e5739924708870db8513d5c1)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs (.../WaveConditionsCalculationConfigurationReader.cs) (revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
@@ -97,8 +97,8 @@
ConfigurationSchemaIdentifiers.Orientation),
UseBreakWater = GetBoolValueFromChildElement(calculationElement,
ConfigurationSchemaIdentifiers.UseBreakWater),
- BreakWaterType = GetBreakWaterType(calculationElement,
- ConfigurationSchemaIdentifiers.BreakWaterType),
+ BreakWaterType = CalculationConfigurationReaderHelper.GetStringValueFromDescendantElement(calculationElement,
+ ConfigurationSchemaIdentifiers.BreakWaterType),
BreakWaterHeight = CalculationConfigurationReaderHelper.GetDoubleValueFromDescendantElement(calculationElement,
ConfigurationSchemaIdentifiers.BreakWaterHeight),
UseForeshore = GetBoolValueFromChildElement(calculationElement,
@@ -108,23 +108,6 @@
return new ReadWaveConditionsCalculation(constructionProperties);
}
- private static ReadBreakWaterType GetBreakWaterType(XElement parentElement, string childElementName)
- {
- string element = CalculationConfigurationReaderHelper.GetStringValueFromDescendantElement(parentElement, childElementName);
-
- switch (element)
- {
- case ConfigurationSchemaIdentifiers.BreakWaterCaisson:
- return ReadBreakWaterType.Caisson;
- case ConfigurationSchemaIdentifiers.BreakWaterDam:
- return ReadBreakWaterType.HarborDam;
- case ConfigurationSchemaIdentifiers.BreakWaterWall:
- return ReadBreakWaterType.Vertical;
- default:
- return ReadBreakWaterType.None;
- }
- }
-
private static bool? GetBoolValueFromChildElement(XElement parentElement, string childElementName)
{
XElement descendantElement = CalculationConfigurationReaderHelper.GetDescendantElement(parentElement, childElementName);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Ringtoets.Revetment.IO.csproj
===================================================================
diff -u -r92df0a0ac0a4e0ccd5d7505d748f55167c2aac81 -r3f40ee696a93367a869de85b3ed0fad2c54a23f2
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Ringtoets.Revetment.IO.csproj (.../Ringtoets.Revetment.IO.csproj) (revision 92df0a0ac0a4e0ccd5d7505d748f55167c2aac81)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Ringtoets.Revetment.IO.csproj (.../Ringtoets.Revetment.IO.csproj) (revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
@@ -54,7 +54,6 @@
True
Resources.resx
-
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/ReadWaveConditionsCalculationTest.cs
===================================================================
diff -u -rdc37877b917879d9c7b63ff1fb4552bff4943c66 -r3f40ee696a93367a869de85b3ed0fad2c54a23f2
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/ReadWaveConditionsCalculationTest.cs (.../ReadWaveConditionsCalculationTest.cs) (revision dc37877b917879d9c7b63ff1fb4552bff4943c66)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/ReadWaveConditionsCalculationTest.cs (.../ReadWaveConditionsCalculationTest.cs) (revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
@@ -58,7 +58,7 @@
Assert.IsNull(readCalculation.ForeshoreProfile);
Assert.IsNull(readCalculation.Orientation);
Assert.IsNull(readCalculation.UseBreakWater);
- Assert.AreEqual(ReadBreakWaterType.None, readCalculation.BreakWaterType);
+ Assert.IsNull(readCalculation.BreakWaterType);
Assert.IsNull(readCalculation.BreakWaterHeight);
Assert.IsNull(readCalculation.UseForeshore);
}
@@ -77,7 +77,7 @@
const string foreshoreProfileName = "Name of the foreshore profile";
const double orientation = 6.6;
const bool useBreakWater = true;
- const ReadBreakWaterType breakWaterType = ReadBreakWaterType.Caisson;
+ const string breakWaterType = "Caisson";
const double breakWaterHeight = 7.7;
const bool useForeshore = false;
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r7594d7f46113b5c5f4f41bfbd0183a3789f648b9 -r3f40ee696a93367a869de85b3ed0fad2c54a23f2
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 7594d7f46113b5c5f4f41bfbd0183a3789f648b9)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
@@ -227,7 +227,7 @@
Assert.IsNull(calculation.ForeshoreProfile);
Assert.IsNull(calculation.Orientation);
Assert.IsNull(calculation.UseBreakWater);
- Assert.AreEqual(ReadBreakWaterType.None, calculation.BreakWaterType);
+ Assert.IsNull(calculation.BreakWaterType);
Assert.IsNull(calculation.BreakWaterHeight);
Assert.IsNull(calculation.UseForeshore);
}
@@ -248,7 +248,7 @@
var calculation = readItems[0] as ReadWaveConditionsCalculation;
Assert.IsNotNull(calculation);
Assert.IsNull(calculation.UseBreakWater);
- Assert.AreEqual(ReadBreakWaterType.None, calculation.BreakWaterType);
+ Assert.IsNull(calculation.BreakWaterType);
Assert.IsNull(calculation.BreakWaterHeight);
Assert.IsNull(calculation.UseForeshore);
}
@@ -324,7 +324,7 @@
Assert.AreEqual("Voorlandprofiel", calculation.ForeshoreProfile);
Assert.AreEqual(5.5, calculation.Orientation);
Assert.IsTrue(calculation.UseBreakWater);
- Assert.AreEqual(ReadBreakWaterType.Caisson, calculation.BreakWaterType);
+ Assert.AreEqual("caisson", calculation.BreakWaterType);
Assert.AreEqual(6.6, calculation.BreakWaterHeight);
Assert.IsFalse(calculation.UseForeshore);
}
@@ -354,7 +354,7 @@
Assert.IsNull(calculation.ForeshoreProfile);
Assert.IsNull(calculation.Orientation);
Assert.IsTrue(calculation.UseBreakWater);
- Assert.AreEqual(ReadBreakWaterType.Caisson, calculation.BreakWaterType);
+ Assert.AreEqual("caisson", calculation.BreakWaterType);
Assert.AreEqual(3.3, calculation.BreakWaterHeight);
Assert.IsNull(calculation.UseForeshore);
}