Skip to content

Commit a6cd1cd

Browse files
committed
Manually fix remaining NUnit2050 warnings
1 parent 4733aba commit a6cd1cd

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

src/NHibernate.Test/NHAssert.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public static class NHAssert
1919

2020
public static void HaveSerializableAttribute(System.Type clazz)
2121
{
22-
HaveSerializableAttribute(clazz, null, null);
22+
HaveSerializableAttribute(clazz, null);
2323
}
2424

25-
public static void HaveSerializableAttribute(System.Type clazz, string message, params object[] args)
25+
public static void HaveSerializableAttribute(System.Type clazz, string message)
2626
{
27-
Assert.That(clazz, Has.Attribute<SerializableAttribute>(), message, args);
27+
Assert.That(clazz, Has.Attribute<SerializableAttribute>(), message);
2828
}
2929

3030
public static void InheritedAreMarkedSerializable(System.Type clazz)
@@ -54,15 +54,15 @@ public static void InheritedAreMarkedSerializable(System.Type clazz, string mess
5454

5555
public static void IsSerializable(object obj)
5656
{
57-
IsSerializable(obj, null, null);
57+
IsSerializable(obj, null);
5858
}
5959

60-
public static void IsSerializable(object obj, string message, params object[] args)
60+
public static void IsSerializable(object obj, string message)
6161
{
6262
#if NETFX
63-
Assert.That(obj, Is.BinarySerializable, message, args);
63+
Assert.That(obj, Is.BinarySerializable, message);
6464
#else
65-
if (obj == null) throw new ArgumentNullException(nameof(args));
65+
if (obj == null) throw new ArgumentNullException(nameof(obj));
6666
var formatter = new BinaryFormatter
6767
{
6868
SurrogateSelector = new SerializationHelper.SurrogateSelector()
@@ -83,19 +83,19 @@ public static void IsSerializable(object obj, string message, params object[] ar
8383
}
8484
}
8585

86-
Assert.That(isSuccess, message, args);
86+
Assert.That(isSuccess, message);
8787
#endif
8888
}
8989

9090
public static void IsXmlSerializable(object obj)
9191
{
92-
IsXmlSerializable(obj, null, null);
92+
IsXmlSerializable(obj, null);
9393
}
9494

95-
public static void IsXmlSerializable(object obj, string message, params object[] args)
95+
public static void IsXmlSerializable(object obj, string message)
9696
{
9797
#if NETFX
98-
Assert.That(obj, Is.XmlSerializable, message, args);
98+
Assert.That(obj, Is.XmlSerializable, message);
9999
#else
100100
if (obj == null) throw new ArgumentNullException(nameof(obj));
101101
var isSuccess = false;
@@ -116,7 +116,7 @@ public static void IsXmlSerializable(object obj, string message, params object[]
116116
}
117117
}
118118

119-
Assert.That(isSuccess, message, args);
119+
Assert.That(isSuccess, message);
120120
#endif
121121
}
122122

src/NHibernate.Test/ProxyTest/PeVerifier.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ public void AssertIsValid()
6262
var result = process.ExitCode + " code ";
6363

6464
if (process.ExitCode != 0)
65-
Assert.Fail("PeVerify reported error(s): " + Environment.NewLine + processOutput, result);
65+
Assert.Fail(
66+
$@"PeVerify reported error(s):
67+
{processOutput}
68+
69+
{result}");
6670
}
6771
}
6872
}

src/NHibernate.Test/TypesTest/SerializableTypesFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void EachEmbeddedBasicTypeIsSerializable()
3333
foreach (var fieldInfo in builtInCustomTypes)
3434
{
3535
var ntp = (IType) fieldInfo.GetValue(null);
36-
NHAssert.IsSerializable(ntp, fieldInfo.Name + " is not serializable");
36+
NHAssert.IsSerializable(ntp, $"{fieldInfo.Name} is not serializable");
3737
}
3838

3939
if (typeof(System.Type).IsSerializable)

0 commit comments

Comments
 (0)