Index: Riskeer.sln =================================================================== diff -u -re7fecfe63d593e40fd3172ac9bc4725347d4367b -rafed9963ae0fa0e6a70caa0af9b8d3ea98f26d04 --- Riskeer.sln (.../Riskeer.sln) (revision e7fecfe63d593e40fd3172ac9bc4725347d4367b) +++ Riskeer.sln (.../Riskeer.sln) (revision afed9963ae0fa0e6a70caa0af9b8d3ea98f26d04) @@ -1680,21 +1680,26 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F73AF5D7-DDD9-4A48-A171-037817B59056}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Gui", "Core\Gui\src\Core.Gui\Core.Gui.csproj", "{FE63A65E-C5AF-456D-A786-912F9B7E26A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Gui", "Core\Gui\src\Core.Gui\Core.Gui.csproj", "{FE63A65E-C5AF-456D-A786-912F9B7E26A1}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Gui.Test", "Core\Gui\test\Core.Gui.Test\Core.Gui.Test.csproj", "{D0C7032E-5730-46D1-A06F-7C4F06BA590A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Gui.Test", "Core\Gui\test\Core.Gui.Test\Core.Gui.Test.csproj", "{D0C7032E-5730-46D1-A06F-7C4F06BA590A}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Gui.TestUtil", "Core\Gui\test\Core.Gui.TestUtil\Core.Gui.TestUtil.csproj", "{073EE964-974D-442E-801F-F4FCD6D303F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Gui.TestUtil", "Core\Gui\test\Core.Gui.TestUtil\Core.Gui.TestUtil.csproj", "{073EE964-974D-442E-801F-F4FCD6D303F5}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Riskeer.Integration.Data.TestUtil", "Riskeer\Integration\test\Riskeer.Integration.Data.TestUtil\Riskeer.Integration.Data.TestUtil.csproj", "{E3A565CE-20DC-4A4D-A0A4-EDB1853D3513}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -3439,6 +3444,12 @@ {073EE964-974D-442E-801F-F4FCD6D303F5}.Release|x86.Build.0 = Release|x86 {073EE964-974D-442E-801F-F4FCD6D303F5}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {073EE964-974D-442E-801F-F4FCD6D303F5}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 + {E3A565CE-20DC-4A4D-A0A4-EDB1853D3513}.Debug|x86.ActiveCfg = Debug|Any CPU + {E3A565CE-20DC-4A4D-A0A4-EDB1853D3513}.Debug|x86.Build.0 = Debug|Any CPU + {E3A565CE-20DC-4A4D-A0A4-EDB1853D3513}.Release|x86.ActiveCfg = Release|Any CPU + {E3A565CE-20DC-4A4D-A0A4-EDB1853D3513}.Release|x86.Build.0 = Release|Any CPU + {E3A565CE-20DC-4A4D-A0A4-EDB1853D3513}.ReleaseForCodeCoverage|x86.ActiveCfg = Debug|Any CPU + {E3A565CE-20DC-4A4D-A0A4-EDB1853D3513}.ReleaseForCodeCoverage|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3806,6 +3817,7 @@ {FE63A65E-C5AF-456D-A786-912F9B7E26A1} = {8BE49C65-DD09-4890-82B1-5216BF13E757} {D0C7032E-5730-46D1-A06F-7C4F06BA590A} = {F73AF5D7-DDD9-4A48-A171-037817B59056} {073EE964-974D-442E-801F-F4FCD6D303F5} = {F73AF5D7-DDD9-4A48-A171-037817B59056} + {E3A565CE-20DC-4A4D-A0A4-EDB1853D3513} = {88E04195-C43E-40D3-B5F2-3A25E1E79E03} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {039D31AA-B517-4354-B8CD-0B2B826D0B1F} Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -r476486c9b3d1375eb82fec1a727ec2977447d50d -rafed9963ae0fa0e6a70caa0af9b8d3ea98f26d04 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 476486c9b3d1375eb82fec1a727ec2977447d50d) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision afed9963ae0fa0e6a70caa0af9b8d3ea98f26d04) @@ -34,6 +34,7 @@ using Riskeer.Common.Data.Exceptions; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Integration.Data.Assembly; +using Riskeer.Integration.Data.TestUtil; using Riskeer.Integration.TestUtil; namespace Riskeer.Integration.Data.Test.Assembly @@ -211,8 +212,8 @@ AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; calculator.CombinedFailureMechanismSectionAssemblyOutput = new[] { - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, 20), - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, 21) + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 20), + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 21) }; // Call @@ -286,18 +287,6 @@ #region Helpers - private static CombinedFailureMechanismSectionAssembly CreateCombinedFailureMechanismSectionAssembly( - IAssessmentSection assessmentSection, int seed) - { - var random = new Random(seed); - return new CombinedFailureMechanismSectionAssembly( - new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(), random.NextEnumValue()), - assessmentSection.GetFailureMechanisms() - .Where(fm => fm.InAssembly) - .Select(fm => random.NextEnumValue()) - .ToArray()); - } - private static AssessmentSection CreateAssessmentSection() { var random = new Random(21); Index: Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyTestFactory.cs =================================================================== diff -u --- Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyTestFactory.cs (revision 0) +++ Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyTestFactory.cs (revision afed9963ae0fa0e6a70caa0af9b8d3ea98f26d04) @@ -0,0 +1,53 @@ +// Copyright (C) Stichting Deltares 2021. 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.Linq; +using Core.Common.TestUtil; +using Riskeer.AssemblyTool.Data; +using Riskeer.Common.Data.AssessmentSection; + +namespace Riskeer.Integration.Data.TestUtil +{ + /// + /// Creates for test purposes. + /// + public static class CombinedFailureMechanismSectionAssemblyTestFactory + { + /// + /// Creates a bases on the failure mechanisms + /// in that are 'in assembly'. + /// + /// The to get the failure mechanisms from. + /// The seed to create random values. + /// The created . + public static CombinedFailureMechanismSectionAssembly Create(IAssessmentSection assessmentSection, int seed) + { + var random = new Random(seed); + return new CombinedFailureMechanismSectionAssembly( + new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(), random.NextEnumValue()), + assessmentSection.GetFailureMechanisms() + .Where(fm => fm.InAssembly) + .Select(fm => random.NextEnumValue()) + .ToArray()); + } + } +} \ No newline at end of file Fisheye: Tag e7fecfe63d593e40fd3172ac9bc4725347d4367b refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e7fecfe63d593e40fd3172ac9bc4725347d4367b refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/Riskeer.Integration.Data.TestUtil.csproj'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r0d1eb93c536da17bfb1fd47333cc48e9179159f0 -rafed9963ae0fa0e6a70caa0af9b8d3ea98f26d04 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs (.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs (.../AssessmentSectionAssemblyMapDataFeaturesFactoryTest.cs) (revision afed9963ae0fa0e6a70caa0af9b8d3ea98f26d04) @@ -36,6 +36,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Assembly; +using Riskeer.Integration.Data.TestUtil; using Riskeer.Integration.Forms.Factories; using Riskeer.Integration.Util; @@ -74,8 +75,8 @@ AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; CombinedFailureMechanismSectionAssembly[] failureMechanismSectionAssembly = { - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, 20), - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, 21) + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 20), + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 21) }; calculator.CombinedFailureMechanismSectionAssemblyOutput = failureMechanismSectionAssembly; @@ -134,17 +135,6 @@ } } - private static CombinedFailureMechanismSectionAssembly CreateCombinedFailureMechanismSectionAssembly(IAssessmentSection assessmentSection, int seed) - { - var random = new Random(seed); - return new CombinedFailureMechanismSectionAssembly( - new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(), random.NextEnumValue()), - assessmentSection.GetFailureMechanisms() - .Where(fm => fm.InAssembly) - .Select(fm => random.NextEnumValue()) - .ToArray()); - } - private static void AssertEqualPointCollections(ReferenceLine referenceLine, CombinedFailureMechanismSectionAssemblyResult sectionAssemblyResult, MapGeometry geometry) Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs =================================================================== diff -u -r0d1eb93c536da17bfb1fd47333cc48e9179159f0 -rafed9963ae0fa0e6a70caa0af9b8d3ea98f26d04 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs (.../AssemblyResultPerSectionMapViewTest.cs) (revision 0d1eb93c536da17bfb1fd47333cc48e9179159f0) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs (.../AssemblyResultPerSectionMapViewTest.cs) (revision afed9963ae0fa0e6a70caa0af9b8d3ea98f26d04) @@ -45,6 +45,7 @@ using Riskeer.Common.Forms.Views; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Assembly; +using Riskeer.Integration.Data.TestUtil; using Riskeer.Integration.Forms.Views; using Riskeer.Integration.Util; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -132,8 +133,6 @@ public void Constructor_WithAllData_DataUpdatedToCollectionOfFilledMapData() { // Setup - var random = new Random(21); - AssessmentSection assessmentSection = CreateAssessmentSectionWithReferenceLine(); assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] { @@ -147,8 +146,7 @@ AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; CombinedFailureMechanismSectionAssembly[] failureMechanismSectionAssembly = { - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, - random.NextEnumValue()) + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 21) }; calculator.CombinedFailureMechanismSectionAssemblyOutput = failureMechanismSectionAssembly; @@ -258,7 +256,7 @@ AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; calculator.CombinedFailureMechanismSectionAssemblyOutput = new[] { - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, FailureMechanismSectionAssemblyGroup.Gr) + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 10) }; using (var view = new AssemblyResultPerSectionMapView(assessmentSection)) @@ -282,7 +280,7 @@ // When calculator.CombinedFailureMechanismSectionAssemblyOutput = new[] { - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, FailureMechanismSectionAssemblyGroup.I) + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 20) }; IEnumerable failureMechanisms = assessmentSection.GetFailureMechanisms(); failureMechanisms.ElementAt(random.Next(failureMechanisms.Count())).NotifyObservers(); @@ -309,7 +307,7 @@ AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; calculator.CombinedFailureMechanismSectionAssemblyOutput = new[] { - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, FailureMechanismSectionAssemblyGroup.III) + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 10) }; using (var view = new AssemblyResultPerSectionMapView(assessmentSection)) @@ -333,7 +331,7 @@ // When calculator.CombinedFailureMechanismSectionAssemblyOutput = new[] { - CreateCombinedFailureMechanismSectionAssembly(assessmentSection, FailureMechanismSectionAssemblyGroup.I) + CombinedFailureMechanismSectionAssemblyTestFactory.Create(assessmentSection, 20) }; assessmentSection.NotifyObservers(); @@ -365,17 +363,6 @@ return assessmentSection; } - private static CombinedFailureMechanismSectionAssembly CreateCombinedFailureMechanismSectionAssembly( - IAssessmentSection assessmentSection, FailureMechanismSectionAssemblyGroup totalResult) - { - var random = new Random(37); - return new CombinedFailureMechanismSectionAssembly( - new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(), totalResult), - assessmentSection.GetFailureMechanisms() - .Where(fm => fm.InAssembly) - .Select(fm => random.NextEnumValue()).ToArray()); - } - private static void AssertReferenceLineMapData(ReferenceLine referenceLine, MapData referenceLineMapData) { MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);