Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs =================================================================== diff -u -rd55ef762fda182aedb3d0c86ed17d2405abb55db -r8423460da7fdd3698f774d93a7e3b497c9c2c67d --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs (.../AssemblyErrorMessageCreator.cs) (revision d55ef762fda182aedb3d0c86ed17d2405abb55db) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs (.../AssemblyErrorMessageCreator.cs) (revision 8423460da7fdd3698f774d93a7e3b497c9c2c67d) @@ -81,17 +81,17 @@ switch (assemblyError) { case EAssemblyErrors.SignallingLimitOutOfRange: - return Resources.AssemblyErrorMessageCreator_SignallingLimitOutOfRange; + return Resources.AssemblyErrorMessageCreator_SignalingLimitOutOfRange; case EAssemblyErrors.LowerLimitOutOfRange: return Resources.AssemblyErrorMessageCreator_LowerLimitOutOfRange; case EAssemblyErrors.FailurePropbabilityMarginOutOfRange: - return Resources.AssemblyErrorMessageCreator_FailurePropbabilityMarginOutOfRange; + return Resources.AssemblyErrorMessageCreator_FailureProbabilityMarginOutOfRange; case EAssemblyErrors.LengthEffectFactorOutOfRange: return Resources.AssemblyErrorMessageCreator_LengthEffectFactorOutOfRange; case EAssemblyErrors.SectionLengthOutOfRange: return Resources.AssemblyErrorMessageCreator_SectionLengthOutOfRange; case EAssemblyErrors.SignallingLimitAboveLowerLimit: - return Resources.AssemblyErrorMessageCreator_SignallingLimitAboveLowerLimit; + return Resources.AssemblyErrorMessageCreator_SignalingLimitAboveLowerLimit; case EAssemblyErrors.PsigDsnAbovePsig: return Resources.AssemblyErrorMessageCreator_PsigDsnAbovePsig; case EAssemblyErrors.PlowDsnAbovePlow: @@ -121,7 +121,7 @@ case EAssemblyErrors.FailureMechanismAssemblerInputInvalid: return Resources.AssemblyErrorMessageCreator_NoSectionsImported; case EAssemblyErrors.CommonFailureMechanismSectionsInvalid: - return Resources.AssemblyErrorMessageCreator_NoSectionsImported; + return Resources.AssemblyErrorMessageCreator_CommonFailureMechanismSectionsInvalid; case EAssemblyErrors.CommonFailureMechanismSectionsNotConsecutive: return Resources.AssemblyErrorMessageCreator_CommonFailureMechanismSectionsNotConsecutive; case EAssemblyErrors.RequestedPointOutOfRange: Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs =================================================================== diff -u -r735fc2d41c12cf25e0713537f96cb201a7ad384a -r8423460da7fdd3698f774d93a7e3b497c9c2c67d --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 735fc2d41c12cf25e0713537f96cb201a7ad384a) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8423460da7fdd3698f774d93a7e3b497c9c2c67d) @@ -109,6 +109,15 @@ } /// + /// Looks up a localized string similar to Ieder relevant toetsspoor moet een vakindeling geimporteerd hebben.. + /// + internal static string AssemblyErrorMessageCreator_CommonFailureMechanismSectionsInvalid { + get { + return ResourceManager.GetString("AssemblyErrorMessageCreator_CommonFailureMechanismSectionsInvalid", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Alle (deel)vakken moeten minimaal een lengte hebben van 0.01 [m].. /// internal static string AssemblyErrorMessageCreator_CommonFailureMechanismSectionsNotConsecutive { @@ -136,20 +145,20 @@ } /// - /// Looks up a localized string similar to De gespecificeerde kans moet in het bereik [0,1] liggen.. + /// Looks up a localized string similar to Faalkansruimte moet in het bereik [0,1] liggen.. /// - internal static string AssemblyErrorMessageCreator_FailureProbabilityOutOfRange { + internal static string AssemblyErrorMessageCreator_FailureProbabilityMarginOutOfRange { get { - return ResourceManager.GetString("AssemblyErrorMessageCreator_FailureProbabilityOutOfRange", resourceCulture); + return ResourceManager.GetString("AssemblyErrorMessageCreator_FailureProbabilityMarginOutOfRange", resourceCulture); } } /// - /// Looks up a localized string similar to Faalkansruimte moet in het bereik [0,1] liggen.. + /// Looks up a localized string similar to De gespecificeerde kans moet in het bereik [0,1] liggen.. /// - internal static string AssemblyErrorMessageCreator_FailurePropbabilityMarginOutOfRange { + internal static string AssemblyErrorMessageCreator_FailureProbabilityOutOfRange { get { - return ResourceManager.GetString("AssemblyErrorMessageCreator_FailurePropbabilityMarginOutOfRange", resourceCulture); + return ResourceManager.GetString("AssemblyErrorMessageCreator_FailureProbabilityOutOfRange", resourceCulture); } } @@ -264,18 +273,18 @@ /// /// Looks up a localized string similar to De signaleringskans moet kleiner zijn dan de ondergrens.. /// - internal static string AssemblyErrorMessageCreator_SignallingLimitAboveLowerLimit { + internal static string AssemblyErrorMessageCreator_SignalingLimitAboveLowerLimit { get { - return ResourceManager.GetString("AssemblyErrorMessageCreator_SignallingLimitAboveLowerLimit", resourceCulture); + return ResourceManager.GetString("AssemblyErrorMessageCreator_SignalingLimitAboveLowerLimit", resourceCulture); } } /// /// Looks up a localized string similar to Signaleringskans moet in het bereik [0,1] liggen.. /// - internal static string AssemblyErrorMessageCreator_SignallingLimitOutOfRange { + internal static string AssemblyErrorMessageCreator_SignalingLimitOutOfRange { get { - return ResourceManager.GetString("AssemblyErrorMessageCreator_SignallingLimitOutOfRange", resourceCulture); + return ResourceManager.GetString("AssemblyErrorMessageCreator_SignalingLimitOutOfRange", resourceCulture); } } Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Properties/Resources.resx =================================================================== diff -u -r735fc2d41c12cf25e0713537f96cb201a7ad384a -r8423460da7fdd3698f774d93a7e3b497c9c2c67d --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Properties/Resources.resx (.../Resources.resx) (revision 735fc2d41c12cf25e0713537f96cb201a7ad384a) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Properties/Resources.resx (.../Resources.resx) (revision 8423460da7fdd3698f774d93a7e3b497c9c2c67d) @@ -98,13 +98,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Signaleringskans moet in het bereik [0,1] liggen. Ondergrens moet in het bereik [0,1] liggen. - + Faalkansruimte moet in het bereik [0,1] liggen. @@ -113,7 +113,7 @@ De trajectlengte moet groter zijn dan 0 [m]. - + De signaleringskans moet kleiner zijn dan de ondergrens. @@ -170,4 +170,7 @@ Er is een onverwachte fout opgetreden tijdens het assembleren. + + Ieder relevant toetsspoor moet een vakindeling geimporteerd hebben. + \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs =================================================================== diff -u -rd55ef762fda182aedb3d0c86ed17d2405abb55db -r8423460da7fdd3698f774d93a7e3b497c9c2c67d --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs (.../AssemblyErrorMessageCreatorTest.cs) (revision d55ef762fda182aedb3d0c86ed17d2405abb55db) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs (.../AssemblyErrorMessageCreatorTest.cs) (revision 8423460da7fdd3698f774d93a7e3b497c9c2c67d) @@ -78,7 +78,7 @@ [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.CommonFailureMechanismSectionsInvalid, "Ieder relevant toetsspoor moet een vakindeling geimporteerd hebben.")] [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.")]