Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs =================================================================== diff -u -r5b1a797e4e679b7985b2785492929565b28431ae -r71c405e357fa8845fcb3485a4bcc7aa393fe31a7 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 5b1a797e4e679b7985b2785492929565b28431ae) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 71c405e357fa8845fcb3485a4bcc7aa393fe31a7) @@ -162,12 +162,12 @@ try { mergeHandler.PerformMerge(assessmentSection, assessmentSectionToMerge, failureMechanismToMerge); - log.Info(Resources.AssessmentSectionMerger_PerformMerge_Merging_assessmentSections_successful); + log.Info(Resources.AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_successful); } catch (Exception e) { - log.Error(Resources.AssessmentSectionMerger_PerformMerge_Unexpected_error_occurred_during_merging, e); - log.Info(Resources.AssessmentSectionMerger_PerformMerge_Merging_assessmentSections_failed); + log.Error(Resources.AssessmentSectionMerger_PerformMerge_Unexpected_error_occurred_during_merge, e); + log.Info(Resources.AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_failed); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r8a2af71ee60161267b136e6f85b2f1a81743caa0 -r71c405e357fa8845fcb3485a4bcc7aa393fe31a7 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8a2af71ee60161267b136e6f85b2f1a81743caa0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 71c405e357fa8845fcb3485a4bcc7aa393fe31a7) @@ -160,7 +160,7 @@ } /// - /// Looks up a localized string similar to Samenvoegen van traject {0} met traject {1} is gestart.. + /// Looks up a localized string similar to Samenvoegen van traject '{0}' met traject '{1}' is gestart.. /// public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSection_0_with_AssessmentSection_1_started { get { @@ -172,27 +172,27 @@ /// /// Looks up a localized string similar to Samenvoegen van trajecten is mislukt.. /// - public static string AssessmentSectionMerger_PerformMerge_Merging_assessmentSections_failed { + public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_failed { get { - return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_assessmentSections_failed", resourceCulture); + return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_failed", resourceCulture); } } /// /// Looks up a localized string similar to Samenvoegen van trajecten is gelukt.. /// - public static string AssessmentSectionMerger_PerformMerge_Merging_assessmentSections_successful { + public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_successful { get { - return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_assessmentSections_successful", resourceCulture); + return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_successful", resourceCulture); } } /// /// Looks up a localized string similar to Er is een onverwachte fout opgetreden tijdens het samenvoegen van de trajecten.. /// - public static string AssessmentSectionMerger_PerformMerge_Unexpected_error_occurred_during_merging { + public static string AssessmentSectionMerger_PerformMerge_Unexpected_error_occurred_during_merge { get { - return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Unexpected_error_occurred_during_merging", resourceCulture); + return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Unexpected_error_occurred_during_merge", resourceCulture); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r8a2af71ee60161267b136e6f85b2f1a81743caa0 -r71c405e357fa8845fcb3485a4bcc7aa393fe31a7 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 8a2af71ee60161267b136e6f85b2f1a81743caa0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 71c405e357fa8845fcb3485a4bcc7aa393fe31a7) @@ -191,16 +191,16 @@ Er is geen traject geselecteerd. - + Samenvoegen van trajecten is gelukt. - Samenvoegen van traject {0} met traject {1} is gestart. + Samenvoegen van traject '{0}' met traject '{1}' is gestart. - + Er is een onverwachte fout opgetreden tijdens het samenvoegen van de trajecten. - + Samenvoegen van trajecten is mislukt. Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs =================================================================== diff -u -r5b1a797e4e679b7985b2785492929565b28431ae -r71c405e357fa8845fcb3485a4bcc7aa393fe31a7 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 5b1a797e4e679b7985b2785492929565b28431ae) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 71c405e357fa8845fcb3485a4bcc7aa393fe31a7) @@ -114,7 +114,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("assessmentSectionMergeDataProvider", exception.ParamName); + Assert.AreEqual("mergeDataProvider", exception.ParamName); mocks.VerifyAll(); } @@ -398,7 +398,7 @@ { string[] msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - Assert.AreEqual($"Samenvoegen van traject {assessmentSectionToMerge.Name} met traject {originalAssessmentSection.Name} is gestart.", msgs[0]); + Assert.AreEqual($"Samenvoegen van traject '{assessmentSectionToMerge.Name}' met traject '{originalAssessmentSection.Name}' is gestart.", msgs[0]); Assert.AreEqual("Samenvoegen van trajecten is gelukt.", msgs[1]); }); mocks.VerifyAll(); @@ -444,7 +444,7 @@ { Assert.AreEqual(3, messages.Count()); - Assert.AreEqual($"Samenvoegen van traject {assessmentSectionToMerge.Name} met traject {originalAssessmentSection.Name} is gestart.", messages.ElementAt(0).Item1); + Assert.AreEqual($"Samenvoegen van traject '{assessmentSectionToMerge.Name}' met traject '{originalAssessmentSection.Name}' is gestart.", messages.ElementAt(0).Item1); Tuple expectedLog = messages.ElementAt(1); Assert.AreEqual("Er is een onverwachte fout opgetreden tijdens het samenvoegen van de trajecten.", expectedLog.Item1);