Skip to content

Commit 77a9e25

Browse files
ckadlubackadluba
committed
Removed SqlClient dependency from all test classes. It only remains in a few test util classes.
1 parent 6a7524e commit 77a9e25

File tree

8 files changed

+107
-228
lines changed

8 files changed

+107
-228
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3-
#if NET452
4-
using System.Data.SqlClient;
5-
#else
6-
using Microsoft.Data.SqlClient;
7-
#endif
83
using System.IO;
9-
using Dapper;
10-
using FluentAssertions;
114
using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
125
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
136
using Xunit;
@@ -428,15 +421,5 @@ public void AuditEventToDefaultStandardColumns()
428421
// Assert
429422
VerifyLogMessageWasWritten(loggingInformationMessage);
430423
}
431-
432-
private static void VerifyCustomLogMessageWasWritten(string message)
433-
{
434-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
435-
{
436-
var logEvents = conn.Query<CustomStandardLogColumns>($"SELECT CustomMessage FROM {DatabaseFixture.LogTableName}");
437-
438-
logEvents.Should().Contain(e => e.CustomMessage.Contains(message));
439-
}
440-
}
441424
}
442425
}

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

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
using System;
2-
#if NET452
3-
using System.Data.SqlClient;
4-
#else
5-
using Microsoft.Data.SqlClient;
6-
#endif
7-
using System.Linq;
8-
using Dapper;
92
using FluentAssertions;
103
using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
114
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
@@ -45,15 +38,8 @@ public void NonClusteredDefaultIdPrimaryKey()
4538
Log.CloseAndFlush();
4639

4740
// Assert
48-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
49-
{
50-
conn.Execute($"use {DatabaseFixture.Database}");
51-
var query = conn.Query<SysObjectQuery>($@"SELECT P.OBJECT_ID AS IndexType FROM SYS.OBJECTS O INNER JOIN SYS.PARTITIONS P ON P.OBJECT_ID = O.OBJECT_ID WHERE NAME = '{DatabaseFixture.LogTableName}'");
52-
var results = query as SysObjectQuery[] ?? query.ToArray();
53-
54-
// type > 1 indicates b-tree (clustered index)
55-
results.Should().Contain(x => x.IndexType > 1);
56-
}
41+
VerifyCustomQuery<SysObjectQuery>($@"SELECT P.OBJECT_ID AS IndexType FROM SYS.OBJECTS O INNER JOIN SYS.PARTITIONS P ON P.OBJECT_ID = O.OBJECT_ID WHERE NAME = '{DatabaseFixture.LogTableName}'",
42+
e => e.Should().Contain(x => x.IndexType > 1));
5743
}
5844

5945
[Fact]
@@ -80,15 +66,10 @@ public void AlternatePrimaryKey()
8066
Log.CloseAndFlush();
8167

8268
// Assert
83-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
84-
{
85-
conn.Execute($"use {DatabaseFixture.Database}");
86-
var query = conn.Query<sp_pkey>($@"exec sp_pkeys '{DatabaseFixture.LogTableName}'");
87-
var results = query as sp_pkey[] ?? query.ToArray();
88-
89-
results.Should().Contain(x => x.COLUMN_NAME == "TimeStamp");
90-
results.Should().Contain(x => x.PK_NAME == $"PK_{DatabaseFixture.LogTableName}");
91-
}
69+
VerifyCustomQuery<sp_pkey>($@"exec sp_pkeys '{DatabaseFixture.LogTableName}'",
70+
e => e.Should().Contain(x => x.COLUMN_NAME == "TimeStamp"));
71+
VerifyCustomQuery<sp_pkey>($@"exec sp_pkeys '{DatabaseFixture.LogTableName}'",
72+
e => e.Should().Contain(x => x.PK_NAME == $"PK_{DatabaseFixture.LogTableName}"));
9273
}
9374

9475
[Fact]
@@ -121,14 +102,8 @@ public void ColumnstoreIndex()
121102
Log.CloseAndFlush();
122103

123104
// Assert
124-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
125-
{
126-
conn.Execute($"use {DatabaseFixture.Database}");
127-
var query = conn.Query<SysIndex_CCI>("select name from sys.indexes where type = 5");
128-
var results = query as SysIndex_CCI[] ?? query.ToArray();
129-
130-
results.Should().Contain(x => x.name == $"CCI_{DatabaseFixture.LogTableName}");
131-
}
105+
VerifyCustomQuery<SysIndex_CCI>("select name from sys.indexes where type = 5",
106+
e => e.Should().Contain(x => x.name == $"CCI_{DatabaseFixture.LogTableName}"));
132107
}
133108
}
134109
}

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

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
using System;
2-
#if NET452
3-
using System.Data.SqlClient;
4-
#else
5-
using Microsoft.Data.SqlClient;
6-
#endif
72
using System.IO;
8-
using Dapper;
93
using FluentAssertions;
104
using Serilog.Events;
115
using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
@@ -49,12 +43,8 @@ public void CanStoreLevelAsEnum()
4943
}
5044

5145
// Assert
52-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
53-
{
54-
var logEvents = conn.Query<EnumLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}");
55-
56-
logEvents.Should().Contain(e => e.Message.Contains(loggingInformationMessage) && e.Level == 2);
57-
}
46+
VerifyCustomQuery<EnumLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}",
47+
e => e.Should().Contain(l => l.Message.Contains(loggingInformationMessage) && l.Level == 2));
5848
}
5949

6050
[Fact]
@@ -84,12 +74,8 @@ public void CanStoreLevelAsString()
8474
}
8575

8676
// Assert
87-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
88-
{
89-
var logEvents = conn.Query<StringLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}");
90-
91-
logEvents.Should().Contain(e => e.Message.Contains(loggingInformationMessage) && e.Level == LogEventLevel.Information.ToString());
92-
}
77+
VerifyCustomQuery<StringLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}",
78+
e => e.Should().Contain(l => l.Message.Contains(loggingInformationMessage) && l.Level == LogEventLevel.Information.ToString()));
9379
}
9480

9581
[Fact]
@@ -117,12 +103,8 @@ public void AuditCanStoreLevelAsEnum()
117103
}
118104

119105
// Assert
120-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
121-
{
122-
var logEvents = conn.Query<EnumLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}");
123-
124-
logEvents.Should().Contain(e => e.Message.Contains(loggingInformationMessage) && e.Level == 2);
125-
}
106+
VerifyCustomQuery<EnumLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}",
107+
e => e.Should().Contain(l => l.Message.Contains(loggingInformationMessage) && l.Level == 2));
126108
}
127109

128110
[Fact]
@@ -150,12 +132,8 @@ public void AuditCanStoreLevelAsString()
150132
}
151133

152134
// Assert
153-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
154-
{
155-
var logEvents = conn.Query<StringLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}");
156-
157-
logEvents.Should().Contain(e => e.Message.Contains(loggingInformationMessage) && e.Level == LogEventLevel.Information.ToString());
158-
}
135+
VerifyCustomQuery<StringLevelStandardLogColumns>($"SELECT Message, Level FROM {DatabaseFixture.LogTableName}",
136+
e => e.Should().Contain(l => l.Message.Contains(loggingInformationMessage) && l.Level == LogEventLevel.Information.ToString()));
159137
}
160138
}
161139
}

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

Lines changed: 21 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Data;
4-
#if NET452
5-
using System.Data.SqlClient;
6-
#else
7-
using Microsoft.Data.SqlClient;
8-
#endif
9-
using System.Linq;
10-
using Dapper;
114
using FluentAssertions;
125
using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
136
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
@@ -66,13 +59,10 @@ public void LogEventExcludeAdditionalProperties()
6659
Log.CloseAndFlush();
6760

6861
// Assert
69-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
70-
{
71-
var logEvents = conn.Query<LogEventColumn>($"SELECT LogEvent from {DatabaseFixture.LogTableName}");
72-
73-
logEvents.Should().Contain(e => e.LogEvent.Contains("AValue"));
74-
logEvents.Should().NotContain(e => e.LogEvent.Contains("BValue"));
75-
}
62+
VerifyCustomQuery<LogEventColumn>($"SELECT LogEvent from {DatabaseFixture.LogTableName}",
63+
e => e.Should().Contain(l => l.LogEvent.Contains("AValue")));
64+
VerifyCustomQuery<LogEventColumn>($"SELECT LogEvent from {DatabaseFixture.LogTableName}",
65+
e => e.Should().NotContain(l => l.LogEvent.Contains("BValue")));
7666
}
7767

7868
[Trait("Bugfix", "#90")]
@@ -108,13 +98,10 @@ public void LogEventExcludeStandardColumns()
10898
Log.CloseAndFlush();
10999

110100
// Assert
111-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
112-
{
113-
var logEvents = conn.Query<LogEventColumn>($"SELECT LogEvent from {DatabaseFixture.LogTableName}");
114-
115-
logEvents.Should().Contain(e => e.LogEvent.Contains("AValue"));
116-
logEvents.Should().NotContain(e => e.LogEvent.Contains("TimeStamp"));
117-
}
101+
VerifyCustomQuery<LogEventColumn>($"SELECT LogEvent from {DatabaseFixture.LogTableName}",
102+
e => e.Should().Contain(l => l.LogEvent.Contains("AValue")));
103+
VerifyCustomQuery<LogEventColumn>($"SELECT LogEvent from {DatabaseFixture.LogTableName}",
104+
e => e.Should().NotContain(l => l.LogEvent.Contains("TimeStamp")));
118105
}
119106

120107
[Fact]
@@ -141,15 +128,9 @@ public void ExcludeIdColumn()
141128
Log.CloseAndFlush();
142129

143130
// Assert
144-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
145-
{
146-
conn.Execute($"use {DatabaseFixture.Database}");
147-
var query = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
148-
var results = query as InfoSchema[] ?? query.ToArray();
149-
150-
results.Should().Contain(x => x.ColumnName == columnOptions.Properties.ColumnName);
151-
results.Should().NotContain(x => x.ColumnName == columnOptions.Id.ColumnName);
152-
}
131+
var query = $@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'";
132+
VerifyCustomQuery<InfoSchema>(query, e => e.Should().Contain(x => x.ColumnName == columnOptions.Properties.ColumnName));
133+
VerifyCustomQuery<InfoSchema>(query, e => e.Should().NotContain(x => x.ColumnName == columnOptions.Id.ColumnName));
153134
}
154135

155136
[Fact]
@@ -176,13 +157,8 @@ public void BigIntIdColumn()
176157
Log.CloseAndFlush();
177158

178159
// Assert
179-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
180-
{
181-
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}'");
182-
var results = query as InfoSchema[] ?? query.ToArray();
183-
184-
results.Should().Contain(x => x.DataType == "bigint");
185-
}
160+
VerifyCustomQuery<InfoSchema>($@"SELECT DATA_TYPE AS DataType FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}' AND COLUMN_NAME = '{columnOptions.Id.ColumnName}'",
161+
e => e.Should().Contain(x => x.DataType == "bigint"));
186162
}
187163

188164
[Trait("Bugfix", "#130")]
@@ -210,13 +186,8 @@ public void XmlPropertyColumn()
210186
Log.CloseAndFlush();
211187

212188
// Assert
213-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
214-
{
215-
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}'");
216-
var results = query as InfoSchema[] ?? query.ToArray();
217-
218-
results.Should().Contain(x => x.DataType == "xml");
219-
}
189+
VerifyCustomQuery<InfoSchema>($@"SELECT DATA_TYPE AS DataType FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}' AND COLUMN_NAME = '{columnOptions.Properties.ColumnName}'",
190+
e => e.Should().Contain(x => x.DataType == "xml"));
220191
}
221192

222193
[Trait("Bugfix", "#107")]
@@ -249,13 +220,8 @@ public void AutoCreateSchemaLegacyInterface()
249220
Log.CloseAndFlush();
250221

251222
// Assert
252-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
253-
{
254-
var query = conn.Query<InfoSchema>("SELECT SCHEMA_NAME AS SchemaName FROM INFORMATION_SCHEMA.SCHEMATA");
255-
var results = query as InfoSchema[] ?? query.ToArray();
256-
257-
results.Should().Contain(x => x.SchemaName == schemaName);
258-
}
223+
VerifyCustomQuery<InfoSchema>("SELECT SCHEMA_NAME AS SchemaName FROM INFORMATION_SCHEMA.SCHEMATA",
224+
e => e.Should().Contain(x => x.SchemaName == schemaName));
259225
}
260226

261227
[Trait("Bugfix", "#107")]
@@ -290,13 +256,8 @@ public void AutoCreateSchemaSinkOptionsInterface()
290256
Log.CloseAndFlush();
291257

292258
// Assert
293-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
294-
{
295-
var query = conn.Query<InfoSchema>("SELECT SCHEMA_NAME AS SchemaName FROM INFORMATION_SCHEMA.SCHEMATA");
296-
var results = query as InfoSchema[] ?? query.ToArray();
297-
298-
results.Should().Contain(x => x.SchemaName == schemaName);
299-
}
259+
VerifyCustomQuery<InfoSchema>("SELECT SCHEMA_NAME AS SchemaName FROM INFORMATION_SCHEMA.SCHEMATA",
260+
e => e.Should().Contain(x => x.SchemaName == schemaName));
300261
}
301262

302263
[Trait("Bugfix", "#171")]
@@ -328,12 +289,8 @@ public void LogEventStoreAsEnum()
328289
Log.CloseAndFlush();
329290

330291
// Assert
331-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
332-
{
333-
var logEventCount = conn.Query<LogEventColumn>($"SELECT Id from {DatabaseFixture.LogTableName}");
334-
335-
logEventCount.Should().HaveCount(1);
336-
}
292+
VerifyCustomQuery<LogEventColumn>($"SELECT Id from {DatabaseFixture.LogTableName}",
293+
e => e.Should().HaveCount(1));
337294
}
338295
}
339296
}

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

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
#if NET452
2-
using System.Data.SqlClient;
3-
#else
4-
using Microsoft.Data.SqlClient;
5-
#endif
6-
using Dapper;
7-
using FluentAssertions;
1+
using FluentAssertions;
82
using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
93
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
104
using Xunit;
@@ -48,13 +42,10 @@ public void FilteredProperties()
4842
Log.CloseAndFlush();
4943

5044
// Assert
51-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
52-
{
53-
var logEvents = conn.Query<PropertiesColumns>($"SELECT Properties from {DatabaseFixture.LogTableName}");
54-
55-
logEvents.Should().Contain(e => e.Properties.Contains("AValue"));
56-
logEvents.Should().NotContain(e => e.Properties.Contains("BValue"));
57-
}
45+
VerifyCustomQuery<PropertiesColumns>($"SELECT Properties from {DatabaseFixture.LogTableName}",
46+
e => e.Should().Contain(l => l.Properties.Contains("AValue")));
47+
VerifyCustomQuery<PropertiesColumns>($"SELECT Properties from {DatabaseFixture.LogTableName}",
48+
e => e.Should().NotContain(l => l.Properties.Contains("BValue")));
5849
}
5950

6051
[Fact]
@@ -86,13 +77,10 @@ public void FilteredPropertiesWhenAuditing()
8677
Log.CloseAndFlush();
8778

8879
// Assert
89-
using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
90-
{
91-
var logEvents = conn.Query<PropertiesColumns>($"SELECT Properties from {DatabaseFixture.LogTableName}");
92-
93-
logEvents.Should().Contain(e => e.Properties.Contains("AValue"));
94-
logEvents.Should().NotContain(e => e.Properties.Contains("BValue"));
95-
}
80+
VerifyCustomQuery<PropertiesColumns>($"SELECT Properties from {DatabaseFixture.LogTableName}",
81+
e => e.Should().Contain(l => l.Properties.Contains("AValue")));
82+
VerifyCustomQuery<PropertiesColumns>($"SELECT Properties from {DatabaseFixture.LogTableName}",
83+
e => e.Should().NotContain(l => l.Properties.Contains("BValue")));
9684
}
9785
}
9886
}

0 commit comments

Comments
 (0)