Skip to content

Commit 921d1e9

Browse files
ckadlubackadluba
committed
Fixed vulnerability by updating xunit
* Fixed vulnerability by updating xunit to 2.9.0. * Fixed new warnings in test code. Related issue: #544 Related Work Items: #5
1 parent 6798ef6 commit 921d1e9

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<PackageVersion Include="FluentAssertions" Version="6.7.0" />
1616
<PackageVersion Include="Dapper.StrongName" Version="2.0.123" />
1717
<PackageVersion Include="Moq" Version="4.18.2" />
18-
<PackageVersion Include="xunit" Version="2.4.2" />
19-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
18+
<PackageVersion Include="xunit" Version="2.9.0" />
19+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
2020
<PackageVersion Include="Serilog" Version="3.1.1" />
2121
<PackageVersion Include="Serilog.Extensions.Hosting" Version="5.0.1" />
2222
<PackageVersion Include="Serilog.Settings.Configuration" Version="3.4.0" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public async Task EmitBatchAsyncCallsSqlLogEventWriter()
162162
});
163163

164164
// Act
165-
await _sut.EmitBatchAsync(logEvents).ConfigureAwait(false);
165+
await _sut.EmitBatchAsync(logEvents);
166166

167167
// Assert
168168
_sqlBulkBatchWriter.Verify(w => w.WriteBatch(It.IsAny<IEnumerable<LogEvent>>(), _dataTable), Times.Once);

‎test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlBulkBatchWriterTests.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public async Task WriteBatchCallsLogEventDataGeneratorGetColumnsAndValuesForEach
7272
var logEvents = CreateLogEvents();
7373

7474
// Act
75-
await _sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
75+
await _sut.WriteBatch(logEvents, _dataTable);
7676

7777
// Assert
7878
_logEventDataGeneratorMock.Verify(c => c.GetColumnsAndValues(logEvents[0]), Times.Once);
@@ -86,7 +86,7 @@ public async Task WriteBatchCallsSqlConnectionFactoryCreate()
8686
var logEvents = CreateLogEvents();
8787

8888
// Act
89-
await _sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
89+
await _sut.WriteBatch(logEvents, _dataTable);
9090

9191
// Assert
9292
_sqlConnectionFactoryMock.Verify(f => f.Create(), Times.Once);
@@ -99,7 +99,7 @@ public async Task WriteBatchCallsSqlConnectionWrapperOpenAsync()
9999
var logEvents = CreateLogEvents();
100100

101101
// Act
102-
await _sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
102+
await _sut.WriteBatch(logEvents, _dataTable);
103103

104104
// Assert
105105
_sqlConnectionWrapperMock.Verify(c => c.OpenAsync(), Times.Once);
@@ -113,7 +113,7 @@ public async Task WriteBatchCallsSqlConnectionWrappeCreateSqlBulkCopy()
113113
var expectedDestinationTableName = string.Format(CultureInfo.InvariantCulture, "[{0}].[{1}]", _schemaName, _tableName);
114114

115115
// Act
116-
await _sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
116+
await _sut.WriteBatch(logEvents, _dataTable);
117117

118118
// Assert
119119
_sqlConnectionWrapperMock.Verify(c => c.CreateSqlBulkCopy(false, expectedDestinationTableName), Times.Once);
@@ -128,7 +128,7 @@ public async Task WriteBatchCallsSqlConnectionWrappeCreateSqlBulkCopyWithDisable
128128
var sut = new SqlBulkBatchWriter(_tableName, _schemaName, true, _sqlConnectionFactoryMock.Object, _logEventDataGeneratorMock.Object);
129129

130130
// Act
131-
await sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
131+
await sut.WriteBatch(logEvents, _dataTable);
132132

133133
// Assert
134134
_sqlConnectionWrapperMock.Verify(c => c.CreateSqlBulkCopy(true, expectedDestinationTableName), Times.Once);
@@ -145,7 +145,7 @@ public async Task WriteBatchCallsSqlBulkCopyWrapperAddSqlBulkCopyColumnMappingFo
145145
_dataTable.Columns.Add(new DataColumn(column2Name));
146146

147147
// Act
148-
await _sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
148+
await _sut.WriteBatch(logEvents, _dataTable);
149149

150150
// Assert
151151
_sqlBulkCopyWrapper.Verify(c => c.AddSqlBulkCopyColumnMapping(column1Name, column1Name), Times.Once);
@@ -159,7 +159,7 @@ public async Task WriteBatchCallsSqlBulkCopyWrapperWriteToServerAsync()
159159
var logEvents = CreateLogEvents();
160160

161161
// Act
162-
await _sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
162+
await _sut.WriteBatch(logEvents, _dataTable);
163163

164164
// Assert
165165
_sqlBulkCopyWrapper.Verify(c => c.WriteToServerAsync(_dataTable), Times.Once);
@@ -172,48 +172,48 @@ public async Task WriteBatchClearsDataTable()
172172
var logEvents = CreateLogEvents();
173173

174174
// Act
175-
await _sut.WriteBatch(logEvents, _dataTable).ConfigureAwait(false);
175+
await _sut.WriteBatch(logEvents, _dataTable);
176176

177177
// Assert
178178
Assert.Empty(_dataTable.Rows);
179179
}
180180

181181
[Fact]
182-
public void WriteBatchRethrowsIfLogEventDataGeneratorMockGetColumnsAndValuesThrows()
182+
public async Task WriteBatchRethrowsIfLogEventDataGeneratorMockGetColumnsAndValuesThrows()
183183
{
184184
// Arrange
185185
_logEventDataGeneratorMock.Setup(d => d.GetColumnsAndValues(It.IsAny<LogEvent>()))
186186
.Callback(() => throw new InvalidOperationException());
187187
var logEvents = CreateLogEvents();
188188

189189
// Act + assert
190-
Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
190+
await Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
191191
}
192192

193193
[Fact]
194-
public void WriteBatchRethrowsIfSqlConnectionFactoryCreateThrows()
194+
public async Task WriteBatchRethrowsIfSqlConnectionFactoryCreateThrows()
195195
{
196196
// Arrange
197197
_sqlConnectionFactoryMock.Setup(f => f.Create()).Callback(() => throw new InvalidOperationException());
198198
var logEvents = CreateLogEvents();
199199

200200
// Act + assert
201-
Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
201+
await Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
202202
}
203203

204204
[Fact]
205-
public void WriteBatchRethrowsIfSqlConnectionOpenAsyncThrows()
205+
public async Task WriteBatchRethrowsIfSqlConnectionOpenAsyncThrows()
206206
{
207207
// Arrange
208208
_sqlConnectionWrapperMock.Setup(c => c.OpenAsync()).Callback(() => throw new InvalidOperationException());
209209
var logEvents = CreateLogEvents();
210210

211211
// Act + assert
212-
Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
212+
await Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
213213
}
214214

215215
[Fact]
216-
public void WriteBatchRethrowsIfSqlBulkCopyWriterAddSqlBulkCopyColumnMappingThrows()
216+
public async Task WriteBatchRethrowsIfSqlBulkCopyWriterAddSqlBulkCopyColumnMappingThrows()
217217
{
218218
// Arrange
219219
_sqlBulkCopyWrapper.Setup(c => c.AddSqlBulkCopyColumnMapping(It.IsAny<string>(), It.IsAny<string>()))
@@ -222,19 +222,19 @@ public void WriteBatchRethrowsIfSqlBulkCopyWriterAddSqlBulkCopyColumnMappingThro
222222
_dataTable.Columns.Add(new DataColumn("ColumnName"));
223223

224224
// Act + assert
225-
Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
225+
await Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
226226
}
227227

228228
[Fact]
229-
public void WriteBatchRethrowsIfSqlBulkCopyWriterWriteToServerAsyncThrows()
229+
public async Task WriteBatchRethrowsIfSqlBulkCopyWriterWriteToServerAsyncThrows()
230230
{
231231
// Arrange
232232
_sqlBulkCopyWrapper.Setup(c => c.WriteToServerAsync(It.IsAny<DataTable>()))
233233
.Callback(() => throw new InvalidOperationException());
234234
var logEvents = CreateLogEvents();
235235

236236
// Act + assert
237-
Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
237+
await Assert.ThrowsAsync<InvalidOperationException>(() => _sut.WriteBatch(logEvents, _dataTable));
238238
}
239239

240240
private static List<LogEvent> CreateLogEvents()

‎test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlInsertStatementWriterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public async Task WriteBatchCallsLogEventDataGeneratorGetColumnsAndValuesForEach
192192
var logEvents = CreateLogEvents();
193193

194194
// Act
195-
await _sut.WriteBatch(logEvents).ConfigureAwait(false);
195+
await _sut.WriteBatch(logEvents);
196196

197197
// Assert
198198
_logEventDataGeneratorMock.Verify(c => c.GetColumnsAndValues(logEvents[0]), Times.Once);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void StoresPropertyName()
3333

3434
// Assert
3535
Assert.Equal(propertyName, sut.PropertyName);
36-
Assert.Equal(1, sut.PropertyNameHierarchy.Count);
36+
Assert.Single(sut.PropertyNameHierarchy);
3737
Assert.Equal(propertyName, sut.PropertyNameHierarchy[0]);
3838
Assert.False(sut.HasHierarchicalPropertyName);
3939
}

0 commit comments

Comments
 (0)