Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs =================================================================== diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r3ac5065bf73f4816c743eed9668504af7485b4bc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -633,11 +633,11 @@ /// /// Gets the zoning boundaries determination type. /// - public MacroStabilityInwardsZoningBoundariesDetermination AutomaticForbiddenZones + public MacroStabilityInwardsZoningBoundariesDeterminationType AutomaticForbiddenZones { get { - return MacroStabilityInwardsZoningBoundariesDetermination.Automatic; + return MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic; } } Fisheye: Tag 3ac5065bf73f4816c743eed9668504af7485b4bc refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsZoningBoundariesDetermination.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsZoningBoundariesDeterminationType.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsZoningBoundariesDeterminationType.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsZoningBoundariesDeterminationType.cs (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -0,0 +1,38 @@ +// Copyright (C) Stichting Deltares 2017. 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. + +using Core.Common.Utils.Attributes; +using Ringtoets.MacroStabilityInwards.Data.Properties; + +namespace Ringtoets.MacroStabilityInwards.Data +{ + /// + /// The zoning boundaries determination types. + /// + public enum MacroStabilityInwardsZoningBoundariesDeterminationType + { + [ResourcesDisplayName(typeof(Resources), nameof(Resources.Automatic_DisplayName))] + Automatic = 1, + + [ResourcesDisplayName(typeof(Resources), nameof(Resources.Manual_DisplayName))] + Manual = 2 + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj =================================================================== diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r3ac5065bf73f4816c743eed9668504af7485b4bc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 9743fa24b1c44e916c046064a361f4901f993f92) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -55,7 +55,7 @@ - + True Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsProperties.cs =================================================================== diff -u -r4e00271fd762917c0ce059fe0697e607ed0065fb -r3ac5065bf73f4816c743eed9668504af7485b4bc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsProperties.cs (.../MacroStabilityInwardsSlipPlaneSettingsProperties.cs) (revision 4e00271fd762917c0ce059fe0697e607ed0065fb) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsProperties.cs (.../MacroStabilityInwardsSlipPlaneSettingsProperties.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -85,7 +85,7 @@ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AutomaticForbiddenZones_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.AutomaticForbiddenZones_Description))] [TypeConverter(typeof(EnumTypeConverter))] - public MacroStabilityInwardsZoningBoundariesDetermination AutomaticForbiddenZones + public MacroStabilityInwardsZoningBoundariesDeterminationType AutomaticForbiddenZones { get { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r3ac5065bf73f4816c743eed9668504af7485b4bc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -213,7 +213,7 @@ TangentLineZTop = inputParameters.TangentLineZTop, TangentLineZBottom = inputParameters.TangentLineZBottom, CreateZones = inputParameters.CreateZones, - AutomaticForbiddenZones = inputParameters.AutomaticForbiddenZones == MacroStabilityInwardsZoningBoundariesDetermination.Automatic, + AutomaticForbiddenZones = inputParameters.AutomaticForbiddenZones == MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, SlipPlaneMinimumDepth = inputParameters.SlipPlaneMinimumDepth, SlipPlaneMinimumLength = inputParameters.SlipPlaneMinimumLength }); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs =================================================================== diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r3ac5065bf73f4816c743eed9668504af7485b4bc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -139,7 +139,7 @@ Assert.IsNotNull(inputParameters.RightGrid); Assert.IsTrue(inputParameters.CreateZones); - Assert.AreEqual(MacroStabilityInwardsZoningBoundariesDetermination.Automatic, inputParameters.AutomaticForbiddenZones); + Assert.AreEqual(MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, inputParameters.AutomaticForbiddenZones); } [Test] Fisheye: Tag 3ac5065bf73f4816c743eed9668504af7485b4bc refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -0,0 +1,63 @@ +// Copyright (C) Stichting Deltares 2017. 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. + +using System.Collections.Generic; +using Core.Common.TestUtil; +using NUnit.Framework; + +namespace Ringtoets.MacroStabilityInwards.Data.Test +{ + [TestFixture] + public class MacroStabilityInwardsZoningBoundariesDeterminationTypeTest : EnumTestFixture + { + protected override IDictionary ExpectedDisplayNameForEnumValues + { + get + { + return new Dictionary + { + { + MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, "Automatisch" + }, + { + MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, "Handmatig" + } + }; + } + } + + protected override IDictionary ExpectedValueForEnumValues + { + get + { + return new Dictionary + { + { + MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, 1 + }, + { + MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, 2 + } + }; + } + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj =================================================================== diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r3ac5065bf73f4816c743eed9668504af7485b4bc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision 9743fa24b1c44e916c046064a361f4901f993f92) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -74,7 +74,7 @@ - + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r3ac5065bf73f4816c743eed9668504af7485b4bc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc) @@ -379,7 +379,7 @@ Assert.AreEqual(originalInput.TangentLineZTop, actualInput.TangentLineZTop); Assert.AreEqual(originalInput.TangentLineZBottom, actualInput.TangentLineZBottom); Assert.AreEqual(originalInput.CreateZones, actualInput.CreateZones); - Assert.AreEqual(originalInput.AutomaticForbiddenZones == MacroStabilityInwardsZoningBoundariesDetermination.Automatic, actualInput.AutomaticForbiddenZones); + Assert.AreEqual(originalInput.AutomaticForbiddenZones == MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, actualInput.AutomaticForbiddenZones); Assert.AreEqual(originalInput.SlipPlaneMinimumDepth, actualInput.SlipPlaneMinimumDepth); Assert.AreEqual(originalInput.SlipPlaneMinimumLength, actualInput.SlipPlaneMinimumLength); }