Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategy.cs =================================================================== diff -u -re295f5b43c1e0d1f4f605565d2c656027670a476 -r8f7fc024a7cf275c26c73ca66c2c1a01f14d78ba --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategy.cs (.../DuneErosionFailureMechanismSectionResultUpdateStrategy.cs) (revision e295f5b43c1e0d1f4f605565d2c656027670a476) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategy.cs (.../DuneErosionFailureMechanismSectionResultUpdateStrategy.cs) (revision 8f7fc024a7cf275c26c73ca66c2c1a01f14d78ba) @@ -31,7 +31,7 @@ /// from an old instance. /// public class DuneErosionFailureMechanismSectionResultUpdateStrategy - : IFailureMechanismSectionResultUpdateStrategy + : IFailureMechanismSectionResultUpdateStrategy { public void UpdateSectionResultOld(DuneErosionFailureMechanismSectionResultOld origin, DuneErosionFailureMechanismSectionResultOld target) { @@ -56,7 +56,7 @@ target.ManualAssemblyCategoryGroup = origin.ManualAssemblyCategoryGroup; } - public void UpdateSectionResult(AdoptableFailureMechanismSectionResult origin, AdoptableFailureMechanismSectionResult target) + public void UpdateSectionResult(NonAdoptableFailureMechanismSectionResult origin, NonAdoptableFailureMechanismSectionResult target) { if (origin == null) { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -re295f5b43c1e0d1f4f605565d2c656027670a476 -r8f7fc024a7cf275c26c73ca66c2c1a01f14d78ba --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs (.../DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs) (revision e295f5b43c1e0d1f4f605565d2c656027670a476) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs (.../DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 8f7fc024a7cf275c26c73ca66c2c1a01f14d78ba) @@ -33,7 +33,7 @@ { [TestFixture] public class DuneErosionFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< - DuneErosionFailureMechanismSectionResultUpdateStrategy, DuneErosionFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult> + DuneErosionFailureMechanismSectionResultUpdateStrategy, DuneErosionFailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult> { protected override DuneErosionFailureMechanismSectionResultOld CreateEmptySectionResultOld() { @@ -70,25 +70,25 @@ Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); } - protected override AdoptableFailureMechanismSectionResult CreateEmptySectionResult() + protected override NonAdoptableFailureMechanismSectionResult CreateEmptySectionResult() { - return new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + return new NonAdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - protected override AdoptableFailureMechanismSectionResult CreateConfiguredSectionResult() + protected override NonAdoptableFailureMechanismSectionResult CreateConfiguredSectionResult() { var random = new Random(39); - return new AdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new NonAdoptableFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { IsRelevant = true, - InitialFailureMechanismResult = AdoptableInitialFailureMechanismResultType.Manual, + InitialFailureMechanismResult = NonAdoptableInitialFailureMechanismResultType.Manual, ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(), FurtherAnalysisNeeded = true, RefinedSectionProbability = random.NextDouble() }; } - protected override void AssertSectionResult(AdoptableFailureMechanismSectionResult originResult, AdoptableFailureMechanismSectionResult targetResult) + protected override void AssertSectionResult(NonAdoptableFailureMechanismSectionResult originResult, NonAdoptableFailureMechanismSectionResult targetResult) { Assert.AreEqual(originResult.IsRelevant, targetResult.IsRelevant); Assert.AreEqual(originResult.InitialFailureMechanismResult, targetResult.InitialFailureMechanismResult);