From bc149b473138135046a75e4489037d0e5008a8bf Mon Sep 17 00:00:00 2001 From: EnesKartal Date: Fri, 20 Nov 2026 11:51:08 +0300 Subject: [PATCH 1/2] Preserve bracket fields and message when SquareBracketColumnizer applies a time offset --- .../Columnizer/SquareBracketColumnizer.cs | 3 +- .../SquareBracketColumnizerTest.cs | 50 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/LogExpert.Core/Classes/Columnizer/SquareBracketColumnizer.cs b/src/LogExpert.Core/Classes/Columnizer/SquareBracketColumnizer.cs index 05b658ac..9794f781 100644 --- a/src/LogExpert.Core/Classes/Columnizer/SquareBracketColumnizer.cs +++ b/src/LogExpert.Core/Classes/Columnizer/SquareBracketColumnizer.cs @@ -265,8 +265,9 @@ public IColumnizedLogLineMemory SplitLine (ILogLineMemoryColumnizerCallback call var dateTime = DateTime.ParseExact(temp[..endPos].ToString(), formatInfo.DateTimeFormat, formatInfo.CultureInfo); dateTime = dateTime.Add(new TimeSpan(0, 0, 0, 0, _timeOffset)); var newDate = dateTime.ToString(formatInfo.DateTimeFormat, formatInfo.CultureInfo); + var shiftedLine = string.Concat(newDate, temp.Span[endPos..]); - columns = SquareSplit(newDate.AsMemory(), dateLen, timeLen, endPos, clogLine); + columns = SquareSplit(shiftedLine.AsMemory(), dateLen, timeLen, newDate.Length, clogLine); } else { diff --git a/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs b/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs index d1112a93..2ad9f5d4 100644 --- a/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs +++ b/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs @@ -107,4 +107,54 @@ public void SplitLine_NestedBrackets_KeepsInnerBracketsInOneColumn () Assert.That(columns.ColumnValues[^1].FullValue.ToString().Trim(), Is.EqualTo("About to run.")); }); } + + [Test] + public void SplitLine_TimeOffset_PreservesBracketFieldsAndMessage () + { + var line = new LogLine("2022-03-21 11:34:34.505[INFO][Worker]Message", 0); + SquareBracketColumnizer columnizer = new(); + _ = columnizer.GetPriority("square.log", [line]); + + columnizer.SetTimeOffset(0); + var zeroColumns = columnizer.SplitLine(null, line).ColumnValues; + + columnizer.SetTimeOffset(123); + var positiveColumns = columnizer.SplitLine(null, line).ColumnValues; + + columnizer.SetTimeOffset(-506); + var negativeColumns = columnizer.SplitLine(null, line).ColumnValues; + + columnizer.SetTimeOffset(0); + var resetColumns = columnizer.SplitLine(null, line).ColumnValues; + + Assert.Multiple(() => + { + Assert.That(zeroColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:34.505", "[INFO]", "[Worker]", "Message" })); + Assert.That(positiveColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:34.628", "[INFO]", "[Worker]", "Message" })); + Assert.That(negativeColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:33.999", "[INFO]", "[Worker]", "Message" })); + Assert.That(resetColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:34.505", "[INFO]", "[Worker]", "Message" })); + Assert.That(line.FullLine.ToString(), Is.EqualTo("2022-03-21 11:34:34.505[INFO][Worker]Message")); + }); + } + + [Test] + public void SplitLine_TimeOffsetCrossesMidnight_ShiftsDateAndPreservesRemainingColumns () + { + var forwardLine = new LogLine("2022-03-21 23:59:59.900[INFO][Worker]Message", 0); + var backwardLine = new LogLine("2022-03-22 00:00:00.100[INFO][Worker]Message", 0); + SquareBracketColumnizer columnizer = new(); + _ = columnizer.GetPriority("square.log", [forwardLine, backwardLine]); + + columnizer.SetTimeOffset(200); + var forwardColumns = columnizer.SplitLine(null, forwardLine).ColumnValues; + + columnizer.SetTimeOffset(-200); + var backwardColumns = columnizer.SplitLine(null, backwardLine).ColumnValues; + + Assert.Multiple(() => + { + Assert.That(forwardColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-22", "00:00:00.100", "[INFO]", "[Worker]", "Message" })); + Assert.That(backwardColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "23:59:59.900", "[INFO]", "[Worker]", "Message" })); + }); + } } \ No newline at end of file From d54141693d36248f471a83c5b5655d522bcf2026 Mon Sep 17 00:00:00 2001 From: EnesKartal Date: Fri, 20 Nov 2026 18:27:37 +0300 Subject: [PATCH 2/2] Add nested-bracket time offset test and #713 comments --- .../SquareBracketColumnizerTest.cs | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs b/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs index 2ad9f5d4..23bb20b4 100644 --- a/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs +++ b/src/LogExpert.Tests/ColumnizerTests/SquareBracketColumnizerTest.cs @@ -108,6 +108,10 @@ public void SplitLine_NestedBrackets_KeepsInnerBracketsInOneColumn () }); } + private static IEnumerable GetColumnTexts (IColumnizedLogLineMemory result) => + result.ColumnValues.Select(c => c.FullValue.ToString()); + + // Issue #713: applying a time offset must shift only the timestamp and preserve bracket fields and message. [Test] public void SplitLine_TimeOffset_PreservesBracketFieldsAndMessage () { @@ -116,27 +120,28 @@ public void SplitLine_TimeOffset_PreservesBracketFieldsAndMessage () _ = columnizer.GetPriority("square.log", [line]); columnizer.SetTimeOffset(0); - var zeroColumns = columnizer.SplitLine(null, line).ColumnValues; + var zeroColumns = columnizer.SplitLine(null, line); columnizer.SetTimeOffset(123); - var positiveColumns = columnizer.SplitLine(null, line).ColumnValues; + var positiveColumns = columnizer.SplitLine(null, line); columnizer.SetTimeOffset(-506); - var negativeColumns = columnizer.SplitLine(null, line).ColumnValues; + var negativeColumns = columnizer.SplitLine(null, line); columnizer.SetTimeOffset(0); - var resetColumns = columnizer.SplitLine(null, line).ColumnValues; + var resetColumns = columnizer.SplitLine(null, line); Assert.Multiple(() => { - Assert.That(zeroColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:34.505", "[INFO]", "[Worker]", "Message" })); - Assert.That(positiveColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:34.628", "[INFO]", "[Worker]", "Message" })); - Assert.That(negativeColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:33.999", "[INFO]", "[Worker]", "Message" })); - Assert.That(resetColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "11:34:34.505", "[INFO]", "[Worker]", "Message" })); + Assert.That(GetColumnTexts(zeroColumns), Is.EqualTo(new[] { "2022-03-21", "11:34:34.505", "[INFO]", "[Worker]", "Message" })); + Assert.That(GetColumnTexts(positiveColumns), Is.EqualTo(new[] { "2022-03-21", "11:34:34.628", "[INFO]", "[Worker]", "Message" })); + Assert.That(GetColumnTexts(negativeColumns), Is.EqualTo(new[] { "2022-03-21", "11:34:33.999", "[INFO]", "[Worker]", "Message" })); + Assert.That(GetColumnTexts(resetColumns), Is.EqualTo(new[] { "2022-03-21", "11:34:34.505", "[INFO]", "[Worker]", "Message" })); Assert.That(line.FullLine.ToString(), Is.EqualTo("2022-03-21 11:34:34.505[INFO][Worker]Message")); }); } + // Issue #713: midnight rollover under positive and negative time offsets must shift the date and preserve remaining columns. [Test] public void SplitLine_TimeOffsetCrossesMidnight_ShiftsDateAndPreservesRemainingColumns () { @@ -146,15 +151,29 @@ public void SplitLine_TimeOffsetCrossesMidnight_ShiftsDateAndPreservesRemainingC _ = columnizer.GetPriority("square.log", [forwardLine, backwardLine]); columnizer.SetTimeOffset(200); - var forwardColumns = columnizer.SplitLine(null, forwardLine).ColumnValues; + var forwardColumns = columnizer.SplitLine(null, forwardLine); columnizer.SetTimeOffset(-200); - var backwardColumns = columnizer.SplitLine(null, backwardLine).ColumnValues; + var backwardColumns = columnizer.SplitLine(null, backwardLine); Assert.Multiple(() => { - Assert.That(forwardColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-22", "00:00:00.100", "[INFO]", "[Worker]", "Message" })); - Assert.That(backwardColumns.Select(c => c.FullValue.ToString()), Is.EqualTo(new[] { "2022-03-21", "23:59:59.900", "[INFO]", "[Worker]", "Message" })); + Assert.That(GetColumnTexts(forwardColumns), Is.EqualTo(new[] { "2022-03-22", "00:00:00.100", "[INFO]", "[Worker]", "Message" })); + Assert.That(GetColumnTexts(backwardColumns), Is.EqualTo(new[] { "2022-03-21", "23:59:59.900", "[INFO]", "[Worker]", "Message" })); }); } + + // Issue #713: nested brackets (Issue #460) must remain a single column when a nonzero time offset is applied. + [Test] + public void SplitLine_TimeOffsetWithNestedBrackets_KeepsInnerBracketsInOneColumn () + { + var line = new LogLine("2022-03-21 11:34:34.505[INFO][ProgramName/MethodName[41]]Message", 0); + SquareBracketColumnizer columnizer = new(); + _ = columnizer.GetPriority("square.log", [line]); + + columnizer.SetTimeOffset(123); + var columns = columnizer.SplitLine(null, line); + + Assert.That(GetColumnTexts(columns), Is.EqualTo(new[] { "2022-03-21", "11:34:34.628", "[INFO]", "[ProgramName/MethodName[41]]", "Message" })); + } } \ No newline at end of file