From 5dc54a67c7c572393511f796d5be558726ab8174 Mon Sep 17 00:00:00 2001 From: nietras Date: Thu, 23 Jan 2025 16:06:10 +0100 Subject: [PATCH] Tests: Reduce tracing --- .../Internals/InterpolatedStringHandlerRow.cs | 12 +++++++----- src/Sep.Test/SepParserTest.cs | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Sep.Test/Internals/InterpolatedStringHandlerRow.cs b/src/Sep.Test/Internals/InterpolatedStringHandlerRow.cs index e00a3a35..6f270fc2 100644 --- a/src/Sep.Test/Internals/InterpolatedStringHandlerRow.cs +++ b/src/Sep.Test/Internals/InterpolatedStringHandlerRow.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.Contracts; using System.Runtime.CompilerServices; @@ -28,13 +29,14 @@ public void set_Item2(string index, [InterpolatedStringHandlerArgument("")] ref [InterpolatedStringHandler] public ref struct TraceInterpolatedStringHandler { + static readonly Action Log = t => { }; // Storage for the built-up string readonly StringBuilder _builder; public TraceInterpolatedStringHandler(int literalLength, int formattedCount) { _builder = new StringBuilder(literalLength); - Trace.WriteLine($"\tliteral length: {literalLength}, formattedCount: {formattedCount}"); + Log($"\tliteral length: {literalLength}, formattedCount: {formattedCount}"); } public TraceInterpolatedStringHandler(int literalLength, int formattedCount, InterpolatedStringHandlerRow row) @@ -42,15 +44,15 @@ public TraceInterpolatedStringHandler(int literalLength, int formattedCount, Int Contract.Assume(row is not null); row._stringBuilder.Clear(); _builder = row._stringBuilder; - Trace.WriteLine($"\tliteral length: {literalLength}, formattedCount: {formattedCount} REUSE"); + Log($"\tliteral length: {literalLength}, formattedCount: {formattedCount} REUSE"); } public void AppendLiteral(string s) { - Trace.WriteLine($"\tAppendLiteral called: {{{s}}}"); + Log($"\tAppendLiteral called: {{{s}}}"); _builder.Append(s); - Trace.WriteLine($"\tAppended the literal string"); + Log($"\tAppended the literal string"); } public void AppendFormatted(T t) diff --git a/src/Sep.Test/SepParserTest.cs b/src/Sep.Test/SepParserTest.cs index bc4d2693..060fefca 100644 --- a/src/Sep.Test/SepParserTest.cs +++ b/src/Sep.Test/SepParserTest.cs @@ -234,7 +234,7 @@ public void SepParserTest_ParseColEnds_NewLinesOnly(object parserObject) _chars.AsSpan(0, charsEnd).Fill('\n'); _state._currentRowColCount = 0; var parsedRowsLength = _state._parsedRows.Length; - Trace.WriteLine($"{nameof(parsedRowsLength)} {parsedRowsLength} {nameof(charsEnd)} {charsEnd}"); + var rowCount = Math.Min(charsEnd, parsedRowsLength); var charsStart = 0; var lineNumberOffset = 4; @@ -331,7 +331,8 @@ void AssertOutput(ISepParser parser, int charsStart, int charsEnd, ExpectedOutpu Assert.AreEqual(expectedParsingRow.ColCount, s._parsingRowColCount, nameof(s._parsingRowColCount)); } - int TraceParseState(SepReaderState s) + [Conditional("SEPREADERTRACE")] + void TraceParseState(SepReaderState s) { var sb = new StringBuilder(); var indent = " "; @@ -347,7 +348,6 @@ int TraceParseState(SepReaderState s) var colEndsParsing = _colEndsOrColInfos.AsSpan().Slice(colEndsFrom, s._parsingRowColCount + 1); sb.AppendLine($"{indent}}}, new({nameof(ExpectedParsingRow.ColEnds)}: new[]{{ {string.Join(", ", colEndsParsing.ToArray())} }}, {nameof(ExpectedParsingRow.LineNumberTo)}: {s._parsingLineNumber}, {nameof(ExpectedParsingRow.CharsStartIndex)}: {s._parsingRowCharsStartIndex}, {nameof(ExpectedParsingRow.ColEndsStartIndex)}: {s._parsingRowColEndsOrInfosStartIndex}, {nameof(ExpectedParsingRow.ColCount)}: {s._parsingRowColCount}));"); Trace.WriteLine(sb.ToString()); - return colEndsFrom; } static void AreEqual(ReadOnlySpan expected, int[] actual, int actualFrom, int actualTo)