Skip to content

Commit 2022d74

Browse files
ckadlubackadluba
authored
Merge pull request #245 from ckadluba/refactoring-cleanup-tests
Corrections and do not mute exceptions during database tests.
2 parents 6cc7960 + f52130d commit 2022d74

File tree

5 files changed

+14
-27
lines changed

5 files changed

+14
-27
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,8 @@ public void ColumnOptionsFromConfigSection()
6464
.CreateLogger();
6565
Log.CloseAndFlush();
6666

67-
// from test TableCreatedWithCustomNames in CustomStandardColumnNames class
68-
using(var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
67+
using(var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
6968
{
70-
conn.Execute($"use {DatabaseFixture.Database}");
7169
var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
7270
var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
7371

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ public void CustomStandardColumnNames()
5050
.CreateLogger();
5151
Log.CloseAndFlush();
5252

53-
// from test TableCreatedWithCustomNames in CustomStandardColumnNames class
54-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
53+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
5554
{
56-
conn.Execute($"use {DatabaseFixture.Database}");
5755
var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
5856
var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
5957

@@ -79,9 +77,8 @@ public void CustomizedColumnList()
7977
.CreateLogger();
8078
Log.CloseAndFlush();
8179

82-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
80+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
8381
{
84-
conn.Execute($"use {DatabaseFixture.Database}");
8582
var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
8683
var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
8784

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ public void CustomIdColumn()
2525
var sink = new MSSqlServerSink(DatabaseFixture.LogEventsConnectionString, DatabaseFixture.LogTableName, 1, TimeSpan.FromSeconds(1), null, true, options, "dbo", null);
2626

2727
// assert
28-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
28+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
2929
{
30-
conn.Execute($"use {DatabaseFixture.Database}");
3130
var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
3231
var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
3332

@@ -53,9 +52,8 @@ public void DefaultIdColumn()
5352

5453
// assert
5554
var idColumnName = "Id";
56-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
55+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
5756
{
58-
conn.Execute($"use {DatabaseFixture.Database}");
5957
var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
6058
var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
6159

@@ -88,9 +86,8 @@ public void TableCreatedWithCustomNames()
8886
var sink = new MSSqlServerSink(DatabaseFixture.LogEventsConnectionString, DatabaseFixture.LogTableName, 1, TimeSpan.FromSeconds(1), null, true, options, "dbo", null);
8987

9088
// assert
91-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
89+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
9290
{
93-
conn.Execute($"use {DatabaseFixture.Database}");
9491
var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
9592
var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
9693

@@ -114,9 +111,8 @@ public void TableCreatedWithDefaultNames()
114111
var sink = new MSSqlServerSink(DatabaseFixture.LogEventsConnectionString, DatabaseFixture.LogTableName, 1, TimeSpan.FromSeconds(1), null, true, options, "dbo", null);
115112

116113
// assert
117-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
114+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
118115
{
119-
conn.Execute($"use {DatabaseFixture.Database}");
120116
var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
121117
var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
122118

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,8 @@ public void BigIntIdColumn()
154154
Log.CloseAndFlush();
155155

156156
// assert
157-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
157+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
158158
{
159-
conn.Execute($"use {DatabaseFixture.Database}");
160159
var query = conn.Query<InfoSchema>($@"SELECT DATA_TYPE AS DataType FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}' AND COLUMN_NAME = '{columnOptions.Id.ColumnName}'");
161160
var results = query as InfoSchema[] ?? query.ToArray();
162161

@@ -186,9 +185,8 @@ public void XmlPropertyColumn()
186185
Log.CloseAndFlush();
187186

188187
// assert
189-
using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
188+
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
190189
{
191-
conn.Execute($"use {DatabaseFixture.Database}");
192190
var query = conn.Query<InfoSchema>($@"SELECT DATA_TYPE AS DataType FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}' AND COLUMN_NAME = '{columnOptions.Properties.ColumnName}'");
193191
var results = query as InfoSchema[] ?? query.ToArray();
194192

‎test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseFixture.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ public sealed class DatabaseFixture : IDisposable
1010
public static string Database => "LogTest";
1111
public static string LogTableName => "LogEvents";
1212

13+
private const string MasterConnectionString = @"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=Master;Integrated Security=True";
14+
1315
private const string CreateLogEventsDatabase = @"
1416
EXEC ('CREATE DATABASE [{0}] ON PRIMARY
1517
(NAME = [{0}],
@@ -26,7 +28,6 @@ WITH ROLLBACK IMMEDIATE
2628
DROP DATABASE [{Database}]
2729
";
2830

29-
public static string MasterConnectionString => @"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=Master;Integrated Security=True";
3031
public static string LogEventsConnectionString => $@"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog={Database};Integrated Security=True";
3132

3233
public class FileName
@@ -46,14 +47,11 @@ public void Dispose()
4647

4748
public static void DropTable(string tableName = null)
4849
{
49-
try
50+
using (var conn = new SqlConnection(LogEventsConnectionString))
5051
{
51-
using (var conn = new SqlConnection(LogEventsConnectionString))
52-
{
53-
conn.Execute($"DROP TABLE {(string.IsNullOrEmpty(tableName) ? LogTableName : tableName)};");
54-
}
52+
var actualTableName = string.IsNullOrEmpty(tableName) ? LogTableName : tableName;
53+
conn.Execute($"IF OBJECT_ID('{actualTableName}', 'U') IS NOT NULL DROP TABLE {actualTableName};");
5554
}
56-
catch { }
5755
}
5856

5957
private static void DeleteDatabase()

0 commit comments

Comments
 (0)