Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -65,7 +65,7 @@ : base(filePath, new[] { new CalculationConfigurationSchemaDefinition( - Resources.KunstwerkenBetrouwbaarheidSluitenSchema, + 0, Resources.KunstwerkenBetrouwbaarheidSluitenSchema, new Dictionary { { Index: Riskeer/Common/src/Riskeer.Common.IO/Configurations/Import/CalculationConfigurationSchemaDefinition.cs =================================================================== diff -u -rc569d5705bffb682cde45f5f18077c9f95aeb736 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/Common/src/Riskeer.Common.IO/Configurations/Import/CalculationConfigurationSchemaDefinition.cs (.../CalculationConfigurationSchemaDefinition.cs) (revision c569d5705bffb682cde45f5f18077c9f95aeb736) +++ Riskeer/Common/src/Riskeer.Common.IO/Configurations/Import/CalculationConfigurationSchemaDefinition.cs (.../CalculationConfigurationSchemaDefinition.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -24,36 +24,36 @@ namespace Riskeer.Common.IO.Configurations.Import { /// - /// Class that represents calculation configuration schema definitions. + /// Class that represents calculation configuration schema definition. /// public class CalculationConfigurationSchemaDefinition { /// /// Creates a new instance of . /// - /// The main schema definition xsd. - /// The nested schema definition xsd. /// The version number of the xml that is read. - public CalculationConfigurationSchemaDefinition(string mainSchemaDefinition, IDictionary nestedSchemaDefinitions, int versionNumber = 0) + /// The main schema definition xsd. + /// The nested schema definitions. + public CalculationConfigurationSchemaDefinition(int versionNumber, string mainSchemaDefinition, IDictionary nestedSchemaDefinitions) { + VersionNumber = versionNumber; MainSchemaDefinition = mainSchemaDefinition; NestedSchemaDefinitions = nestedSchemaDefinitions; - VersionNumber = versionNumber; } /// - /// Gets or sets the version schema definition. + /// Gets the version schema definition. /// - public int VersionNumber { get; private set; } + public int VersionNumber { get; } /// - /// Gets or sets the main schema definition. + /// Gets the main schema definition. /// - public string MainSchemaDefinition { get; private set; } + public string MainSchemaDefinition { get; } /// - /// Gets or sets the nested schema definitions. + /// Gets the nested schema definitions. /// - public IDictionary NestedSchemaDefinitions { get; private set; } + public IDictionary NestedSchemaDefinitions { get; } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -847,7 +847,7 @@ public CalculationConfigurationReader(string xmlFilePath) : base(xmlFilePath, new[] { - new CalculationConfigurationSchemaDefinition(mainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, mainSchemaDefinition, new Dictionary()) }) {} protected override ReadCalculation ParseCalculationElement(XElement calculationElement) Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs =================================================================== diff -u -ra8d8a2d3c8ea357b849bbe78a2791a4f1cb98a6f -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs (.../CalculationConfigurationReaderTest.cs) (revision a8d8a2d3c8ea357b849bbe78a2791a4f1cb98a6f) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs (.../CalculationConfigurationReaderTest.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -101,7 +101,7 @@ // Call void Call() => new CalculationConfigurationReader(invalidFilePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -120,7 +120,7 @@ // Call void Call() => new CalculationConfigurationReader(invalidFilePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -138,7 +138,7 @@ // Call void Call() => new CalculationConfigurationReader(invalidFilePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -155,7 +155,7 @@ // Call void Call() => new CalculationConfigurationReader(invalidFilePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -174,7 +174,7 @@ // Call void Call() => new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -200,7 +200,7 @@ // Call void Call() => new CalculationConfigurationReader(path, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -221,7 +221,7 @@ // Call void Call() => new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(File.ReadAllText(xsdPath), new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, File.ReadAllText(xsdPath), new Dictionary()) }); // Assert @@ -239,7 +239,7 @@ // Call void Call() => new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -257,7 +257,7 @@ // Call void Call() => new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -277,7 +277,7 @@ // Call void Call() => new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -297,7 +297,7 @@ // Call void Call() => new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -313,7 +313,7 @@ // Call void Call() => new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Assert @@ -330,7 +330,7 @@ string filePath = Path.Combine(testDirectoryPath, "validConfigurationEmptyFolder.xml"); var calculationConfigurationReader = new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Call @@ -351,7 +351,7 @@ string filePath = Path.Combine(testDirectoryPath, "validConfiguration.xml"); var calculationConfigurationReader = new CalculationConfigurationReader(filePath, new List { - new CalculationConfigurationSchemaDefinition(validMainSchemaDefinition, new Dictionary()) + new CalculationConfigurationSchemaDefinition(0, validMainSchemaDefinition, new Dictionary()) }); // Call Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationSchemaDefinitionTest.cs =================================================================== diff -u --- Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationSchemaDefinitionTest.cs (revision 0) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationSchemaDefinitionTest.cs (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -0,0 +1,49 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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. + +using System; +using System.Collections.Generic; +using NUnit.Framework; +using Riskeer.Common.IO.Configurations.Import; + +namespace Riskeer.Common.IO.Test.Configurations.Import +{ + [TestFixture] + public class CalculationConfigurationSchemaDefinitionTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Setup + int versionNumber = new Random(21).Next(); + const string mainSchemaDefinition = "mainSchemaDefinition"; + var nestedSchemaDefinitions = new Dictionary(); + + // Call + var schemaDefinition = new CalculationConfigurationSchemaDefinition(versionNumber, mainSchemaDefinition, nestedSchemaDefinitions); + + // Assert + Assert.AreEqual(versionNumber, schemaDefinition.VersionNumber); + Assert.AreEqual(mainSchemaDefinition, schemaDefinition.MainSchemaDefinition); + Assert.AreSame(nestedSchemaDefinitions, schemaDefinition.NestedSchemaDefinitions); + } + } +} \ No newline at end of file Fisheye: Tag de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.IO.Test/Configurations/Import/CalculationConfigurationSchemaDefinitionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -64,7 +64,7 @@ new[] { new CalculationConfigurationSchemaDefinition( - Resources.GEKBConfiguratieSchema, + 0, Resources.GEKBConfiguratieSchema, new Dictionary { { Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -64,7 +64,7 @@ : base(filePath, new[] { new CalculationConfigurationSchemaDefinition( - Resources.KunstwerkenHoogteSchema, + 0, Resources.KunstwerkenHoogteSchema, new Dictionary { { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs (.../MacroStabilityInwardsCalculationConfigurationReader.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs (.../MacroStabilityInwardsCalculationConfigurationReader.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -62,7 +62,7 @@ : base(xmlFilePath, new[] { new CalculationConfigurationSchemaDefinition( - Resources.MacroStabiliteitBinnenwaartsConfiguratieSchema, + 0, Resources.MacroStabiliteitBinnenwaartsConfiguratieSchema, new Dictionary { { Index: Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs (.../PipingCalculationConfigurationReader.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationReader.cs (.../PipingCalculationConfigurationReader.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -59,7 +59,7 @@ : base(xmlFilePath, new[] { new CalculationConfigurationSchemaDefinition( - Resources.PipingConfiguratieSchema, + 0, Resources.PipingConfiguratieSchema, new Dictionary { { Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs (.../WaveConditionsCalculationConfigurationReader.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs (.../WaveConditionsCalculationConfigurationReader.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -65,7 +65,7 @@ : base(xmlFilePath, new[] { new CalculationConfigurationSchemaDefinition( - mainSchemaDefinition, + 0, mainSchemaDefinition, new Dictionary { { Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs =================================================================== diff -u -r083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4 -rde0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision 083a5a0ffd2030fe3d8d5ca5e1c78a06d7cff9b4) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision de0a6dcc11a22e488cc61fbebc2dfee1b6eef2c5) @@ -65,7 +65,7 @@ : base(filePath, new[] { new CalculationConfigurationSchemaDefinition( - Resources.StabilityPointStructuresConfigurationSchema, + 0, Resources.StabilityPointStructuresConfigurationSchema, new Dictionary { {