Skip to content
This repository has been archived by the owner on Dec 13, 2018. It is now read-only.

Commit

Permalink
Set background color with foreground color in ConsoleLogger
Browse files Browse the repository at this point in the history
  • Loading branch information
@BrennanConroy
BrennanConroy committed Mar 12, 2016
1 parent 6b07c6a commit 68f0bbc
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 45 deletions.
20 changes: 11 additions & 9 deletions src/Microsoft.Extensions.Logging.Console/ConsoleLogger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ public virtual void WriteMessage(LogLevel logLevel, string logName, int eventId,
// category and event id
// use default colors
WriteWithColor(
ConsoleColor.Gray,
DefaultConsoleColor,
logLevelColors.Foreground,
logLevelColors.Background,
_loglevelPadding + logName + $"[{eventId}]",
newLine: true);

Expand All @@ -145,7 +145,7 @@ public virtual void WriteMessage(LogLevel logLevel, string logName, int eventId,
if (!string.IsNullOrEmpty(scopeInformation))
{
WriteWithColor(
ConsoleColor.Gray,
DefaultConsoleColor,
DefaultConsoleColor,
_messagePadding + scopeInformation,
newLine: true);
Expand All @@ -154,7 +154,7 @@ public virtual void WriteMessage(LogLevel logLevel, string logName, int eventId,

// message
WriteWithColor(
ConsoleColor.White,
DefaultConsoleColor,
DefaultConsoleColor,
_messagePadding + message,
newLine: true);
Expand Down Expand Up @@ -183,7 +183,7 @@ private void WriteException(LogLevel logLevel, string logName, int eventId, Exce
{
// exception message
WriteWithColor(
ConsoleColor.White,
DefaultConsoleColor,
DefaultConsoleColor,
ex.ToString(),
newLine: true);
Expand Down Expand Up @@ -238,15 +238,17 @@ private ConsoleColors GetLogLevelConsoleColors(LogLevel logLevel)
case LogLevel.Critical:
return new ConsoleColors(ConsoleColor.White, ConsoleColor.Red);
case LogLevel.Error:
return new ConsoleColors(ConsoleColor.Red, DefaultConsoleColor);
return new ConsoleColors(ConsoleColor.Red, ConsoleColor.Black);
case LogLevel.Warning:
return new ConsoleColors(ConsoleColor.DarkYellow, DefaultConsoleColor);
return new ConsoleColors(ConsoleColor.Yellow, ConsoleColor.Black);
case LogLevel.Information:
return new ConsoleColors(ConsoleColor.DarkGreen, DefaultConsoleColor);
return new ConsoleColors(ConsoleColor.DarkGreen, ConsoleColor.Black);
case LogLevel.Debug:
return new ConsoleColors(ConsoleColor.Gray, ConsoleColor.Black);
case LogLevel.Trace:
return new ConsoleColors(ConsoleColor.Gray, ConsoleColor.Black);
default:
return new ConsoleColors(ConsoleColor.Gray, DefaultConsoleColor);
return new ConsoleColors(DefaultConsoleColor, DefaultConsoleColor);
}
}

Expand Down
72 changes: 36 additions & 36 deletions test/Microsoft.Extensions.Logging.Test/ConsoleLoggerTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,11 @@ public void WriteCritical_LogsCorrectColors()
Assert.Equal(ConsoleColor.Red, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(ConsoleColor.Red, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand All @@ -317,14 +317,14 @@ public void WriteError_LogsCorrectColors()
// Assert
Assert.Equal(3, sink.Writes.Count);
var write = sink.Writes[0];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Red, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Red, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand All @@ -341,14 +341,14 @@ public void WriteWarning_LogsCorrectColors()
// Assert
Assert.Equal(3, sink.Writes.Count);
var write = sink.Writes[0];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.DarkYellow, write.ForegroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand All @@ -365,14 +365,14 @@ public void WriteInformation_LogsCorrectColors()
// Assert
Assert.Equal(3, sink.Writes.Count);
var write = sink.Writes[0];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand All @@ -389,14 +389,14 @@ public void WriteDebug_LogsCorrectColors()
// Assert
Assert.Equal(3, sink.Writes.Count);
var write = sink.Writes[0];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand All @@ -413,14 +413,14 @@ public void WriteTrace_LogsCorrectColors()
// Assert
Assert.Equal(3, sink.Writes.Count);
var write = sink.Writes[0];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand Down Expand Up @@ -464,14 +464,14 @@ public void NoLogScope_DoesNotWriteAnyScopeContentToOutput()
// Assert
Assert.Equal(3, sink.Writes.Count);
var write = sink.Writes[0];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.DarkYellow, write.ForegroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand All @@ -493,17 +493,17 @@ public void WritingScopes_LogsWithCorrectColors()
// Assert
Assert.Equal(4, sink.Writes.Count);
var write = sink.Writes[0];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
write = sink.Writes[1];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
write = sink.Writes[2];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
write = sink.Writes[3];
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand All @@ -530,7 +530,7 @@ public void WritingScopes_LogsExpectedMessage()
var write = sink.Writes[2];
Assert.Equal(expectedMessage, write.Message);
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultBackgroundColor, write.ForegroundColor);
}

[Fact]
Expand Down Expand Up @@ -560,7 +560,7 @@ public void WritingNestedScopes_LogsExpectedMessage()
var write = sink.Writes[2];
Assert.Equal(expectedMessage, write.Message);
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand Down Expand Up @@ -599,11 +599,11 @@ public void WritingMultipleScopes_LogsExpectedMessage()
var write = sink.Writes[2];
Assert.Equal(expectedMessage1, write.Message);
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
write = sink.Writes[6];
Assert.Equal(expectedMessage2, write.Message);
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
}

[Fact]
Expand Down

0 comments on commit 68f0bbc

Please sign in to comment.