Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs =================================================================== diff -u -re492c9347e3efe221e0e363dff2a21c0a70dd0e1 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs (.../AssessmentSectionAssemblyCalculator.cs) (revision e492c9347e3efe221e0e363dff2a21c0a70dd0e1) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs (.../AssessmentSectionAssemblyCalculator.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -69,11 +69,11 @@ } catch (AssemblyException e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -90,11 +90,11 @@ } catch (AssemblyException e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -112,11 +112,11 @@ } catch (AssemblyException e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -132,11 +132,11 @@ } catch (AssemblyException e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssessmentSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } } Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs =================================================================== diff -u -re492c9347e3efe221e0e363dff2a21c0a70dd0e1 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs (.../FailureMechanismAssemblyCalculator.cs) (revision e492c9347e3efe221e0e363dff2a21c0a70dd0e1) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs (.../FailureMechanismAssemblyCalculator.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -66,11 +66,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -90,11 +90,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } } Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -re492c9347e3efe221e0e363dff2a21c0a70dd0e1 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision e492c9347e3efe221e0e363dff2a21c0a70dd0e1) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -68,11 +68,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -88,11 +88,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -112,11 +112,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -157,11 +157,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -182,11 +182,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -209,11 +209,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -240,11 +240,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -268,11 +268,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -295,11 +295,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -324,11 +324,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -348,11 +348,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -387,11 +387,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -422,11 +422,11 @@ } catch (AssemblyException e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new FailureMechanismSectionAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/AssemblyErrorMessageCreator.cs =================================================================== diff -u --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/AssemblyErrorMessageCreator.cs (revision 0) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/AssemblyErrorMessageCreator.cs (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -0,0 +1,136 @@ +// 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; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using Assembly.Kernel.Exceptions; +using Ringtoets.AssemblyTool.KernelWrapper.Properties; + +namespace Ringtoets.AssemblyTool.KernelWrapper.Calculators +{ + /// + /// Class that creates to localized error messages for the assembly tool. + /// + public static class AssemblyErrorMessageCreator + { + /// + /// Creates a localized string based on the contents of . + /// + /// The collection of to localize. + /// A localized string containing the error messages. + /// Thrown when is null. + /// Thrown when contains an + /// invalid value of . + public static string CreateErrorMessage(IEnumerable errorMessages) + { + if (errorMessages == null) + { + throw new ArgumentNullException(nameof(errorMessages)); + } + + return errorMessages.Count() == 1 + ? GetErrorMessage(errorMessages.Single().ErrorCode) + : errorMessages.Aggregate(string.Empty, (current, message) => current + "- " + GetErrorMessage(message.ErrorCode) + "\n"); + } + + /// + /// Creates a generic error message for when an unexpected exception has been thrown. + /// + /// A generic error message. + public static string CreateGenericErrorMessage() + { + return Resources.AssemblyErrorMessageTranslator_GenericErrorMessage; + } + + /// + /// Gets the localized error message that belongs to the given . + /// + /// The to localize. + /// A localized string. + /// Thrown when + /// is an invalid value of . + /// Thrown when is a valid value, + /// but unsupported. + private static string GetErrorMessage(EAssemblyErrors assemblyError) + { + if (!Enum.IsDefined(typeof(EAssemblyErrors), assemblyError)) + { + throw new InvalidEnumArgumentException(nameof(assemblyError), (int) assemblyError, typeof(EAssemblyErrors)); + } + + switch (assemblyError) + { + case EAssemblyErrors.SignallingLimitOutOfRange: + return Resources.AssemblyErrorMessageTranslator_SignallingLimitOutOfRange; + case EAssemblyErrors.LowerLimitOutOfRange: + return Resources.AssemblyErrorMessageTranslator_LowerLimitOutOfRange; + case EAssemblyErrors.FailurePropbabilityMarginOutOfRange: + return Resources.AssemblyErrorMessageTranslator_FailurePropbabilityMarginOutOfRange; + case EAssemblyErrors.LengthEffectFactorOutOfRange: + return Resources.AssemblyErrorMessageTranslator_LengthEffectFactorOutOfRange; + case EAssemblyErrors.SectionLengthOutOfRange: + return Resources.AssemblyErrorMessageTranslator_SectionLengthOutOfRange; + case EAssemblyErrors.SignallingLimitAboveLowerLimit: + return Resources.AssemblyErrorMessageTranslator_SignallingLimitAboveLowerLimit; + case EAssemblyErrors.PsigDsnAbovePsig: + return Resources.AssemblyErrorMessageTranslator_PsigDsnAbovePsig; + case EAssemblyErrors.PlowDsnAbovePlow: + return Resources.AssemblyErrorMessageTranslator_PlowDsnAbovePlow; + case EAssemblyErrors.LowerLimitIsAboveUpperLimit: + return Resources.AssemblyErrorMessageTranslator_LowerLimitIsAboveUpperLimit; + case EAssemblyErrors.CategoryLowerLimitOutOfRange: + return Resources.AssemblyErrorMessageTranslator_CategoryLowerLimitOutOfRange; + case EAssemblyErrors.CategoryUpperLimitOutOfRange: + return Resources.AssemblyErrorMessageTranslator_CategoryUpperLimitOutOfRange; + case EAssemblyErrors.TranslateAssessmentInvalidInput: + return Resources.AssemblyErrorMessageTranslator_TranslateAssessmentInvalidInput; + case EAssemblyErrors.ValueMayNotBeNull: + return Resources.AssemblyErrorMessageTranslator_ValueMayNotBeNull; + case EAssemblyErrors.CategoryNotAllowed: + return Resources.AssemblyErrorMessageTranslator_CategoryNotAllowed; + case EAssemblyErrors.DoesNotComplyAfterComply: + return Resources.AssemblyErrorMessageTranslator_DoesNotComplyAfterComply; + case EAssemblyErrors.FmSectionLengthInvalid: + return Resources.AssemblyErrorMessageTranslator_FmSectionLengthInvalid; + case EAssemblyErrors.FmSectionSectionStartEndInvalid: + return Resources.AssemblyErrorMessageTranslator_FmSectionSectionStartEndInvalid; + case EAssemblyErrors.FailureProbabilityOutOfRange: + return Resources.AssemblyErrorMessageTranslator_FailureProbabilityOutOfRange; + case EAssemblyErrors.InputNotTheSameType: + return Resources.AssemblyErrorMessageTranslator_InputNotTheSameType; + case EAssemblyErrors.FailureMechanismAssemblerInputInvalid: + return Resources.AssemblyErrorMessageTranslator_NoSectionsImported; + case EAssemblyErrors.CommonFailureMechanismSectionsInvalid: + return Resources.AssemblyErrorMessageTranslator_NoSectionsImported; + case EAssemblyErrors.CommonFailureMechanismSectionsNotConsecutive: + return Resources.AssemblyErrorMessageTranslator_CommonFailureMechanismSectionsNotConsecutive; + case EAssemblyErrors.RequestedPointOutOfRange: + return Resources.AssemblyErrorMessageTranslator_RequestedPointOutOfRange; + case EAssemblyErrors.FailureMechanismDuplicateSection: + return Resources.AssemblyErrorMessageTranslator_FailureMechanismDuplicateSection; + default: + throw new NotSupportedException(); + } + } + } +} \ No newline at end of file Fisheye: Tag 61e0b1bf1351eabb70eccd3fafeb61ade378f44c refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/AssemblyErrorMessageTranslator.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs =================================================================== diff -u -r72dba5708cc6d66f7d4ad698c0b72ddd2f540154 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs (.../AssemblyCategoriesCalculator.cs) (revision 72dba5708cc6d66f7d4ad698c0b72ddd2f540154) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs (.../AssemblyCategoriesCalculator.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -65,11 +65,11 @@ } catch (AssemblyException e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -86,11 +86,11 @@ } catch (AssemblyException e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -108,11 +108,11 @@ } catch (AssemblyException e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } @@ -130,11 +130,11 @@ } catch (AssemblyException e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateErrorMessage(e.Errors), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e); } catch (Exception e) { - throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), e); + throw new AssemblyCategoriesCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e); } } } Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj =================================================================== diff -u -r1ad5c94df19848c40549ae236cc229dadc7dd136 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj (.../Ringtoets.AssemblyTool.KernelWrapper.csproj) (revision 1ad5c94df19848c40549ae236cc229dadc7dd136) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj (.../Ringtoets.AssemblyTool.KernelWrapper.csproj) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -14,7 +14,7 @@ - + Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/AssemblyErrorMessageCreatorTest.cs =================================================================== diff -u --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/AssemblyErrorMessageCreatorTest.cs (revision 0) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/AssemblyErrorMessageCreatorTest.cs (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -0,0 +1,132 @@ +// 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; +using System.ComponentModel; +using System.Linq; +using Assembly.Kernel.Exceptions; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.AssemblyTool.KernelWrapper.Calculators; + +namespace Ringtoets.AssemblyTool.KernelWrapper.Test +{ + [TestFixture] + public class AssemblyErrorMessageCreatorTest + { + [Test] + public void CreateErrorMessage_ErrorMessagesNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => AssemblyErrorMessageCreator.CreateErrorMessage(null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("errorMessages", exception.ParamName); + } + + [Test] + public void CreateErrorMessage_InvalidAssemblyError_ThrowsInvalidEnumArgumentException() + { + // Call + TestDelegate test = () => AssemblyErrorMessageCreator.CreateErrorMessage(new[] + { + new AssemblyErrorMessage(string.Empty, (EAssemblyErrors) 9999) + }); + + // Assert + string expectedMessage = $"The value of argument 'assemblyError' (9999) is invalid for Enum type '{nameof(EAssemblyErrors)}'."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + } + + [Test] + [TestCase(EAssemblyErrors.SignallingLimitOutOfRange, "Signaleringskans moet in het bereik [0,1] liggen.")] + [TestCase(EAssemblyErrors.LowerLimitOutOfRange, "Ondergrens moet in het bereik [0,1] liggen.")] + [TestCase(EAssemblyErrors.FailurePropbabilityMarginOutOfRange, "Faalkansruimte moet in het bereik [0,1] liggen.")] + [TestCase(EAssemblyErrors.LengthEffectFactorOutOfRange, "Lengte-effect factor moet minimaal 1 zijn.")] + [TestCase(EAssemblyErrors.SectionLengthOutOfRange, "De trajectlengte moet groter zijn dan 0 [m].")] + [TestCase(EAssemblyErrors.SignallingLimitAboveLowerLimit, "De signaleringskans moet kleiner zijn dan de ondergrens.")] + [TestCase(EAssemblyErrors.PsigDsnAbovePsig, "Berekende signaleringskans per doorsnede is groter dan de signaleringskans van het traject.")] + [TestCase(EAssemblyErrors.PlowDsnAbovePlow, "Berekende ondergrens per doorsnede is groter dan de ondergrens van het traject.")] + [TestCase(EAssemblyErrors.LowerLimitIsAboveUpperLimit, "De categoriebovengrens moet boven de categorieondergrens liggen.")] + [TestCase(EAssemblyErrors.CategoryLowerLimitOutOfRange, "Categoriebovengrens moet in het bereik [0,1] liggen.")] + [TestCase(EAssemblyErrors.CategoryUpperLimitOutOfRange, "Categorieondergrens moet in het bereik [0,1] liggen.")] + [TestCase(EAssemblyErrors.TranslateAssessmentInvalidInput, "Er is een ongeldig resultaat gespecificeerd voor de gebruikte methode.")] + [TestCase(EAssemblyErrors.ValueMayNotBeNull, "Er is ongeldige invoer gedefinieerd voor de gebruikte methode.")] + [TestCase(EAssemblyErrors.CategoryNotAllowed, "Het specificeren van een assemblageresultaat voor deze categorie is niet mogelijk.")] + [TestCase(EAssemblyErrors.DoesNotComplyAfterComply, "Een lagere categorie moet als voldoende worden aangemerkt indien het vak voor een hogere categorie voldoet.")] + [TestCase(EAssemblyErrors.FmSectionLengthInvalid, "Gezamenlijke lengte van alle deelvakken moet gelijk zijn aan de trajectlengte.")] + [TestCase(EAssemblyErrors.FmSectionSectionStartEndInvalid, "De lengte van een berekende deelvak kon niet goed worden bepaald.")] + [TestCase(EAssemblyErrors.FailureProbabilityOutOfRange, "De gespecificeerde kans moet in het bereik [0,1] liggen.")] + [TestCase(EAssemblyErrors.InputNotTheSameType, "De resultaten voor alle vakken moeten allen wel of geen kansspecificatie bevatten.")] + [TestCase(EAssemblyErrors.FailureMechanismAssemblerInputInvalid, "Er moet een vakindeling zijn geimporteerd.")] + [TestCase(EAssemblyErrors.CommonFailureMechanismSectionsInvalid, "Er moet een vakindeling zijn geimporteerd.")] + [TestCase(EAssemblyErrors.CommonFailureMechanismSectionsNotConsecutive, "Alle (deel)vakken moeten minimaal een lengte hebben van 0.01 [m].")] + [TestCase(EAssemblyErrors.RequestedPointOutOfRange, "De gespecificeerde resultaten voor een of meerdere toetssporen dekken niet de volledige lengte van het traject.")] + [TestCase(EAssemblyErrors.FailureMechanismDuplicateSection, "De gespecificeerde vakindeling voor een of meerdere toetssporen bevat een of meer overlappende vakken.")] + public void CreateErrorMessage_SingleAssemblyError_ReturnsExpectedErrorMessage(EAssemblyErrors assemblyError, string expectedErrorMessage) + { + // Call + string errorMessage = AssemblyErrorMessageCreator.CreateErrorMessage(new[] + { + new AssemblyErrorMessage(string.Empty, assemblyError) + }); + + // Assert + Assert.AreEqual(expectedErrorMessage, errorMessage); + } + + [Test] + public void CreateErrorMessage_MultipleAssemblyErrors_ReturnsExpectedErrorMessage() + { + // Call + string errorMessage = AssemblyErrorMessageCreator.CreateErrorMessage(new[] + { + new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryNotAllowed), + new AssemblyErrorMessage(string.Empty, EAssemblyErrors.FailureProbabilityOutOfRange) + }); + + // Assert + Assert.AreEqual("- Het specificeren van een assemblageresultaat voor deze categorie is niet mogelijk.\n" + + "- De gespecificeerde kans moet in het bereik [0,1] liggen.\n", errorMessage); + } + + [Test] + public void CreateErrorMessage_NoAssemblyErrors_ReturnsEmptyErrorMessage() + { + // Call + string errorMessage = AssemblyErrorMessageCreator.CreateErrorMessage(Enumerable.Empty()); + + // Assert + Assert.IsEmpty(errorMessage); + } + + [Test] + public void CreateGenericErrorMessage_Always_ReturnsExpectedErrorMessage() + { + // Call + string errorMessage = AssemblyErrorMessageCreator.CreateGenericErrorMessage(); + + // Assert + Assert.AreEqual("Er is een onverwachte fout opgetreden tijdens het assembleren.", errorMessage); + } + } +} \ No newline at end of file Fisheye: Tag 61e0b1bf1351eabb70eccd3fafeb61ade378f44c refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/AssemblyErrorMessageTranslatorTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs =================================================================== diff -u -re492c9347e3efe221e0e363dff2a21c0a70dd0e1 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision e492c9347e3efe221e0e363dff2a21c0a70dd0e1) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -93,7 +93,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -189,7 +189,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -217,7 +217,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -245,10 +245,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -270,7 +270,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -345,7 +345,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -367,7 +367,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -389,10 +389,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -419,7 +419,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -511,7 +511,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -539,7 +539,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -567,10 +567,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -596,7 +596,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -713,7 +713,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -743,7 +743,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -773,10 +773,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs =================================================================== diff -u -re492c9347e3efe221e0e363dff2a21c0a70dd0e1 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs (.../FailureMechanismAssemblyCalculatorTest.cs) (revision e492c9347e3efe221e0e363dff2a21c0a70dd0e1) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs (.../FailureMechanismAssemblyCalculatorTest.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -87,7 +87,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -160,7 +160,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -182,7 +182,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -204,10 +204,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -229,7 +229,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -309,7 +309,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -332,7 +332,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -355,10 +355,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -re492c9347e3efe221e0e363dff2a21c0a70dd0e1 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision e492c9347e3efe221e0e363dff2a21c0a70dd0e1) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -112,7 +112,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -182,7 +182,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -205,7 +205,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -228,10 +228,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -250,7 +250,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -320,7 +320,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -343,7 +343,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -366,10 +366,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -392,7 +392,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -441,7 +441,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -491,7 +491,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -516,10 +516,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -542,7 +542,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -657,7 +657,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -683,7 +683,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -709,10 +709,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -736,7 +736,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -857,7 +857,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -884,7 +884,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -911,10 +911,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -939,7 +939,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1010,7 +1010,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1066,7 +1066,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1094,10 +1094,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -1137,7 +1137,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1187,7 +1187,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1237,7 +1237,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1262,10 +1262,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -1288,7 +1288,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1397,7 +1397,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1423,7 +1423,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1449,10 +1449,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -1475,7 +1475,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1584,7 +1584,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1610,7 +1610,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1636,10 +1636,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -1663,7 +1663,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1779,7 +1779,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1806,7 +1806,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1833,10 +1833,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -1855,7 +1855,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1931,7 +1931,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1955,7 +1955,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -1979,10 +1979,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -2010,7 +2010,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2123,7 +2123,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2150,7 +2150,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2177,10 +2177,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -2203,7 +2203,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2314,7 +2314,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2341,7 +2341,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2368,10 +2368,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -2482,7 +2482,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2505,7 +2505,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2528,10 +2528,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -2637,7 +2637,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2660,7 +2660,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -2683,10 +2683,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs =================================================================== diff -u -r72dba5708cc6d66f7d4ad698c0b72ddd2f540154 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs (.../AssemblyCategoriesCalculatorTest.cs) (revision 72dba5708cc6d66f7d4ad698c0b72ddd2f540154) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs (.../AssemblyCategoriesCalculatorTest.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -140,7 +140,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -166,10 +166,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -240,7 +240,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -263,10 +263,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -337,7 +337,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -360,10 +360,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } @@ -434,7 +434,7 @@ // Assert var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); - Assert.AreEqual(AssemblyErrorMessageTranslator.CreateGenericErrorMessage(), exception.Message); + Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message); } } @@ -457,10 +457,10 @@ // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual(exception.Message, AssemblyErrorMessageTranslator.CreateErrorMessage(new[] + Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { new AssemblyErrorMessage(string.Empty, EAssemblyErrors.CategoryLowerLimitOutOfRange) - })); + }), exception.Message); } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj =================================================================== diff -u -r8d9540a51869ad80728cfbd441158323577192e7 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj (.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj) (revision 8d9540a51869ad80728cfbd441158323577192e7) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj (.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -20,7 +20,7 @@ - + Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -rcba20421f85c9a64ac28122303978067e07dcaaa -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs (.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs) (revision cba20421f85c9a64ac28122303978067e07dcaaa) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs (.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -50,7 +50,7 @@ } [Test] - public void AssembleCommonFailureMechanismSections_ThrowExceptionOnCalculateFalse_InputCorrectlySetToKernelAndCalculatedTrue() + public void AssembleCommonFailureMechanismSections_KernelDoesNotThrowException_InputCorrectlySetToKernelAndCalculatedTrue() { // Setup var random = new Random(21); @@ -71,7 +71,7 @@ } [Test] - public void AssembleCommonFailureMechanismSections_ThrowExceptionOnCalculateFalse_ReturnAssessmentGrade() + public void AssembleCommonFailureMechanismSections_KernelDoesNotThrowException_ReturnAssessmentGrade() { // Setup var random = new Random(21); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -rcba20421f85c9a64ac28122303978067e07dcaaa -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision cba20421f85c9a64ac28122303978067e07dcaaa) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -1352,7 +1352,7 @@ } [Test] - public void TranslateAssessmentResultWbi0A1_WithDirectResultAndThrowAssemblyExceptionOnCalculateTrue_ThrowsException() + public void TranslateAssessmentResultWbi0A1_WithDirectResultAndThrowAssemblyExceptionOnCalculateTrue_ThrowsAssemblyException() { // Setup var random = new Random(11); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs =================================================================== diff -u -r93b73bcc0968d0bbd1a63d6fc1cfabf85fdf48e1 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs (.../AssessmentSectionAssemblyKernelStub.cs) (revision 93b73bcc0968d0bbd1a63d6fc1cfabf85fdf48e1) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs (.../AssessmentSectionAssemblyKernelStub.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -85,7 +85,7 @@ public EAssessmentGrade AssembleAssessmentSectionWbi2A1(IEnumerable failureMechanismAssemblyResults, bool partialAssembly) { - ThrowExceptions(); + ThrowException(); PartialAssembly = partialAssembly; FailureMechanismAssemblyResults = failureMechanismAssemblyResults; @@ -99,7 +99,7 @@ IEnumerable failureMechanismAssemblyResults, bool partialAssembly) { - ThrowExceptions(); + ThrowException(); PartialAssembly = partialAssembly; AssessmentSectionInput = section; @@ -113,7 +113,7 @@ public AssessmentSectionAssemblyResult AssembleAssessmentSectionWbi2C1(AssessmentSectionAssemblyResult assemblyResultNoFailureProbability, AssessmentSectionAssemblyResult assemblyResultWithFailureProbability) { - ThrowExceptions(); + ThrowException(); AssemblyResultNoFailureProbability = assemblyResultNoFailureProbability; AssemblyResultWithFailureProbability = assemblyResultWithFailureProbability; @@ -123,7 +123,7 @@ return AssessmentSectionAssemblyResult; } - private void ThrowExceptions() + private void ThrowException() { if (ThrowExceptionOnCalculate) { Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs =================================================================== diff -u -rf2dfaa1f8a4e24ed8f7783084e2e7081f2a024ec -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs (.../FailureMechanismAssemblyKernelStub.cs) (revision f2dfaa1f8a4e24ed8f7783084e2e7081f2a024ec) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs (.../FailureMechanismAssemblyKernelStub.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -81,7 +81,7 @@ public EFailureMechanismCategory AssembleFailureMechanismWbi1A1(IEnumerable fmSectionAssemblyResults, bool partialAssembly) { - ThrowExceptions(); + ThrowException(); FmSectionAssemblyResultsInput = fmSectionAssemblyResults; PartialAssembly = partialAssembly; @@ -101,7 +101,7 @@ IEnumerable fmSectionAssemblyResults, bool partialAssembly) { - ThrowExceptions(); + ThrowException(); AssessmentSectionInput = section; FailureMechanismInput = failureMechanism; @@ -112,7 +112,7 @@ return FailureMechanismAssemblyResult; } - private void ThrowExceptions() + private void ThrowException() { if (ThrowExceptionOnCalculate) { Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs =================================================================== diff -u -r2adb47e21798d0339af3d9f6adf5d40775245dac -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision 2adb47e21798d0339af3d9f6adf5d40775245dac) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -136,7 +136,7 @@ public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0E1(EAssessmentResultTypeE1 assessment) { - ThrowExceptions(); + ThrowException(); AssessmentResultTypeE1Input = assessment; @@ -151,7 +151,7 @@ public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0E3(EAssessmentResultTypeE2 assessment) { - ThrowExceptions(); + ThrowException(); AssessmentResultTypeE2Input = assessment; @@ -166,7 +166,7 @@ public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0G1(EAssessmentResultTypeG1 assessment) { - ThrowExceptions(); + ThrowException(); AssessmentResultTypeG1Input = assessment; @@ -184,7 +184,7 @@ EAssessmentResultTypeG2 assessment, double? failureProbability) { - ThrowExceptions(); + ThrowException(); AssessmentSectionInput = section; FailureMechanismInput = failureMechanism; @@ -206,7 +206,7 @@ EAssessmentResultTypeG2 assessment, double? failureProbability) { - ThrowExceptions(); + ThrowException(); AssessmentSectionInput = section; FailureMechanismInput = failureMechanism; @@ -220,7 +220,7 @@ public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0G6(FmSectionCategoryCompliancyResults compliancyResults) { - ThrowExceptions(); + ThrowException(); CategoryCompliancyResultsInput = compliancyResults; @@ -230,7 +230,7 @@ public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0T1(EAssessmentResultTypeT1 assessment) { - ThrowExceptions(); + ThrowException(); AssessmentResultTypeT1Input = assessment; @@ -248,7 +248,7 @@ EAssessmentResultTypeT3 assessment, double? failureProbability) { - ThrowExceptions(); + ThrowException(); AssessmentSectionInput = section; FailureMechanismInput = failureMechanism; @@ -261,7 +261,7 @@ public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0T4(EAssessmentResultTypeT3 assessment, EFmSectionCategory? category) { - ThrowExceptions(); + ThrowException(); AssessmentResultTypeT3Input = assessment; SectionCategoryInput = category; @@ -276,7 +276,7 @@ EAssessmentResultTypeT3 assessment, double? failureProbability) { - ThrowExceptions(); + ThrowException(); AssessmentSectionInput = section; FailureMechanismInput = failureMechanism; @@ -298,7 +298,7 @@ EAssessmentResultTypeT4 assessment, double? failureProbability) { - ThrowExceptions(); + ThrowException(); AssessmentSectionInput = section; FailureMechanismInput = failureMechanism; @@ -313,7 +313,7 @@ FmSectionAssemblyDirectResult detailedAssessmentResult, FmSectionAssemblyDirectResult tailorMadeAssessmentResult) { - ThrowExceptions(); + ThrowException(); SimpleAssessmentResultInput = simpleAssessmentResult; DetailedAssessmentResultInput = detailedAssessmentResult; @@ -330,7 +330,7 @@ throw new NotImplementedException(); } - private void ThrowExceptions() + private void ThrowException() { if (ThrowExceptionOnCalculate) { Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs =================================================================== diff -u -r72dba5708cc6d66f7d4ad698c0b72ddd2f540154 -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs (.../AssemblyCategoriesKernelStub.cs) (revision 72dba5708cc6d66f7d4ad698c0b72ddd2f540154) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs (.../AssemblyCategoriesKernelStub.cs) (revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c) @@ -85,7 +85,7 @@ public IEnumerable CalculateAssessmentSectionCategoryLimitsWbi21(AssessmentSection section) { - ThrowExceptions(); + ThrowException(); SignalingNorm = section.FailureProbabilitySignallingLimit; LowerLimitNorm = section.FailureProbabilityLowerLimit; @@ -97,7 +97,7 @@ public IEnumerable CalculateFailureMechanismCategoryLimitsWbi11(AssessmentSection section, FailureMechanism failureMechanism) { - ThrowExceptions(); + ThrowException(); SignalingNorm = section.FailureProbabilitySignallingLimit; LowerLimitNorm = section.FailureProbabilityLowerLimit; @@ -111,7 +111,7 @@ public IEnumerable CalculateFmSectionCategoryLimitsWbi01(AssessmentSection section, FailureMechanism failureMechanism) { - ThrowExceptions(); + ThrowException(); SignalingNorm = section.FailureProbabilitySignallingLimit; LowerLimitNorm = section.FailureProbabilityLowerLimit; @@ -125,7 +125,7 @@ public IEnumerable CalculateFmSectionCategoryLimitsWbi02(AssessmentSection section, FailureMechanism failureMechanism) { - ThrowExceptions(); + ThrowException(); SignalingNorm = section.FailureProbabilitySignallingLimit; LowerLimitNorm = section.FailureProbabilityLowerLimit; @@ -137,7 +137,7 @@ return FailureMechanismSectionCategoriesOutput; } - private void ThrowExceptions() + private void ThrowException() { if (ThrowExceptionOnCalculate) {