Skip to content

Commit b008475

Browse files
FreeAndNilFreeAndNil
authored
Merge pull request #200 from apache/Feature/NUnitBump
bumped NUnit to 4.2.2
2 parents 884dbf6 + 39ed3b3 commit b008475

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+872
-960
lines changed

‎.editorconfig‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@ dotnet_naming_style.prefix_underscore.required_prefix = _
4040

4141
dotnet_naming_symbols.interface.applicable_kinds = interface
4242
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
43-
dotnet_naming_symbols.interface.required_modifiers =
43+
dotnet_naming_symbols.interface.required_modifiers =
4444

4545
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
4646
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
47-
dotnet_naming_symbols.types.required_modifiers =
47+
dotnet_naming_symbols.types.required_modifiers =
4848

4949
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
5050
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
51-
dotnet_naming_symbols.non_field_members.required_modifiers =
51+
dotnet_naming_symbols.non_field_members.required_modifiers =
5252

5353
# Naming styles
5454

5555
dotnet_naming_style.begins_with_i.required_prefix = I
56-
dotnet_naming_style.begins_with_i.required_suffix =
57-
dotnet_naming_style.begins_with_i.word_separator =
56+
dotnet_naming_style.begins_with_i.required_suffix =
57+
dotnet_naming_style.begins_with_i.word_separator =
5858
dotnet_naming_style.begins_with_i.capitalization = pascal_case
5959

60-
dotnet_naming_style.pascal_case.required_prefix =
61-
dotnet_naming_style.pascal_case.required_suffix =
62-
dotnet_naming_style.pascal_case.word_separator =
60+
dotnet_naming_style.pascal_case.required_prefix =
61+
dotnet_naming_style.pascal_case.required_suffix =
62+
dotnet_naming_style.pascal_case.word_separator =
6363
dotnet_naming_style.pascal_case.capitalization = pascal_case
6464
dotnet_style_operator_placement_when_wrapping = beginning_of_line
6565
tab_width = 2
@@ -79,7 +79,7 @@ dotnet_style_prefer_inferred_tuple_names = true:suggestion
7979
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
8080
dotnet_style_prefer_compound_assignment = true:suggestion
8181
dotnet_style_prefer_simplified_interpolation = true:suggestion
82-
dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
82+
dotnet_style_prefer_collection_expression = when_types_loosely_match:none
8383
dotnet_style_namespace_match_folder = true:suggestion
8484
dotnet_style_readonly_field = true:suggestion
8585
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
@@ -121,7 +121,7 @@ csharp_space_around_binary_operators = before_and_after
121121
csharp_style_prefer_local_over_anonymous_function = true:suggestion
122122
csharp_style_prefer_index_operator = true:suggestion
123123
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
124-
csharp_style_prefer_range_operator = true:suggestion
124+
csharp_style_prefer_range_operator = true:none
125125
csharp_style_prefer_tuple_swap = true:suggestion
126126
csharp_style_prefer_utf8_string_literals = true:suggestion
127127
csharp_style_inlined_variable_declaration = true:suggestion
@@ -165,4 +165,8 @@ dotnet_diagnostic.KR1012.severity = none
165165
# KR1013: Name base classes correctly
166166
dotnet_diagnostic.KR1013.severity = none
167167
# KR1037: Use EnvironmentHelper instead of DateTime.
168-
dotnet_diagnostic.KR1037.severity = none
168+
dotnet_diagnostic.KR1037.severity = none
169+
# NUnit2045: Use Assert.Multiple
170+
dotnet_diagnostic.NUnit2045.severity = none
171+
# IDE0079: Remove unnecessary suppressions
172+
dotnet_diagnostic.IDE0079.severity = none

‎src/Directory.Build.props‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
<SystemConfigurationConfigurationManagerPackageVersion>4.5.0</SystemConfigurationConfigurationManagerPackageVersion>
1212
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0</MicrosoftSourceLinkGitHubPackageVersion>
1313
<!-- Test Packages -->
14-
<MicrosoftNetTestSdkPackageVersion>17.9.0</MicrosoftNetTestSdkPackageVersion>
15-
<NUnitPackageVersion>3.14.0</NUnitPackageVersion>
16-
<NUnit3TestAdapterPackageVersion>4.5.0</NUnit3TestAdapterPackageVersion>
17-
<QuackersTestLoggerPackageVersion>1.0.24</QuackersTestLoggerPackageVersion>
14+
<MicrosoftNetTestSdkPackageVersion>17.11.1</MicrosoftNetTestSdkPackageVersion>
15+
<NUnitAnalyzersPackageVersion>4.3.0</NUnitAnalyzersPackageVersion>
16+
<NUnitPackageVersion>4.2.2</NUnitPackageVersion>
17+
<NUnit3TestAdapterPackageVersion>4.6.0</NUnit3TestAdapterPackageVersion>
18+
<QuackersTestLoggerPackageVersion>1.0.25</QuackersTestLoggerPackageVersion>
1819
</PropertyGroup>
1920
</Project>

‎src/log4net.Tests/Appender/AdoNetAppenderTest.cs‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public void NoBufferingTest()
5252

5353
ILog log = LogManager.GetLogger(rep.Name, "NoBufferingTest");
5454
log.Debug("Message");
55-
Assert.NotNull(Log4NetCommand.MostRecentInstance);
56-
Assert.AreEqual(1, Log4NetCommand.MostRecentInstance!.ExecuteNonQueryCount);
55+
Assert.That(Log4NetCommand.MostRecentInstance, Is.Not.Null);
56+
Assert.That(Log4NetCommand.MostRecentInstance!.ExecuteNonQueryCount, Is.EqualTo(1));
5757
}
5858

5959
[Test]
@@ -76,11 +76,11 @@ public void BufferingTest()
7676
for (int i = 0; i < bufferSize; i++)
7777
{
7878
log.Debug("Message");
79-
Assert.IsNull(Log4NetCommand.MostRecentInstance);
79+
Assert.That(Log4NetCommand.MostRecentInstance, Is.Null);
8080
}
8181
log.Debug("Message");
82-
Assert.NotNull(Log4NetCommand.MostRecentInstance);
83-
Assert.AreEqual(bufferSize + 1, Log4NetCommand.MostRecentInstance!.ExecuteNonQueryCount);
82+
Assert.That(Log4NetCommand.MostRecentInstance, Is.Not.Null);
83+
Assert.That(Log4NetCommand.MostRecentInstance!.ExecuteNonQueryCount, Is.EqualTo(bufferSize + 1));
8484
}
8585

8686
[Test]
@@ -150,25 +150,23 @@ public void WebsiteExample()
150150
log.Debug("Message");
151151

152152
IDbCommand? command = Log4NetCommand.MostRecentInstance;
153-
Assert.NotNull(command);
153+
Assert.That(command, Is.Not.Null);
154154

155-
Assert.AreEqual(
156-
"INSERT INTO Log ([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date, @thread, @log_level, @logger, @message, @exception)",
157-
command!.CommandText);
158-
159-
Assert.AreEqual(6, command.Parameters.Count);
155+
Assert.That(command.CommandText,
156+
Is.EqualTo("INSERT INTO Log ([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date, @thread, @log_level, @logger, @message, @exception)"));
157+
Assert.That(command.Parameters, Has.Count.EqualTo(6));
160158

161159
IDbDataParameter param = (IDbDataParameter)command.Parameters["@message"];
162-
Assert.AreEqual("Message", param.Value);
160+
Assert.That(param.Value, Is.EqualTo("Message"));
163161

164162
param = (IDbDataParameter)command.Parameters["@log_level"];
165-
Assert.AreEqual(Level.Debug.ToString(), param.Value);
163+
Assert.That(param.Value, Is.EqualTo(Level.Debug.ToString()));
166164

167165
param = (IDbDataParameter)command.Parameters["@logger"];
168-
Assert.AreEqual("WebsiteExample", param.Value);
166+
Assert.That(param.Value, Is.EqualTo("WebsiteExample"));
169167

170168
param = (IDbDataParameter)command.Parameters["@exception"];
171-
Assert.IsEmpty((string?)param.Value);
169+
Assert.That((string?)param.Value, Is.Empty);
172170
}
173171

174172
[Test]
@@ -242,25 +240,24 @@ public void BufferingWebsiteExample()
242240
}
243241

244242
IDbCommand? command = Log4NetCommand.MostRecentInstance;
245-
Assert.NotNull(command);
243+
Assert.That(command, Is.Not.Null);
246244

247-
Assert.AreEqual(
248-
"INSERT INTO Log ([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date, @thread, @log_level, @logger, @message, @exception)",
249-
command!.CommandText);
245+
Assert.That(command!.CommandText,
246+
Is.EqualTo("INSERT INTO Log ([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date, @thread, @log_level, @logger, @message, @exception)"));
250247

251-
Assert.AreEqual(6, command.Parameters.Count);
248+
Assert.That(command.Parameters, Has.Count.EqualTo(6));
252249

253250
IDbDataParameter param = (IDbDataParameter)command.Parameters["@message"];
254-
Assert.AreEqual("Message", param.Value);
251+
Assert.That(param.Value, Is.EqualTo("Message"));
255252

256253
param = (IDbDataParameter)command.Parameters["@log_level"];
257-
Assert.AreEqual(Level.Debug.ToString(), param.Value);
254+
Assert.That(param.Value, Is.EqualTo(Level.Debug.ToString()));
258255

259256
param = (IDbDataParameter)command.Parameters["@logger"];
260-
Assert.AreEqual("WebsiteExample", param.Value);
257+
Assert.That(param.Value, Is.EqualTo("WebsiteExample"));
261258

262259
param = (IDbDataParameter)command.Parameters["@exception"];
263-
Assert.IsEmpty((string?)param.Value);
260+
Assert.That(param.Value, Is.Empty);
264261
}
265262

266263
[Test]
@@ -295,11 +292,11 @@ public void NullPropertyXmlConfig()
295292

296293
log.Debug("Message");
297294
IDbCommand? command = Log4NetCommand.MostRecentInstance;
298-
Assert.NotNull(command);
295+
Assert.That(command, Is.Not.Null);
299296

300297
IDbDataParameter param = (IDbDataParameter)command!.Parameters["@productId"];
301-
Assert.AreNotEqual(SystemInfo.NullText, param.Value);
302-
Assert.AreEqual(DBNull.Value, param.Value);
298+
Assert.That(param.Value, Is.Not.EqualTo(SystemInfo.NullText));
299+
Assert.That(param.Value, Is.EqualTo(DBNull.Value));
303300
}
304301

305302
[Test]
@@ -332,10 +329,10 @@ public void NullPropertyProgrammaticConfig()
332329

333330
log.Debug("Message");
334331
IDbCommand? command = Log4NetCommand.MostRecentInstance;
335-
Assert.NotNull(command);
332+
Assert.That(command, Is.Not.Null);
336333

337334
IDbDataParameter param = (IDbDataParameter)command!.Parameters["@productId"];
338-
Assert.AreNotEqual(SystemInfo.NullText, param.Value);
339-
Assert.AreEqual(DBNull.Value, param.Value);
335+
Assert.That(param.Value, Is.Not.EqualTo(SystemInfo.NullText));
336+
Assert.That(param.Value, Is.EqualTo(DBNull.Value));
340337
}
341338
}

‎src/log4net.Tests/Appender/AppenderCollectionTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public void ToArrayTest()
4444

4545
IAppender[] appenderArray = appenderCollection.ToArray();
4646

47-
Assert.AreEqual(1, appenderArray.Length);
48-
Assert.AreEqual(appender, appenderArray[0]);
47+
Assert.That(appenderArray, Has.Length.EqualTo(1));
48+
Assert.That(appenderArray[0], Is.EqualTo(appender));
4949
}
5050

5151
[Test]
@@ -58,7 +58,7 @@ public void ReadOnlyToArrayTest()
5858

5959
IAppender[] appenderArray = readonlyAppenderCollection.ToArray();
6060

61-
Assert.AreEqual(1, appenderArray.Length);
62-
Assert.AreEqual(appender, appenderArray[0]);
61+
Assert.That(appenderArray, Has.Length.EqualTo(1));
62+
Assert.That(appenderArray[0], Is.EqualTo(appender));
6363
}
6464
}

‎src/log4net.Tests/Appender/BufferingAppenderTest.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ public void TestSetupAppender()
6363
{
6464
SetupRepository();
6565

66-
Assert.AreEqual(0, _countingAppender.Counter, "Test empty appender");
66+
Assert.That(_countingAppender.Counter, Is.EqualTo(0), "Test empty appender");
6767

6868
ILogger logger = _hierarchy.GetLogger("test");
6969
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message logged", null);
7070

71-
Assert.AreEqual(1, _countingAppender.Counter, "Test 1 event logged");
71+
Assert.That(_countingAppender.Counter, Is.EqualTo(1), "Test 1 event logged");
7272
}
7373

7474
[Test]
@@ -79,25 +79,25 @@ public void TestBufferSize5()
7979
_bufferingForwardingAppender.BufferSize = 5;
8080
_bufferingForwardingAppender.ActivateOptions();
8181

82-
Assert.AreEqual(_countingAppender.Counter, 0);
82+
Assert.That(_countingAppender.Counter, Is.EqualTo(0));
8383

8484
ILogger logger = _hierarchy.GetLogger("test");
8585

8686
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 1", null);
87-
Assert.AreEqual(0, _countingAppender.Counter, "Test 1 event in buffer");
87+
Assert.That(_countingAppender.Counter, Is.EqualTo(0), "Test 1 event in buffer");
8888
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 2", null);
89-
Assert.AreEqual(0, _countingAppender.Counter, "Test 2 event in buffer");
89+
Assert.That(_countingAppender.Counter, Is.EqualTo(0), "Test 2 event in buffer");
9090
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 3", null);
91-
Assert.AreEqual(0, _countingAppender.Counter, "Test 3 event in buffer");
91+
Assert.That(_countingAppender.Counter, Is.EqualTo(0), "Test 3 event in buffer");
9292
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 4", null);
93-
Assert.AreEqual(0, _countingAppender.Counter, "Test 4 event in buffer");
93+
Assert.That(_countingAppender.Counter, Is.EqualTo(0), "Test 4 event in buffer");
9494
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 5", null);
95-
Assert.AreEqual(0, _countingAppender.Counter, "Test 5 event in buffer");
95+
Assert.That(_countingAppender.Counter, Is.EqualTo(0), "Test 5 event in buffer");
9696
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 6", null);
97-
Assert.AreEqual(6, _countingAppender.Counter, "Test 0 event in buffer. 6 event sent");
97+
Assert.That(_countingAppender.Counter, Is.EqualTo(6), "Test 0 event in buffer. 6 event sent");
9898
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 7", null);
99-
Assert.AreEqual(6, _countingAppender.Counter, "Test 1 event in buffer. 6 event sent");
99+
Assert.That(_countingAppender.Counter, Is.EqualTo(6), "Test 1 event in buffer. 6 event sent");
100100
logger.Log(typeof(BufferingAppenderTest), Level.Warn, "Message 8", null);
101-
Assert.AreEqual(6, _countingAppender.Counter, "Test 2 event in buffer. 6 event sent");
101+
Assert.That(_countingAppender.Counter, Is.EqualTo(6), "Test 2 event in buffer. 6 event sent");
102102
}
103103
}

‎src/log4net.Tests/Appender/DebugAppenderTest.cs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public void NullCategoryTest()
5858
ILog log = LogManager.GetLogger(rep.Name, GetType());
5959
log.Debug("Message");
6060

61-
Assert.IsNull(categoryTraceListener.Category);
61+
Assert.That(categoryTraceListener.Category, Is.Null);
6262

63-
Assert.IsFalse(testErrHandler.ErrorOccured);
63+
Assert.That(testErrHandler.ErrorOccured, Is.False);
6464

6565
Debug.Listeners.Remove(categoryTraceListener);
6666
}
@@ -86,7 +86,7 @@ public void EmptyStringCategoryTest()
8686
ILog log = LogManager.GetLogger(rep.Name, GetType());
8787
log.Debug("Message");
8888

89-
Assert.IsNull(categoryTraceListener.Category);
89+
Assert.That(categoryTraceListener.Category, Is.Null);
9090

9191
Debug.Listeners.Remove(categoryTraceListener);
9292
}
@@ -110,9 +110,9 @@ public void DefaultCategoryTest()
110110
ILog log = LogManager.GetLogger(rep.Name, GetType());
111111
log.Debug("Message");
112112

113-
Assert.AreEqual(
114-
GetType().ToString(),
115-
categoryTraceListener.Category);
113+
Assert.That(
114+
categoryTraceListener.Category,
115+
Is.EqualTo(GetType().ToString()));
116116

117117
Debug.Listeners.Remove(categoryTraceListener);
118118
}
@@ -137,9 +137,9 @@ public void MethodNameCategoryTest()
137137
ILog log = LogManager.GetLogger(rep.Name, GetType());
138138
log.Debug("Message");
139139

140-
Assert.AreEqual(
141-
MethodInfo.GetCurrentMethod().Name,
142-
categoryTraceListener.Category);
140+
Assert.That(
141+
categoryTraceListener.Category,
142+
Is.EqualTo(MethodInfo.GetCurrentMethod().Name));
143143

144144
Debug.Listeners.Remove(categoryTraceListener);
145145
}
@@ -149,19 +149,13 @@ private sealed class TestErrorHandler : IErrorHandler
149149
public bool ErrorOccured { get; private set; }
150150

151151
public void Error(string message, Exception? e, ErrorCode errorCode)
152-
{
153-
ErrorOccured = true;
154-
}
152+
=> ErrorOccured = true;
155153

156154
public void Error(string message, Exception e)
157-
{
158-
Error(message, e, ErrorCode.GenericFailure);
159-
}
155+
=> Error(message, e, ErrorCode.GenericFailure);
160156

161157
public void Error(string message)
162-
{
163-
Error(message, null, ErrorCode.GenericFailure);
164-
}
158+
=> Error(message, null, ErrorCode.GenericFailure);
165159
}
166160
}
167161
#endif

0 commit comments

Comments
 (0)