Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/AssessmentSectionMerger.cs =================================================================== diff -u -r4d6a168b5ed07f629193388d22d8fd66c9e97a97 -r3184376fa30df621666dcfb53c411a0bb798650a --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 4d6a168b5ed07f629193388d22d8fd66c9e97a97) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 3184376fa30df621666dcfb53c411a0bb798650a) @@ -151,7 +151,9 @@ return; } + log.Info(Resources.AssessmentSectionMerger_StartMerge_Merging_projects_started); mergeHandler.PerformMerge(assessmentSection, assessmentSectionToMerge, failureMechanismToMerge); + log.Info(Resources.AssessmentSectionMerger_StartMerge_Merging_projects_succeeded); } private string SelectProject() Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r36fb70b04307e0805488e2862cd94b1820f6bb1e -r3184376fa30df621666dcfb53c411a0bb798650a --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 36fb70b04307e0805488e2862cd94b1820f6bb1e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3184376fa30df621666dcfb53c411a0bb798650a) @@ -160,6 +160,24 @@ } /// + /// Looks up a localized string similar to Samenvoegen van projecten is gestart.. + /// + public static string AssessmentSectionMerger_StartMerge_Merging_projects_started { + get { + return ResourceManager.GetString("AssessmentSectionMerger_StartMerge_Merging_projects_started", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Samenvoegen van projecten is gelukt.. + /// + public static string AssessmentSectionMerger_StartMerge_Merging_projects_succeeded { + get { + return ResourceManager.GetString("AssessmentSectionMerger_StartMerge_Merging projects_succeeded", resourceCulture); + } + } + + /// /// Looks up a localized string similar to &Selecteren.... /// public static string BackgroundData_SelectMapData { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r36fb70b04307e0805488e2862cd94b1820f6bb1e -r3184376fa30df621666dcfb53c411a0bb798650a --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 36fb70b04307e0805488e2862cd94b1820f6bb1e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 3184376fa30df621666dcfb53c411a0bb798650a) @@ -191,4 +191,10 @@ Er is geen traject geselecteerd. + + Samenvoegen van projecten is gestart. + + + Samenvoegen van projecten is gelukt. + \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/AssessmentSectionMergerTest.cs =================================================================== diff -u -r4d6a168b5ed07f629193388d22d8fd66c9e97a97 -r3184376fa30df621666dcfb53c411a0bb798650a --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 4d6a168b5ed07f629193388d22d8fd66c9e97a97) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 3184376fa30df621666dcfb53c411a0bb798650a) @@ -356,7 +356,7 @@ } [Test] - public void GivenMatchedAssessmentSection_WhenAllDataValid_ThenMergePerformed() + public void GivenMatchedAssessmentSection_WhenAllDataValid_ThenMergePerformedAndLogged() { // Given var originalAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -393,7 +393,13 @@ Action call = () => merger.StartMerge(originalAssessmentSection); // Then - TestHelper.AssertLogMessagesCount(call, 0); + TestHelper.AssertLogMessages(call, messages => + { + string[] msgs = messages.ToArray(); + Assert.AreEqual(2, msgs.Length); + Assert.AreEqual("Samenvoegen van projecten is gestart.", msgs[0]); + Assert.AreEqual("Samenvoegen van projecten is gelukt.", msgs[1]); + }); mocks.VerifyAll(); } }