From 29158a0fb38f6054abafdbfdc25f8adb2c973411 Mon Sep 17 00:00:00 2001 From: tombogle Date: Fri, 4 Oct 2024 13:45:31 -0400 Subject: [PATCH] Made IMDIArchivingDlgViewModelTests public. TEMP: Added some console.log statements to try to see what's happening with TC tests --- .../IMDIArchivingDlgViewModelTests.cs | 8 ++++++-- .../RampArchivingDlgViewModelTests.cs | 8 ++++++++ SIL.Archiving/ArchivingDlgViewModel.cs | 18 ++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs b/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs index dc83a73c5..d1e7e036d 100644 --- a/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs +++ b/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Threading; using System.Threading.Tasks; using System.Xml; using NUnit.Framework; @@ -15,7 +14,7 @@ namespace SIL.Archiving.Tests [TestFixture] [OfflineSldr] [Category("Archiving")] - internal class IMDIArchivingDlgViewModelTests + public class IMDIArchivingDlgViewModelTests { private class MessageData { @@ -70,6 +69,7 @@ public void TearDown() [Test] public void NormalizeFilename_FileName_NormalizedFileName() { + Console.WriteLine($"IMDI Tests TEMP: {nameof(NormalizeFilename_FileName_NormalizedFileName)}"); const string fileName = "My# \nFile %\t Name&^%.mp3"; var normalized = _model.NormalizeFilename("", fileName); Assert.AreEqual("My+File+Name_.mp3", normalized); @@ -275,6 +275,8 @@ public class IMDIArchivingDlgViewModelWithOverrideDisplayInitialSummarySetTests [Test] public async Task DisplayInitialSummary_OverrideDisplayInitialSummaryIsSet_DefaultBehaviorOmitted() { + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary_OverrideDisplayInitialSummaryIsSet_DefaultBehaviorOmitted)}"); + ErrorReport.IsOkToInteractWithUser = false; bool filesToArchiveCalled = false; @@ -320,6 +322,8 @@ public class IMDIArchivingDlgViewModelWithFineGrainedOverridesForDisplayInitialS [Test] public async Task DisplayInitialSummary_OverridenPropertiesForDisplayInitialSummaryAreSet_MessagesReflectOverrides() { + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary_OverridenPropertiesForDisplayInitialSummaryAreSet_MessagesReflectOverrides)}"); + ErrorReport.IsOkToInteractWithUser = false; void SetFilesToArchive(ArchivingDlgViewModel model, CancellationToken cancellationToken) diff --git a/SIL.Archiving.Tests/RampArchivingDlgViewModelTests.cs b/SIL.Archiving.Tests/RampArchivingDlgViewModelTests.cs index 82dd45346..44c79ef6d 100644 --- a/SIL.Archiving.Tests/RampArchivingDlgViewModelTests.cs +++ b/SIL.Archiving.Tests/RampArchivingDlgViewModelTests.cs @@ -759,6 +759,7 @@ public async Task DisplayInitialSummary_OverrideDisplayInitialSummaryIsSet_Defau model.OverrideDisplayInitialSummary = (d, c) => { + Console.WriteLine($"RAMP Tests TEMP: {nameof(DisplayInitialSummary_OverrideDisplayInitialSummaryIsSet_DefaultBehaviorOmitted)} overriding initial display"); customSummaryShown++; progress.IncrementProgress(); }; @@ -769,7 +770,9 @@ public async Task DisplayInitialSummary_OverrideDisplayInitialSummaryIsSet_Defau try { + Console.WriteLine($"RAMP Tests TEMP: {nameof(DisplayInitialSummary_OverrideDisplayInitialSummaryIsSet_DefaultBehaviorOmitted)} before SUT"); await model.Initialize(progress, new CancellationToken()).ConfigureAwait(false); + Console.WriteLine($"RAMP Tests TEMP: {nameof(DisplayInitialSummary_OverrideDisplayInitialSummaryIsSet_DefaultBehaviorOmitted)} after SUT"); } catch (Exception ex) { @@ -806,6 +809,7 @@ void SetFilesToArchive(ArchivingDlgViewModel model, CancellationToken cancellati void ReportMessage(string msg, ArchivingDlgViewModel.MessageType type) { + Console.WriteLine($"RAMP Tests TEMP: {nameof(DisplayInitialSummary_OverridenPropertiesForDisplayInitialSummaryAreSet_MessagesReflectOverrides)} reporting {msg}"); messagesDisplayed.Add(new Tuple(msg, type)); } @@ -813,6 +817,8 @@ void ReportMessage(string msg, ArchivingDlgViewModel.MessageType type) IEnumerable> GetMessages(IDictionary, string>> arg) { + Console.WriteLine($"RAMP Tests TEMP: {nameof(DisplayInitialSummary_OverridenPropertiesForDisplayInitialSummaryAreSet_MessagesReflectOverrides)} getting pre-archiving messages"); + yield return new Tuple( "First pre-archiving message", Warning); yield return new Tuple( @@ -826,7 +832,9 @@ void ReportMessage(string msg, ArchivingDlgViewModel.MessageType type) var progress = new TestProgress("RAMP"); try { + Console.WriteLine($"RAMP Tests TEMP: {nameof(DisplayInitialSummary_OverridenPropertiesForDisplayInitialSummaryAreSet_MessagesReflectOverrides)} before SUT"); await model.Initialize(progress, new CancellationToken()).ConfigureAwait(false); + Console.WriteLine($"RAMP Tests TEMP: {nameof(DisplayInitialSummary_OverridenPropertiesForDisplayInitialSummaryAreSet_MessagesReflectOverrides)} after SUT"); } catch (Exception ex) { diff --git a/SIL.Archiving/ArchivingDlgViewModel.cs b/SIL.Archiving/ArchivingDlgViewModel.cs index e8d5eee58..e6a3abcaa 100644 --- a/SIL.Archiving/ArchivingDlgViewModel.cs +++ b/SIL.Archiving/ArchivingDlgViewModel.cs @@ -332,15 +332,21 @@ public virtual void AddFileGroup(string groupId, IEnumerable files, /// ------------------------------------------------------------------------------------ private void DisplayInitialSummary(CancellationToken cancellationToken) { + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary)} start"); + if (OverrideDisplayInitialSummary != null) { OverrideDisplayInitialSummary(FileLists, cancellationToken); return; } + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary)} after override"); + foreach (var message in AdditionalMessages) DisplayMessage(message.Key + "\n", message.Value); + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary)} after additional"); + if (GetOverriddenPreArchivingMessages != null) { bool firstMsg = true; @@ -354,10 +360,16 @@ private void DisplayInitialSummary(CancellationToken cancellationToken) else DisplayMessage(msg.Item1, msg.Item2); } + + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary)} after overridden Pre-Archiving messages"); } else - ReportProgress(Progress.GetMessage(StringId.PreArchivingStatus), MessageType.Normal, - cancellationToken); + { + ReportProgress(Progress.GetMessage(StringId.PreArchivingStatus), + MessageType.Normal, cancellationToken); + + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary)} after normal Pre-Archiving message"); + } foreach (var kvp in FileLists) { @@ -371,6 +383,8 @@ private void DisplayInitialSummary(CancellationToken cancellationToken) foreach (var file in kvp.Value.Item1) DisplayMessage(Path.GetFileName(file), MessageType.Bullet); } + + Console.WriteLine($"IMDI Tests TEMP: {nameof(DisplayInitialSummary)} end"); } protected virtual string FileGroupDisplayMessage(string groupKey)