Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs =================================================================== diff -u -re9dd89fe8ee46c8306ba51ae561446f25307cc45 -r6f3632c9d3bc62eec89ebb748ea16abd652e6427 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision e9dd89fe8ee46c8306ba51ae561446f25307cc45) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 6f3632c9d3bc62eec89ebb748ea16abd652e6427) @@ -124,15 +124,15 @@ if (!assessmentSections.Any()) { - LogError(Resources.AssessmentSectionMerger_No_matching_AssessmentSections); + log.Error(Resources.AssessmentSectionMerger_No_matching_AssessmentSections); return; } IEnumerable matchingAssessmentSections = assessmentSections.Where(section => mergeComparer.Compare(assessmentSection, section)); if (!matchingAssessmentSections.Any()) { - LogError(Resources.AssessmentSectionMerger_No_matching_AssessmentSections); + log.Error(Resources.AssessmentSectionMerger_No_matching_AssessmentSections); return; } @@ -149,8 +149,7 @@ private void PerformMerge(AssessmentSection assessmentSection, AssessmentSection assessmentSectionToMerge, IEnumerable failureMechanismToMerge) { - log.InfoFormat(Resources.AssessmentSectionMerger_PerformMerge_Merging_AssessmentSection_0_with_AssessmentSection_1_started, - assessmentSectionToMerge.Name, assessmentSection.Name); + log.Info(Resources.AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_started); try { @@ -168,10 +167,5 @@ { log.Warn(CoreCommonGuiResources.GuiImportHandler_ImportItemsUsingDialog_Importing_cancelled); } - - private static void LogError(string message) - { - log.Error(message); - } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -raa2276eb72eb3bb6e4a69ebe05becdbf28a8356b -r6f3632c9d3bc62eec89ebb748ea16abd652e6427 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision aa2276eb72eb3bb6e4a69ebe05becdbf28a8356b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6f3632c9d3bc62eec89ebb748ea16abd652e6427) @@ -161,26 +161,25 @@ } /// - /// 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 trajectinformatie is mislukt.. /// - public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSection_0_with_AssessmentSection_1_started { + public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_failed { get { - return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_AssessmentSection_0_with_AssessmentS" + - "ection_1_started", resourceCulture); + return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_failed", resourceCulture); } } /// - /// Looks up a localized string similar to Samenvoegen van trajecten is mislukt.. + /// Looks up a localized string similar to Samenvoegen van trajectinformatie is gestart.. /// - public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_failed { + public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_started { get { - return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_failed", resourceCulture); + return ResourceManager.GetString("AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_started", resourceCulture); } } /// - /// Looks up a localized string similar to Samenvoegen van trajecten is gelukt.. + /// Looks up a localized string similar to Samenvoegen van trajectinformatie is gelukt.. /// public static string AssessmentSectionMerger_PerformMerge_Merging_AssessmentSections_successful { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -raa2276eb72eb3bb6e4a69ebe05becdbf28a8356b -r6f3632c9d3bc62eec89ebb748ea16abd652e6427 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision aa2276eb72eb3bb6e4a69ebe05becdbf28a8356b) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 6f3632c9d3bc62eec89ebb748ea16abd652e6427) @@ -189,16 +189,16 @@ Er zijn geen trajecten gevonden die samengevoegd kunnen worden. - Samenvoegen van trajecten is gelukt. + Samenvoegen van trajectinformatie is gelukt. - - Samenvoegen van traject '{0}' met traject '{1}' is gestart. + + Samenvoegen van trajectinformatie is gestart. Er is een onverwachte fout opgetreden tijdens het samenvoegen van de trajecten. - Samenvoegen van trajecten is mislukt. + Samenvoegen van trajectinformatie is mislukt. Alle hydraulische randvoorwaarden berekenen. Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs =================================================================== diff -u -re9dd89fe8ee46c8306ba51ae561446f25307cc45 -r6f3632c9d3bc62eec89ebb748ea16abd652e6427 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision e9dd89fe8ee46c8306ba51ae561446f25307cc45) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 6f3632c9d3bc62eec89ebb748ea16abd652e6427) @@ -331,8 +331,8 @@ // Then TestHelper.AssertLogMessagesWithLevelAreGenerated(call, new[] { - new Tuple($"Samenvoegen van traject '{assessmentSectionToMerge.Name}' met traject '{originalAssessmentSection.Name}' is gestart.", LogLevelConstant.Info), - new Tuple($"Samenvoegen van trajecten is gelukt.", LogLevelConstant.Info) + new Tuple("Samenvoegen van trajectinformatie is gestart.", LogLevelConstant.Info), + new Tuple("Samenvoegen van trajectinformatie is gelukt.", LogLevelConstant.Info) }); mocks.VerifyAll(); } @@ -376,15 +376,15 @@ { 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 trajectinformatie 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); Assert.AreEqual(Level.Error, expectedLog.Item2); Exception loggedException = expectedLog.Item3; Assert.IsInstanceOf(loggedException); - Assert.AreEqual("Samenvoegen van trajecten is mislukt.", messages.ElementAt(2).Item1); + Assert.AreEqual("Samenvoegen van trajectinformatie is mislukt.", messages.ElementAt(2).Item1); }); mocks.VerifyAll(); }