Index: Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ConfigurationReader.cs
===================================================================
diff -u -r24a4e65f8626b984a0345e3b3b505c768da360f3 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ConfigurationReader.cs (.../ConfigurationReader.cs) (revision 24a4e65f8626b984a0345e3b3b505c768da360f3)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ConfigurationReader.cs (.../ConfigurationReader.cs) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -40,7 +40,7 @@
///
/// The type of calculation items read from XML.
public abstract class ConfigurationReader
- where TCalculationItem : IReadCalculationItem
+ where TCalculationItem : IReadConfigurationItem
{
private readonly XDocument xmlDocument;
@@ -71,12 +71,12 @@
}
///
- /// Reads the configuration from the XML and creates a collection of corresponding .
+ /// Reads the configuration from the XML and creates a collection of corresponding .
///
- /// A collection of read .
- public IEnumerable Read()
+ /// A collection of read .
+ public IEnumerable Read()
{
- return ParseReadCalculationItems(xmlDocument.Root?.Elements());
+ return ParseReadConfigurationItems(xmlDocument.Root?.Elements());
}
///
@@ -171,7 +171,7 @@
}
}
- private IEnumerable ParseReadCalculationItems(IEnumerable elements)
+ private IEnumerable ParseReadConfigurationItems(IEnumerable elements)
{
foreach (XElement element in elements)
{
@@ -190,7 +190,7 @@
private ReadCalculationGroup ParseReadCalculationGroup(XElement folderElement)
{
return new ReadCalculationGroup(folderElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute)?.Value,
- ParseReadCalculationItems(folderElement.Elements()));
+ ParseReadConfigurationItems(folderElement.Elements()));
}
}
}
\ No newline at end of file
Fisheye: Tag b0021f2db39d2455a22c14bd3708ff2fc2a9e817 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.IO/Readers/IReadCalculationItem.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Readers/IReadConfigurationItem.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/Readers/IReadConfigurationItem.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Readers/IReadConfigurationItem.cs (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.Common.IO.Readers
+{
+ ///
+ /// Interface for configuration items that are read via .
+ ///
+ public interface IReadConfigurationItem
+ {
+ ///
+ /// Gets the name of the read configuration item.
+ ///
+ string Name { get; }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ReadCalculationGroup.cs
===================================================================
diff -u -r59fcd17973dee55b14a079325767f28e8cb535c2 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ReadCalculationGroup.cs (.../ReadCalculationGroup.cs) (revision 59fcd17973dee55b14a079325767f28e8cb535c2)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Readers/ReadCalculationGroup.cs (.../ReadCalculationGroup.cs) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -26,23 +26,23 @@
///
/// Class that represents a calculation group that is read via .
///
- public class ReadCalculationGroup : IReadCalculationItem
+ public class ReadCalculationGroup : IReadConfigurationItem
{
///
/// Creates a new instance of .
///
/// The name of the calculation group.
- /// The collection of nested .
- public ReadCalculationGroup(string name, IEnumerable items)
+ /// The collection of nested .
+ public ReadCalculationGroup(string name, IEnumerable items)
{
Name = name;
Items = items;
}
///
- /// Gets the collection of nested .
+ /// Gets the collection of nested .
///
- public IEnumerable Items { get; private set; }
+ public IEnumerable Items { get; private set; }
public string Name { get; }
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj
===================================================================
diff -u -r59fcd17973dee55b14a079325767f28e8cb535c2 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision 59fcd17973dee55b14a079325767f28e8cb535c2)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -77,7 +77,7 @@
-
+
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/ReadCalculationGroupTest.cs
===================================================================
diff -u -r59fcd17973dee55b14a079325767f28e8cb535c2 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/ReadCalculationGroupTest.cs (.../ReadCalculationGroupTest.cs) (revision 59fcd17973dee55b14a079325767f28e8cb535c2)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/ReadCalculationGroupTest.cs (.../ReadCalculationGroupTest.cs) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -33,21 +33,21 @@
public void Constructor_ExpectedValues()
{
// Setup
- var nestedItems = new List
+ var nestedItems = new List
{
- new TestReadCalculationItem(),
- new ReadCalculationGroup("Nested calculation group", Enumerable.Empty())
+ new TestReadConfigurationItem(),
+ new ReadCalculationGroup("Nested calculation group", Enumerable.Empty())
};
// Call
var readCalculationGroup = new ReadCalculationGroup("Calculation group", nestedItems);
// Assert
- Assert.IsInstanceOf(readCalculationGroup);
+ Assert.IsInstanceOf(readCalculationGroup);
Assert.AreSame(nestedItems, readCalculationGroup.Items);
}
- private class TestReadCalculationItem : IReadCalculationItem
+ private class TestReadConfigurationItem : IReadConfigurationItem
{
public string Name
{
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs
===================================================================
diff -u -r59fcd17973dee55b14a079325767f28e8cb535c2 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision 59fcd17973dee55b14a079325767f28e8cb535c2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -89,7 +89,7 @@
{
NotifyProgress(Resources.PipingConfigurationImporter_ProgressText_Reading_configuration, 1, 3);
- ReadResult readResult = ReadConfiguration();
+ ReadResult readResult = ReadConfiguration();
if (readResult.CriticalErrorOccurred || Canceled)
{
return false;
@@ -99,7 +99,7 @@
var validCalculationItems = new List();
- foreach (IReadCalculationItem readItem in readResult.Items)
+ foreach (IReadConfigurationItem readItem in readResult.Items)
{
if (Canceled)
{
@@ -119,11 +119,11 @@
return true;
}
- private ReadResult ReadConfiguration()
+ private ReadResult ReadConfiguration()
{
try
{
- return new ReadResult(false)
+ return new ReadResult(false)
{
Items = new PipingConfigurationReader(FilePath).Read().ToList()
};
@@ -134,11 +134,11 @@
string errorMessage = string.Format(Resources.PipingConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported,
exception.Message);
log.Error(errorMessage, exception);
- return new ReadResult(true);
+ return new ReadResult(true);
}
}
- private ICalculationBase ProcessReadItem(IReadCalculationItem readItem)
+ private ICalculationBase ProcessReadItem(IReadConfigurationItem readItem)
{
var readCalculationGroup = readItem as ReadCalculationGroup;
if (readCalculationGroup != null)
@@ -159,7 +159,7 @@
{
var group = new CalculationGroup(readCalculationGroup.Name, true);
- foreach (IReadCalculationItem item in readCalculationGroup.Items)
+ foreach (IReadConfigurationItem item in readCalculationGroup.Items)
{
ICalculationBase processedItem = ProcessReadItem(item);
if (processedItem != null)
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingConfigurationReader.cs
===================================================================
diff -u -r24a4e65f8626b984a0345e3b3b505c768da360f3 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingConfigurationReader.cs (.../PipingConfigurationReader.cs) (revision 24a4e65f8626b984a0345e3b3b505c768da360f3)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingConfigurationReader.cs (.../PipingConfigurationReader.cs) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -32,9 +32,9 @@
namespace Ringtoets.Piping.IO.Readers
{
///
- /// This class reads a piping configuration from XML and creates a collection of corresponding .
+ /// This class reads a piping configuration from XML and creates a collection of corresponding .
///
- internal class PipingConfigurationReader : ConfigurationReader
+ internal class PipingConfigurationReader : ConfigurationReader
{
///
/// Creates a new instance of .
@@ -51,7 +51,7 @@
internal PipingConfigurationReader(string xmlFilePath)
: base(xmlFilePath, Resources.PipingConfigurationSchema) {}
- protected override IReadCalculationItem ParseReadCalculation(XElement calculationElement)
+ protected override IReadConfigurationItem ParseReadCalculation(XElement calculationElement)
{
var constructionProperties = new ReadPipingCalculation.ConstructionProperties
{
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/ReadPipingCalculation.cs
===================================================================
diff -u -r59fcd17973dee55b14a079325767f28e8cb535c2 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/ReadPipingCalculation.cs (.../ReadPipingCalculation.cs) (revision 59fcd17973dee55b14a079325767f28e8cb535c2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/ReadPipingCalculation.cs (.../ReadPipingCalculation.cs) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -27,7 +27,7 @@
///
/// Class that represents a piping calculation that is read via .
///
- public class ReadPipingCalculation : IReadCalculationItem
+ public class ReadPipingCalculation : IReadConfigurationItem
{
///
/// Creates a new instance of .
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs
===================================================================
diff -u -r59fcd17973dee55b14a079325767f28e8cb535c2 -rb0021f2db39d2455a22c14bd3708ff2fc2a9e817
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision 59fcd17973dee55b14a079325767f28e8cb535c2)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision b0021f2db39d2455a22c14bd3708ff2fc2a9e817)
@@ -318,12 +318,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var group = readPipingCalculationItems[0] as ReadCalculationGroup;
+ var group = readConfigurationItems[0] as ReadCalculationGroup;
Assert.IsNotNull(group);
Assert.AreEqual("Calculation group", group.Name);
CollectionAssert.IsEmpty(group.Items);
@@ -337,12 +337,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+ var calculation = readConfigurationItems[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation);
Assert.AreEqual("Calculation", calculation.Name);
Assert.IsNull(calculation.AssessmentLevel);
@@ -366,12 +366,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+ var calculation = readConfigurationItems[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation);
Assert.IsNull(calculation.PhreaticLevelExitMean);
Assert.IsNull(calculation.PhreaticLevelExitStandardDeviation);
@@ -380,46 +380,46 @@
}
[Test]
- public void Read_ValidConfigurationWithNesting_ReturnExpectedReadPipingCalculationItems()
+ public void Read_ValidConfigurationWithNesting_ReturnExpectedReadConfigurationItems()
{
// Setup
string filePath = Path.Combine(testDirectoryPath, "validConfigurationNesting.xml");
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(5, readPipingCalculationItems.Count);
+ Assert.AreEqual(5, readConfigurationItems.Count);
- var group1 = readPipingCalculationItems[0] as ReadCalculationGroup;
+ var group1 = readConfigurationItems[0] as ReadCalculationGroup;
Assert.IsNotNull(group1);
Assert.AreEqual("Group 1", group1.Name);
- var calculation1 = readPipingCalculationItems[1] as ReadPipingCalculation;
+ var calculation1 = readConfigurationItems[1] as ReadPipingCalculation;
Assert.IsNotNull(calculation1);
Assert.AreEqual("Calculation 1", calculation1.Name);
- var group2 = readPipingCalculationItems[2] as ReadCalculationGroup;
+ var group2 = readConfigurationItems[2] as ReadCalculationGroup;
Assert.IsNotNull(group2);
Assert.AreEqual("Group 2", group2.Name);
- var calculation2 = readPipingCalculationItems[3] as ReadPipingCalculation;
+ var calculation2 = readConfigurationItems[3] as ReadPipingCalculation;
Assert.IsNotNull(calculation2);
Assert.AreEqual("Calculation 2", calculation2.Name);
- var group3 = readPipingCalculationItems[4] as ReadCalculationGroup;
+ var group3 = readConfigurationItems[4] as ReadCalculationGroup;
Assert.IsNotNull(group3);
Assert.AreEqual("Group 3", group3.Name);
- List group1Items = group1.Items.ToList();
+ List group1Items = group1.Items.ToList();
Assert.AreEqual(1, group1Items.Count);
var calculation3 = group1Items[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation3);
Assert.AreEqual("Calculation 3", calculation3.Name);
- List group2Items = group2.Items.ToList();
+ List group2Items = group2.Items.ToList();
Assert.AreEqual(2, group2Items.Count);
var group4 = group2Items[0] as ReadCalculationGroup;
@@ -430,10 +430,10 @@
Assert.IsNotNull(calculation4);
Assert.AreEqual("Calculation 4", calculation4.Name);
- List group3Items = group3.Items.ToList();
+ List group3Items = group3.Items.ToList();
Assert.AreEqual(0, group3Items.Count);
- List group4Items = group4.Items.ToList();
+ List group4Items = group4.Items.ToList();
Assert.AreEqual(1, group4Items.Count);
var calculation5 = group4Items[0] as ReadPipingCalculation;
@@ -449,12 +449,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+ var calculation = readConfigurationItems[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation);
Assert.IsNaN(calculation.AssessmentLevel);
Assert.IsNaN(calculation.EntryPointL);
@@ -473,12 +473,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+ var calculation = readConfigurationItems[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation);
Assert.IsTrue(calculation.AssessmentLevel != null && double.IsNegativeInfinity((double) calculation.AssessmentLevel));
Assert.IsTrue(calculation.EntryPointL != null && double.IsNegativeInfinity((double) calculation.EntryPointL));
@@ -497,12 +497,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+ var calculation = readConfigurationItems[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation);
Assert.AreEqual("Calculation", calculation.Name);
Assert.IsNull(calculation.AssessmentLevel);
@@ -526,12 +526,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+ var calculation = readConfigurationItems[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation);
Assert.AreEqual("Calculation", calculation.Name);
Assert.AreEqual(1.1, calculation.AssessmentLevel);
@@ -555,12 +555,12 @@
var pipingConfigurationReader = new PipingConfigurationReader(filePath);
// Call
- IList readPipingCalculationItems = pipingConfigurationReader.Read().ToList();
+ IList readConfigurationItems = pipingConfigurationReader.Read().ToList();
// Assert
- Assert.AreEqual(1, readPipingCalculationItems.Count);
+ Assert.AreEqual(1, readConfigurationItems.Count);
- var calculation = readPipingCalculationItems[0] as ReadPipingCalculation;
+ var calculation = readConfigurationItems[0] as ReadPipingCalculation;
Assert.IsNotNull(calculation);
Assert.AreEqual("Calculation", calculation.Name);
Assert.AreEqual(1.1, calculation.AssessmentLevel);