Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c2ac8af

Browse files
JunTaoLuoJunTaoLuo
committedDec 3, 2015
Renaming LogLevel.Verbose to Trace #299 
1 parent 1308245 commit c2ac8af

File tree

12 files changed

+147
-100
lines changed

12 files changed

+147
-100
lines changed
 

‎samples/SampleApp/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public Program()
4343
// IncludeScopes = true,
4444
// Switches =
4545
// {
46-
// ["Default"] = LogLevel.Verbose,
46+
// ["Default"] = LogLevel.Debug,
4747
// ["Microsoft"] = LogLevel.Information,
4848
// }
4949
//};

‎samples/SampleApp/logging.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"IncludeScopes" : "false",
33
"LogLevel": {
4-
"Default": "Verbose",
4+
"Default": "Debug",
55
"System": "Information",
66
"Microsoft": "Information"
77
}

‎src/Microsoft.Extensions.Logging.Abstractions/LogLevel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ public enum LogLevel
1212
/// Logs that contain the most detailed messages. These messages may contain sensitive application data.
1313
/// These messages are disabled by default and should never be enabled in a production environment.
1414
/// </summary>
15-
Debug = 1,
15+
Trace = 1,
1616

1717
/// <summary>
1818
/// Logs that are used for interactive investigation during development. These logs should primarily contain
1919
/// information useful for debugging and have no long-term value.
2020
/// </summary>
21-
Verbose = 2,
21+
Debug = 2,
2222

2323
/// <summary>
2424
/// Logs that track the general flow of the application. These logs should have long-term value.

‎src/Microsoft.Extensions.Logging.Abstractions/LoggerExtensions.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -121,80 +121,80 @@ public static void LogDebug(
121121
logger.LogWithEvent(LogLevel.Debug, eventId, state, error);
122122
}
123123

124-
//------------------------------------------VERBOSE------------------------------------------//
124+
//------------------------------------------TRACE------------------------------------------//
125125

126126
/// <summary>
127-
/// Writes a verbose log message.
127+
/// Writes a trace log message.
128128
/// </summary>
129129
/// <param name="logger">The <see cref="ILogger"/> to write to.</param>
130130
/// <param name="data">The message to log.</param>
131131
// FYI, this field is called data because naming it message triggers CA1303 and CA2204 for callers.
132-
public static void LogVerbose(this ILogger logger, string data)
132+
public static void LogTrace(this ILogger logger, string data)
133133
{
134134
if (logger == null)
135135
{
136136
throw new ArgumentNullException(nameof(logger));
137137
}
138138

139-
logger.Log(LogLevel.Verbose, 0, data, null, _messageFormatter);
139+
logger.Log(LogLevel.Trace, 0, data, null, _messageFormatter);
140140
}
141141

142142
/// <summary>
143-
/// Writes a verbose log message.
143+
/// Writes a trace log message.
144144
/// </summary>
145145
/// <param name="logger">The <see cref="ILogger"/> to write to.</param>
146146
/// <param name="eventId">The event id associated with the log.</param>
147147
/// <param name="data">The message to log.</param>
148-
public static void LogVerbose(this ILogger logger, int eventId, string data)
148+
public static void LogTrace(this ILogger logger, int eventId, string data)
149149
{
150150
if (logger == null)
151151
{
152152
throw new ArgumentNullException(nameof(logger));
153153
}
154154

155-
logger.Log(LogLevel.Verbose, eventId, data, null, _messageFormatter);
155+
logger.Log(LogLevel.Trace, eventId, data, null, _messageFormatter);
156156
}
157157

158158
/// <summary>
159-
/// Formats and writes a verbose log message.
159+
/// Formats and writes a trace log message.
160160
/// </summary>
161161
/// <param name="logger">The <see cref="ILogger"/> to write to.</param>
162162
/// <param name="format">Format string of the log message.</param>
163163
/// <param name="args">An object array that contains zero or more objects to format.</param>
164-
public static void LogVerbose(this ILogger logger, string format, params object[] args)
164+
public static void LogTrace(this ILogger logger, string format, params object[] args)
165165
{
166166
if (logger == null)
167167
{
168168
throw new ArgumentNullException(nameof(logger));
169169
}
170170

171-
logger.Log(LogLevel.Verbose, 0, new FormattedLogValues(format, args), null, _messageFormatter);
171+
logger.Log(LogLevel.Trace, 0, new FormattedLogValues(format, args), null, _messageFormatter);
172172
}
173173

174174
/// <summary>
175-
/// Formats and writes a verbose log message.
175+
/// Formats and writes a trace log message.
176176
/// </summary>
177177
/// <param name="logger">The <see cref="ILogger"/> to write to.</param>
178178
/// <param name="eventId">The event id associated with the log.</param>
179179
/// <param name="format">Format string of the log message.</param>
180180
/// <param name="args">An object array that contains zero or more objects to format.</param>
181-
public static void LogVerbose(this ILogger logger, int eventId, string format, params object[] args)
181+
public static void LogTrace(this ILogger logger, int eventId, string format, params object[] args)
182182
{
183183
if (logger == null)
184184
{
185185
throw new ArgumentNullException(nameof(logger));
186186
}
187187

188-
logger.Log(LogLevel.Verbose, eventId, new FormattedLogValues(format, args), null, _messageFormatter);
188+
logger.Log(LogLevel.Trace, eventId, new FormattedLogValues(format, args), null, _messageFormatter);
189189
}
190190

191191
/// <summary>
192-
/// Formats the given <see cref="ILogValues"/> and writes a verbose log message.
192+
/// Formats the given <see cref="ILogValues"/> and writes a trace log message.
193193
/// </summary>
194194
/// <param name="logger">The <see cref="ILogger"/> to write to.</param>
195195
/// <param name="state">The <see cref="ILogValues"/> to write.</param>
196196
/// <param name="error">The exception to log.</param>
197-
public static void LogVerbose(
197+
public static void LogTrace(
198198
this ILogger logger,
199199
ILogValues state,
200200
Exception error = null)
@@ -204,17 +204,17 @@ public static void LogVerbose(
204204
throw new ArgumentNullException(nameof(logger));
205205
}
206206

207-
logger.Log(LogLevel.Verbose, state, error);
207+
logger.Log(LogLevel.Trace, state, error);
208208
}
209209

210210
/// <summary>
211-
/// Formats the given <see cref="ILogValues"/> and writes a verbose log message.
211+
/// Formats the given <see cref="ILogValues"/> and writes a trace log message.
212212
/// </summary>
213213
/// <param name="logger">The <see cref="ILogger"/> to write to.</param>
214214
/// <param name="eventId">The event id associated with the log.</param>
215215
/// <param name="state">The <see cref="ILogValues"/> to write.</param>
216216
/// <param name="error">The exception to log.</param>
217-
public static void LogVerbose(
217+
public static void LogTrace(
218218
this ILogger logger,
219219
int eventId,
220220
ILogValues state,
@@ -225,7 +225,7 @@ public static void LogVerbose(
225225
throw new ArgumentNullException(nameof(logger));
226226
}
227227

228-
logger.LogWithEvent(LogLevel.Verbose, eventId, state, error);
228+
logger.LogWithEvent(LogLevel.Trace, eventId, state, error);
229229
}
230230

231231
//------------------------------------------INFORMATION------------------------------------------//

‎src/Microsoft.Extensions.Logging.Console/ConsoleLogger.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ private static string GetLogLevelString(LogLevel logLevel)
254254
{
255255
switch (logLevel)
256256
{
257+
case LogLevel.Trace:
258+
return "trce";
257259
case LogLevel.Debug:
258260
return "dbug";
259-
case LogLevel.Verbose:
260-
return "verb";
261261
case LogLevel.Information:
262262
return "info";
263263
case LogLevel.Warning:
@@ -285,7 +285,7 @@ private ConsoleColors GetLogLevelConsoleColors(LogLevel logLevel)
285285
case LogLevel.Information:
286286
return new ConsoleColors(ConsoleColor.DarkGreen, DefaultConsoleColor);
287287
case LogLevel.Debug:
288-
case LogLevel.Verbose:
288+
case LogLevel.Trace:
289289
default:
290290
return new ConsoleColors(ConsoleColor.Gray, DefaultConsoleColor);
291291
}

‎src/Microsoft.Extensions.Logging.EventLog/EventLogLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private EventLogEntryType GetEventLogEntryType(LogLevel level)
106106
{
107107
case LogLevel.Information:
108108
case LogLevel.Debug:
109-
case LogLevel.Verbose:
109+
case LogLevel.Trace:
110110
return EventLogEntryType.Information;
111111
case LogLevel.Warning:
112112
return EventLogEntryType.Warning;

‎src/Microsoft.Extensions.Logging.NLog/NLogLoggerProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public bool IsEnabled(LogLevel logLevel)
7575
{
7676
switch (logLevel)
7777
{
78-
case LogLevel.Verbose: return global::NLog.LogLevel.Trace;
78+
case LogLevel.Trace: return global::NLog.LogLevel.Trace;
7979
case LogLevel.Debug: return global::NLog.LogLevel.Debug;
8080
case LogLevel.Information: return global::NLog.LogLevel.Info;
8181
case LogLevel.Warning: return global::NLog.LogLevel.Warn;

‎src/Microsoft.Extensions.Logging.TraceSource/TraceSourceLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private static TraceEventType GetEventType(LogLevel logLevel)
5858
case LogLevel.Error: return TraceEventType.Error;
5959
case LogLevel.Warning: return TraceEventType.Warning;
6060
case LogLevel.Information: return TraceEventType.Information;
61-
case LogLevel.Verbose:
61+
case LogLevel.Trace:
6262
default: return TraceEventType.Verbose;
6363
}
6464
}

‎test/Microsoft.Extensions.Logging.Test/ConsoleLoggerTest.cs

Lines changed: 62 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public void InformationFilter_LogsWhenAppropriate()
228228
var sink = t.Item2;
229229

230230
// Act
231-
logger.Log(LogLevel.Verbose, 0, _state, null, null);
231+
logger.Log(LogLevel.Debug, 0, _state, null, null);
232232

233233
// Assert
234234
Assert.Equal(0, sink.Writes.Count);
@@ -241,10 +241,31 @@ public void InformationFilter_LogsWhenAppropriate()
241241
}
242242

243243
[Fact]
244-
public void VerboseFilter_LogsWhenAppropriate()
244+
public void DebugFilter_LogsWhenAppropriate()
245245
{
246246
// Arrange
247-
var t = SetUp((category, logLevel) => logLevel >= LogLevel.Verbose);
247+
var t = SetUp((category, logLevel) => logLevel >= LogLevel.Debug);
248+
var logger = t.Item1;
249+
var sink = t.Item2;
250+
251+
// Act
252+
logger.Log(LogLevel.Trace, 0, _state, null, null);
253+
254+
// Assert
255+
Assert.Equal(0, sink.Writes.Count);
256+
257+
// Act
258+
logger.Log(LogLevel.Debug, 0, _state, null, null);
259+
260+
// Assert
261+
Assert.Equal(3, sink.Writes.Count);
262+
}
263+
264+
[Fact]
265+
public void TraceFilter_LogsWhenAppropriate()
266+
{
267+
// Arrange
268+
var t = SetUp((category, logLevel) => logLevel >= LogLevel.Trace);
248269
var logger = t.Item1;
249270
var sink = t.Item2;
250271

@@ -253,10 +274,11 @@ public void VerboseFilter_LogsWhenAppropriate()
253274
logger.Log(LogLevel.Error, 0, _state, null, null);
254275
logger.Log(LogLevel.Warning, 0, _state, null, null);
255276
logger.Log(LogLevel.Information, 0, _state, null, null);
256-
logger.Log(LogLevel.Verbose, 0, _state, null, null);
277+
logger.Log(LogLevel.Debug, 0, _state, null, null);
278+
logger.Log(LogLevel.Trace, 0, _state, null, null);
257279

258280
// Assert
259-
Assert.Equal(15, sink.Writes.Count);
281+
Assert.Equal(18, sink.Writes.Count);
260282
}
261283

262284
[Fact]
@@ -356,15 +378,39 @@ public void WriteInformation_LogsCorrectColors()
356378
}
357379

358380
[Fact]
359-
public void WriteVerbose_LogsCorrectColors()
381+
public void WriteDebug_LogsCorrectColors()
382+
{
383+
// Arrange
384+
var t = SetUp(null);
385+
var logger = t.Item1;
386+
var sink = t.Item2;
387+
388+
// Act
389+
logger.Log(LogLevel.Debug, 0, _state, null, null);
390+
391+
// Assert
392+
Assert.Equal(3, sink.Writes.Count);
393+
var write = sink.Writes[0];
394+
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
395+
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
396+
write = sink.Writes[1];
397+
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
398+
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
399+
write = sink.Writes[2];
400+
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
401+
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
402+
}
403+
404+
[Fact]
405+
public void WriteTrace_LogsCorrectColors()
360406
{
361407
// Arrange
362408
var t = SetUp(null);
363409
var logger = t.Item1;
364410
var sink = t.Item2;
365411

366412
// Act
367-
logger.Log(LogLevel.Verbose, 0, _state, null, null);
413+
logger.Log(LogLevel.Trace, 0, _state, null, null);
368414

369415
// Assert
370416
Assert.Equal(3, sink.Writes.Count);
@@ -394,17 +440,17 @@ public void WriteCore_LogsCorrectMessages()
394440
logger.Log(LogLevel.Error, 0, _state, ex, _theMessageAndError);
395441
logger.Log(LogLevel.Warning, 0, _state, ex, _theMessageAndError);
396442
logger.Log(LogLevel.Information, 0, _state, ex, _theMessageAndError);
397-
logger.Log(LogLevel.Verbose, 0, _state, ex, _theMessageAndError);
398443
logger.Log(LogLevel.Debug, 0, _state, ex, _theMessageAndError);
444+
logger.Log(LogLevel.Trace, 0, _state, ex, _theMessageAndError);
399445

400446
// Assert
401447
Assert.Equal(18, sink.Writes.Count);
402448
Assert.Equal(GetMessage("crit", 0, ex), GetMessage(sink.Writes.GetRange(0, 3)));
403449
Assert.Equal(GetMessage("fail", 0, ex), GetMessage(sink.Writes.GetRange(3, 3)));
404450
Assert.Equal(GetMessage("warn", 0, ex), GetMessage(sink.Writes.GetRange(6, 3)));
405451
Assert.Equal(GetMessage("info", 0, ex), GetMessage(sink.Writes.GetRange(9, 3)));
406-
Assert.Equal(GetMessage("verb", 0, ex), GetMessage(sink.Writes.GetRange(12, 3)));
407-
Assert.Equal(GetMessage("dbug", 0, ex), GetMessage(sink.Writes.GetRange(15, 3)));
452+
Assert.Equal(GetMessage("dbug", 0, ex), GetMessage(sink.Writes.GetRange(12, 3)));
453+
Assert.Equal(GetMessage("trce", 0, ex), GetMessage(sink.Writes.GetRange(15, 3)));
408454
}
409455

410456
[Fact]
@@ -613,9 +659,9 @@ public void ConsoleLogger_ReloadSettings_CanChangeLogLevel()
613659
loggerFactory.AddConsole(settings);
614660

615661
var logger = loggerFactory.CreateLogger("Test");
616-
Assert.False(logger.IsEnabled(LogLevel.Verbose));
662+
Assert.False(logger.IsEnabled(LogLevel.Trace));
617663

618-
settings.Switches["Test"] = LogLevel.Verbose;
664+
settings.Switches["Test"] = LogLevel.Trace;
619665

620666
var cancellationTokenSource = settings.Cancel;
621667
settings.Cancel = new CancellationTokenSource();
@@ -624,7 +670,7 @@ public void ConsoleLogger_ReloadSettings_CanChangeLogLevel()
624670
cancellationTokenSource.Cancel();
625671

626672
// Assert
627-
Assert.True(logger.IsEnabled(LogLevel.Verbose));
673+
Assert.True(logger.IsEnabled(LogLevel.Trace));
628674
}
629675

630676
[Fact]
@@ -644,19 +690,19 @@ public void ConsoleLogger_ReloadSettings_CanReloadMultipleTimes()
644690
loggerFactory.AddConsole(settings);
645691

646692
var logger = loggerFactory.CreateLogger("Test");
647-
Assert.False(logger.IsEnabled(LogLevel.Verbose));
693+
Assert.False(logger.IsEnabled(LogLevel.Trace));
648694

649695
// Act & Assert
650696
for (var i = 0; i < 10; i++)
651697
{
652-
settings.Switches["Test"] = i % 2 == 0 ? LogLevel.Information : LogLevel.Verbose;
698+
settings.Switches["Test"] = i % 2 == 0 ? LogLevel.Information : LogLevel.Trace;
653699

654700
var cancellationTokenSource = settings.Cancel;
655701
settings.Cancel = new CancellationTokenSource();
656702

657703
cancellationTokenSource.Cancel();
658704

659-
Assert.Equal(i % 2 == 1, logger.IsEnabled(LogLevel.Verbose));
705+
Assert.Equal(i % 2 == 1, logger.IsEnabled(LogLevel.Trace));
660706
}
661707
}
662708

‎test/Microsoft.Extensions.Logging.Test/LoggerExtensionsTest.cs

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void MessageOnly_LogsCorrectValues()
3030
var logger = SetUp(sink);
3131

3232
// Act
33-
logger.LogVerbose(_state);
33+
logger.LogTrace(_state);
3434
logger.LogInformation(_state);
3535
logger.LogWarning(_state);
3636
logger.LogError(_state);
@@ -40,11 +40,11 @@ public void MessageOnly_LogsCorrectValues()
4040
// Assert
4141
Assert.Equal(6, sink.Writes.Count);
4242

43-
var verbose = sink.Writes[0];
44-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
45-
Assert.Equal(_state, verbose.State);
46-
Assert.Equal(0, verbose.EventId);
47-
Assert.Equal(null, verbose.Exception);
43+
var trace = sink.Writes[0];
44+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
45+
Assert.Equal(_state, trace.State);
46+
Assert.Equal(0, trace.EventId);
47+
Assert.Equal(null, trace.Exception);
4848

4949
var information = sink.Writes[1];
5050
Assert.Equal(LogLevel.Information, information.LogLevel);
@@ -85,7 +85,7 @@ public void FormatMessage_LogsCorrectValues()
8585
var logger = SetUp(sink);
8686

8787
// Act
88-
logger.LogVerbose(_format, "test1", "test2");
88+
logger.LogTrace(_format, "test1", "test2");
8989
logger.LogInformation(_format, "test1", "test2");
9090
logger.LogWarning(_format, "test1", "test2");
9191
logger.LogError(_format, "test1", "test2");
@@ -95,11 +95,11 @@ public void FormatMessage_LogsCorrectValues()
9595
// Assert
9696
Assert.Equal(6, sink.Writes.Count);
9797

98-
var verbose = sink.Writes[0];
99-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
100-
Assert.Equal(string.Format(_format, "test1", "test2"), verbose.State?.ToString());
101-
Assert.Equal(0, verbose.EventId);
102-
Assert.Equal(null, verbose.Exception);
98+
var trace = sink.Writes[0];
99+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
100+
Assert.Equal(string.Format(_format, "test1", "test2"), trace.State?.ToString());
101+
Assert.Equal(0, trace.EventId);
102+
Assert.Equal(null, trace.Exception);
103103

104104
var information = sink.Writes[1];
105105
Assert.Equal(LogLevel.Information, information.LogLevel);
@@ -140,7 +140,7 @@ public void MessageAndEventId_LogsCorrectValues()
140140
var logger = SetUp(sink);
141141

142142
// Act
143-
logger.LogVerbose(1, _state);
143+
logger.LogTrace(1, _state);
144144
logger.LogInformation(2, _state);
145145
logger.LogWarning(3, _state);
146146
logger.LogError(4, _state);
@@ -150,11 +150,11 @@ public void MessageAndEventId_LogsCorrectValues()
150150
// Assert
151151
Assert.Equal(6, sink.Writes.Count);
152152

153-
var verbose = sink.Writes[0];
154-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
155-
Assert.Equal(_state, verbose.State);
156-
Assert.Equal(1, verbose.EventId);
157-
Assert.Equal(null, verbose.Exception);
153+
var trace = sink.Writes[0];
154+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
155+
Assert.Equal(_state, trace.State);
156+
Assert.Equal(1, trace.EventId);
157+
Assert.Equal(null, trace.Exception);
158158

159159
var information = sink.Writes[1];
160160
Assert.Equal(LogLevel.Information, information.LogLevel);
@@ -195,7 +195,7 @@ public void FormatMessageAndEventId_LogsCorrectValues()
195195
var logger = SetUp(sink);
196196

197197
// Act
198-
logger.LogVerbose(1, _format, "test1", "test2");
198+
logger.LogTrace(1, _format, "test1", "test2");
199199
logger.LogInformation(2, _format, "test1", "test2");
200200
logger.LogWarning(3, _format, "test1", "test2");
201201
logger.LogError(4, _format, "test1", "test2");
@@ -205,11 +205,11 @@ public void FormatMessageAndEventId_LogsCorrectValues()
205205
// Assert
206206
Assert.Equal(6, sink.Writes.Count);
207207

208-
var verbose = sink.Writes[0];
209-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
210-
Assert.Equal(string.Format(_format, "test1", "test2"), verbose.State?.ToString());
211-
Assert.Equal(1, verbose.EventId);
212-
Assert.Equal(null, verbose.Exception);
208+
var trace = sink.Writes[0];
209+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
210+
Assert.Equal(string.Format(_format, "test1", "test2"), trace.State?.ToString());
211+
Assert.Equal(1, trace.EventId);
212+
Assert.Equal(null, trace.Exception);
213213

214214
var information = sink.Writes[1];
215215
Assert.Equal(LogLevel.Information, information.LogLevel);
@@ -322,7 +322,7 @@ public void LogValues_LogsCorrectValues()
322322
};
323323

324324
// Act
325-
logger.LogVerbose(testLogValues);
325+
logger.LogTrace(testLogValues);
326326
logger.LogInformation(testLogValues);
327327
logger.LogWarning(testLogValues);
328328
logger.LogError(testLogValues);
@@ -332,12 +332,12 @@ public void LogValues_LogsCorrectValues()
332332
// Assert
333333
Assert.Equal(6, sink.Writes.Count);
334334

335-
var verbose = sink.Writes[0];
336-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
337-
Assert.Same(testLogValues, verbose.State);
338-
Assert.Equal(0, verbose.EventId);
339-
Assert.Equal(null, verbose.Exception);
340-
Assert.Equal("Test 1", verbose.Formatter(verbose.State, verbose.Exception));
335+
var trace = sink.Writes[0];
336+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
337+
Assert.Same(testLogValues, trace.State);
338+
Assert.Equal(0, trace.EventId);
339+
Assert.Equal(null, trace.Exception);
340+
Assert.Equal("Test 1", trace.Formatter(trace.State, trace.Exception));
341341

342342
var information = sink.Writes[1];
343343
Assert.Equal(LogLevel.Information, information.LogLevel);
@@ -387,7 +387,7 @@ public void LogValuesAndEventId_LogsCorrectValues()
387387
};
388388

389389
// Act
390-
logger.LogVerbose(1, testLogValues);
390+
logger.LogTrace(1, testLogValues);
391391
logger.LogInformation(2, testLogValues);
392392
logger.LogWarning(3, testLogValues);
393393
logger.LogError(4, testLogValues);
@@ -397,12 +397,12 @@ public void LogValuesAndEventId_LogsCorrectValues()
397397
// Assert
398398
Assert.Equal(6, sink.Writes.Count);
399399

400-
var verbose = sink.Writes[0];
401-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
402-
Assert.Same(testLogValues, verbose.State);
403-
Assert.Equal(1, verbose.EventId);
404-
Assert.Equal(null, verbose.Exception);
405-
Assert.Equal("Test 1", verbose.Formatter(verbose.State, verbose.Exception));
400+
var trace = sink.Writes[0];
401+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
402+
Assert.Same(testLogValues, trace.State);
403+
Assert.Equal(1, trace.EventId);
404+
Assert.Equal(null, trace.Exception);
405+
Assert.Equal("Test 1", trace.Formatter(trace.State, trace.Exception));
406406

407407
var information = sink.Writes[1];
408408
Assert.Equal(LogLevel.Information, information.LogLevel);
@@ -452,7 +452,7 @@ public void LogValuesAndError_LogsCorrectValues()
452452
};
453453

454454
// Act
455-
logger.LogVerbose(testLogValues, _exception);
455+
logger.LogTrace(testLogValues, _exception);
456456
logger.LogInformation(testLogValues, _exception);
457457
logger.LogWarning(testLogValues, _exception);
458458
logger.LogError(testLogValues, _exception);
@@ -462,14 +462,14 @@ public void LogValuesAndError_LogsCorrectValues()
462462
// Assert
463463
Assert.Equal(6, sink.Writes.Count);
464464

465-
var verbose = sink.Writes[0];
466-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
467-
Assert.Same(testLogValues, verbose.State);
468-
Assert.Equal(0, verbose.EventId);
469-
Assert.Equal(_exception, verbose.Exception);
465+
var trace = sink.Writes[0];
466+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
467+
Assert.Same(testLogValues, trace.State);
468+
Assert.Equal(0, trace.EventId);
469+
Assert.Equal(_exception, trace.Exception);
470470
Assert.Equal(
471471
"Test 1" + Environment.NewLine + _exception,
472-
verbose.Formatter(verbose.State, verbose.Exception));
472+
trace.Formatter(trace.State, trace.Exception));
473473

474474
var information = sink.Writes[1];
475475
Assert.Equal(LogLevel.Information, information.LogLevel);
@@ -528,7 +528,7 @@ public void LogValuesEventIdAndError_LogsCorrectValues()
528528
};
529529

530530
// Act
531-
logger.LogVerbose(1, testLogValues, _exception);
531+
logger.LogTrace(1, testLogValues, _exception);
532532
logger.LogInformation(2, testLogValues, _exception);
533533
logger.LogWarning(3, testLogValues, _exception);
534534
logger.LogError(4, testLogValues, _exception);
@@ -538,14 +538,14 @@ public void LogValuesEventIdAndError_LogsCorrectValues()
538538
// Assert
539539
Assert.Equal(6, sink.Writes.Count);
540540

541-
var verbose = sink.Writes[0];
542-
Assert.Equal(LogLevel.Verbose, verbose.LogLevel);
543-
Assert.Same(testLogValues, verbose.State);
544-
Assert.Equal(1, verbose.EventId);
545-
Assert.Equal(_exception, verbose.Exception);
541+
var trace = sink.Writes[0];
542+
Assert.Equal(LogLevel.Trace, trace.LogLevel);
543+
Assert.Same(testLogValues, trace.State);
544+
Assert.Equal(1, trace.EventId);
545+
Assert.Equal(_exception, trace.Exception);
546546
Assert.Equal(
547547
"Test 1" + Environment.NewLine + _exception,
548-
verbose.Formatter(verbose.State, verbose.Exception));
548+
trace.Formatter(trace.State, trace.Exception));
549549

550550
var information = sink.Writes[1];
551551
Assert.Equal(LogLevel.Information, information.LogLevel);

‎test/Microsoft.Extensions.Logging.Test/TraceSourceLoggerTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public static void IsEnabledReturnsCorrectValue()
2727
Assert.True(logger.IsEnabled(LogLevel.Error));
2828
Assert.True(logger.IsEnabled(LogLevel.Warning));
2929
Assert.False(logger.IsEnabled(LogLevel.Information));
30-
Assert.False(logger.IsEnabled(LogLevel.Verbose));
30+
Assert.False(logger.IsEnabled(LogLevel.Debug));
31+
Assert.False(logger.IsEnabled(LogLevel.Trace));
3132
}
3233

3334
[Theory]

‎test/Microsoft.Extensions.Logging.Testing.Tests/NullLoggerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void IsEnabled_AlwaysFalse()
2727

2828
// Act & Assert
2929
Assert.False(logger.IsEnabled(LogLevel.Debug));
30-
Assert.False(logger.IsEnabled(LogLevel.Verbose));
30+
Assert.False(logger.IsEnabled(LogLevel.Trace));
3131
Assert.False(logger.IsEnabled(LogLevel.Information));
3232
Assert.False(logger.IsEnabled(LogLevel.Warning));
3333
Assert.False(logger.IsEnabled(LogLevel.Error));
@@ -42,7 +42,7 @@ public void Write_Does_Nothing()
4242
bool isCalled = false;
4343

4444
// Act
45-
logger.Log(LogLevel.Verbose, eventId: 0, state: null, exception: null, formatter: (ex, message) => { isCalled = true; return string.Empty; });
45+
logger.Log(LogLevel.Trace, eventId: 0, state: null, exception: null, formatter: (ex, message) => { isCalled = true; return string.Empty; });
4646

4747
// Assert
4848
Assert.False(isCalled);

0 commit comments

Comments
 (0)
This repository has been archived.