Skip to content

Use raw string literals #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2023
Merged

Use raw string literals #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 54 additions & 49 deletions test/Serilog.Settings.Configuration.Tests/ConfigurationReaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ public class ConfigurationReaderTests
public ConfigurationReaderTests()
{
_configurationReader = new ConfigurationReader(
JsonStringConfigSource.LoadSection(@"{ 'Serilog': { } }", "Serilog"),
JsonStringConfigSource.LoadSection("{ 'Serilog': { } }", "Serilog"),
AssemblyFinder.ForSource(ConfigurationAssemblySource.UseLoadedAssemblies),
CultureInfo.InvariantCulture);
}

[Fact]
public void WriteToSupportSimplifiedSyntax()
{
var json = @"
{
'WriteTo': [ 'LiterateConsole', 'DiagnosticTrace' ]
}";
var json = """
{
'WriteTo': [ 'LiterateConsole', 'DiagnosticTrace' ]
}
""";

var result = _configurationReader.GetMethodCalls(JsonStringConfigSource.LoadSection(json, "WriteTo"));
Assert.Equal(2, result.Count);
Expand All @@ -41,12 +42,13 @@ public void WriteToSupportSimplifiedSyntax()
[Fact]
public void WriteToSupportExpandedSyntaxWithoutArgs()
{
var json = @"
{
'WriteTo': [ {
'Name': 'LiterateConsole'
}]
}";
var json = """
{
'WriteTo': [ {
'Name': 'LiterateConsole'
}]
}
""";

var result = _configurationReader.GetMethodCalls(JsonStringConfigSource.LoadSection(json, "WriteTo"));
Assert.Equal(1, result.Count);
Expand All @@ -58,15 +60,16 @@ public void WriteToSupportExpandedSyntaxWithoutArgs()
[Fact]
public void WriteToSupportExpandedSyntaxWithArgs()
{
var json = @"
{
'WriteTo': [ {
'Name': 'LiterateConsole',
'Args': {
'outputTemplate': '{Message}'
},
}]
}";
var json = """
{
'WriteTo': [ {
'Name': 'LiterateConsole',
'Args': {
'outputTemplate': '{Message}'
},
}]
}
""";

var result = _configurationReader.GetMethodCalls(JsonStringConfigSource.LoadSection(json, "WriteTo"));

Expand All @@ -85,30 +88,31 @@ public void WriteToSupportExpandedSyntaxWithArgs()
[Fact]
public void WriteToSupportMultipleSinksOfTheSameKind()
{
var json = @"
{
'WriteTo': [
{
'Name': 'LiterateConsole',
'Args': {
'outputTemplate': '{Message}'
},
},
'DiagnosticTrace'
],
'WriteTo:File1': {
'Name': 'File',
'Args': {
'outputTemplate': '{Message}'
},
},
'WriteTo:File2': {
'Name': 'File',
'Args': {
'outputTemplate': '{Message}'
},
}
}";
var json = """
{
'WriteTo': [
{
'Name': 'LiterateConsole',
'Args': {
'outputTemplate': '{Message}'
},
},
'DiagnosticTrace'
],
'WriteTo:File1': {
'Name': 'File',
'Args': {
'outputTemplate': '{Message}'
},
},
'WriteTo:File2': {
'Name': 'File',
'Args': {
'outputTemplate': '{Message}'
},
}
}
""";

var result = _configurationReader.GetMethodCalls(JsonStringConfigSource.LoadSection(json, "WriteTo"));

Expand All @@ -125,10 +129,11 @@ public void WriteToSupportMultipleSinksOfTheSameKind()
[Fact]
public void Enrich_SupportSimplifiedSyntax()
{
var json = @"
{
'Enrich': [ 'FromLogContext', 'WithMachineName', 'WithThreadId' ]
}";
var json = """
{
'Enrich': [ 'FromLogContext', 'WithMachineName', 'WithThreadId' ]
}
""";

var result = _configurationReader.GetMethodCalls(JsonStringConfigSource.LoadSection(json, "Enrich"));
Assert.Equal(3, result.Count);
Expand Down Expand Up @@ -269,7 +274,7 @@ public void MixedMinimumLevelCorrectOneIsEnabledOnLogger(IConfigurationRoot root
[Fact]
public void NoConfigurationRootUsedStillValid()
{
var section = JsonStringConfigSource.LoadSection(@"{ 'Nest': { 'Serilog': { 'MinimumLevel': 'Error' } } }", "Nest");
var section = JsonStringConfigSource.LoadSection("{ 'Nest': { 'Serilog': { 'MinimumLevel': 'Error' } } }", "Nest");
var reader = new ConfigurationReader(section.GetSection("Serilog"), AssemblyFinder.ForSource(ConfigurationAssemblySource.UseLoadedAssemblies), CultureInfo.InvariantCulture, section);
var loggerConfig = new LoggerConfiguration();

Expand Down
Loading