Skip to content

Commit dc4ea1c

Browse files
authored
Merge pull request #243 from ckadluba/refactoring-cleanup-tests
Reorganized test classes
2 parents 12a6385 + ed3aac4 commit dc4ea1c

14 files changed

+64
-68
lines changed

test/Serilog.Sinks.MSSqlServer.Tests/Configuration/Microsoft.Extensions.Configuration/ConfigurationExtensionsTests.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
using Xunit;
66
using FluentAssertions;
77
using Microsoft.Extensions.Configuration;
8-
using System;
8+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
99

1010
namespace Serilog.Sinks.MSSqlServer.Tests
1111
{
1212
[Collection("LogTest")]
13-
public sealed class ConfigurationExtensionsTests : IDisposable
13+
public class ConfigurationExtensionsTests : DatabaseTestsBase
1414
{
1515
static string ConnectionStringName = "NamedConnection";
1616
static string ColumnOptionsSection = "CustomColumnNames";
@@ -79,10 +79,5 @@ public void ColumnOptionsFromConfigSection()
7979
infoSchema.Should().Contain(columns => columns.ColumnName == "Id");
8080
}
8181
}
82-
83-
public void Dispose()
84-
{
85-
DatabaseFixture.DropTable();
86-
}
8782
}
8883
}

test/Serilog.Sinks.MSSqlServer.Tests/Configuration/System.Configuration/ConfigurationExtensionsTests.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System;
2-
using Dapper;
1+
using Dapper;
32
using Xunit;
43
using FluentAssertions;
54
using System.Collections.Generic;
65
using System.Data.SqlClient;
76
using System.Linq;
7+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
88

99
// Because System.Configuration is static and config is loaded automatically,
1010
// the tests alter the static AppConfigSectionName string value exposed by the
@@ -16,7 +16,7 @@
1616
namespace Serilog.Sinks.MSSqlServer.Tests
1717
{
1818
[Collection("LogTest")]
19-
public sealed class ConfigurationExtensionsTests : IDisposable
19+
public class ConfigurationExtensionsTests : DatabaseTestsBase
2020
{
2121
[Fact]
2222
public void ConnectionStringByName()
@@ -89,10 +89,5 @@ public void CustomizedColumnList()
8989
infoSchema.Should().Contain(columns => columns.ColumnName == "CustomColumn");
9090
}
9191
}
92-
93-
public void Dispose()
94-
{
95-
DatabaseFixture.DropTable();
96-
}
9792
}
9893
}

test/Serilog.Sinks.MSSqlServer.Tests/CustomStandardColumnNamesTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
using Dapper;
77
using Xunit;
88
using FluentAssertions;
9+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
910

1011
namespace Serilog.Sinks.MSSqlServer.Tests
1112
{
1213
[Collection("LogTest")]
13-
public sealed class CustomStandardColumnNamesTests : IDisposable
14+
public class CustomStandardColumnNamesTests : DatabaseTestsBase
1415
{
1516
[Fact]
1617
public void CustomIdColumn()
@@ -264,10 +265,5 @@ public void AuditEventToDefaultStandardColumns()
264265
logEvents.Should().Contain(e => e.Message.Contains(loggingInformationMessage));
265266
}
266267
}
267-
268-
public void Dispose()
269-
{
270-
DatabaseFixture.DropTable();
271-
}
272268
}
273269
}

test/Serilog.Sinks.MSSqlServer.Tests/IndexingFeaturesTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
using System.Linq;
44
using Dapper;
55
using FluentAssertions;
6+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
67
using Xunit;
78

89
namespace Serilog.Sinks.MSSqlServer.Tests
910
{
1011
[Collection("LogTest")]
11-
public sealed class IndexingFeaturesTests : IDisposable
12+
public class IndexingFeaturesTests : DatabaseTestsBase
1213
{
1314
[Fact]
1415
public void NonClusteredDefaultIdPrimaryKey()
@@ -110,10 +111,5 @@ public void ColumnstoreIndex()
110111
results.Should().Contain(x => x.name == $"CCI_{DatabaseFixture.LogTableName}");
111112
}
112113
}
113-
114-
public void Dispose()
115-
{
116-
DatabaseFixture.DropTable();
117-
}
118114
}
119115
}

test/Serilog.Sinks.MSSqlServer.Tests/LevelAsEnumTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
using Dapper;
55
using FluentAssertions;
66
using Serilog.Events;
7+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
78
using Xunit;
89

910
namespace Serilog.Sinks.MSSqlServer.Tests
1011
{
1112
[Collection("LogTest")]
12-
public sealed class LevelAsEnumTests : IDisposable
13+
public class LevelAsEnumTests : DatabaseTestsBase
1314
{
1415
[Fact]
1516
public void CanStoreLevelAsEnum()
@@ -130,10 +131,5 @@ public void AuditCanStoreLevelAsString()
130131
logEvents.Should().Contain(e => e.Message.Contains(loggingInformationMessage) && e.Level == LogEventLevel.Information.ToString());
131132
}
132133
}
133-
134-
public void Dispose()
135-
{
136-
DatabaseFixture.DropTable();
137-
}
138134
}
139135
}

test/Serilog.Sinks.MSSqlServer.Tests/MiscFeaturesTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
using System.Linq;
66
using Dapper;
77
using FluentAssertions;
8+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
89
using Xunit;
910

1011
namespace Serilog.Sinks.MSSqlServer.Tests
1112
{
1213
[Collection("LogTest")]
13-
public sealed class MiscFeaturesTests : IDisposable
14+
public class MiscFeaturesTests : DatabaseTestsBase
1415
{
1516
[Fact]
1617
public void LogEventExcludeAdditionalProperties()
@@ -266,10 +267,5 @@ public void LogEventStoreAsEnum()
266267
logEventCount.Should().HaveCount(1);
267268
}
268269
}
269-
270-
public void Dispose()
271-
{
272-
DatabaseFixture.DropTable();
273-
}
274270
}
275271
}

test/Serilog.Sinks.MSSqlServer.Tests/PropertiesColumnFilteringTests.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
using Dapper;
22
using FluentAssertions;
3+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
34
using System;
45
using System.Data.SqlClient;
56
using Xunit;
67

78
namespace Serilog.Sinks.MSSqlServer.Tests
89
{
910
[Collection("LogTest")]
10-
public sealed class PropertiesColumnFilteringTests : IDisposable
11+
public class PropertiesColumnFilteringTests : DatabaseTestsBase
1112
{
1213
[Fact]
1314
public void FilteredProperties()
@@ -78,10 +79,5 @@ public void FilteredPropertiesWhenAuditing()
7879
logEvents.Should().NotContain(e => e.Properties.Contains("BValue"));
7980
}
8081
}
81-
82-
public void Dispose()
83-
{
84-
DatabaseFixture.DropTable();
85-
}
8682
}
8783
}

test/Serilog.Sinks.MSSqlServer.Tests/SqlTypesTests.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
2+
using System;
23
using System.Collections.Generic;
34
using System.Collections.ObjectModel;
45
using System.Data;
@@ -7,7 +8,7 @@
78
namespace Serilog.Sinks.MSSqlServer.Tests
89
{
910
[Collection("LogTest")]
10-
public sealed class SqlTypesTests : IDisposable
11+
public class SqlTypesTests : DatabaseTestsBase
1112
{
1213
// Since the point of these tests are to validate we can write to
1314
// specific underlying SQL Server column data types, we use audit
@@ -142,10 +143,5 @@ private void Arrange(ICollection<SqlColumn> customColumns)
142143
)
143144
.CreateLogger();
144145
}
145-
146-
public void Dispose()
147-
{
148-
DatabaseFixture.DropTable();
149-
}
150146
}
151147
}

test/Serilog.Sinks.MSSqlServer.Tests/DapperQueryTemplates.cs renamed to test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DapperQueryTemplates.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Serilog.Events;
22
using System;
33

4-
namespace Serilog.Sinks.MSSqlServer.Tests
4+
namespace Serilog.Sinks.MSSqlServer.Tests.TestUtils
55
{
66
public class CustomStandardLogColumns
77
{

test/Serilog.Sinks.MSSqlServer.Tests/DatabaseFixture.cs renamed to test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseFixture.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
using System.Data.SqlClient;
33
using System.Linq;
44
using Dapper;
5-
using Xunit;
65

7-
namespace Serilog.Sinks.MSSqlServer.Tests
6+
namespace Serilog.Sinks.MSSqlServer.Tests.TestUtils
87
{
98
public sealed class DatabaseFixture : IDisposable
109
{
@@ -83,7 +82,4 @@ private static void CreateDatabase()
8382
}
8483
}
8584
}
86-
87-
[CollectionDefinition("LogTest", DisableParallelization = true)]
88-
public class PatientSecureFixtureCollection : ICollectionFixture<DatabaseFixture> { }
8985
}

0 commit comments

Comments
 (0)