Skip to content

Commit 6211bb9

Browse files
committed
Apply nunit suggestions
1 parent 61133db commit 6211bb9

36 files changed

+946
-559
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
[*.cs]
22

3+
dotnet_style_namespace_match_folder = false
4+
5+
# IDE0130: Namespace does not match folder structure
6+
dotnet_diagnostic.IDE0130.severity = none
7+
38
# CA1812: Internal types instantiated via reflection/deserialization in tests
49
dotnet_diagnostic.CA1812.severity = none

ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectConsecutiveSerializationTestCase.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,11 @@ public void SerializesToBinaryStructure()
3535
using var stream = new MemoryStream();
3636
KVSerializer.Create(KVSerializationFormat.KeyValues1Binary).Serialize(stream, first);
3737
KVSerializer.Create(KVSerializationFormat.KeyValues1Binary).Serialize(stream, second);
38-
Assert.That(stream.ToArray(), Is.EqualTo(expectedData));
39-
Assert.That(stream.CanRead, Is.True);
38+
using (Assert.EnterMultipleScope())
39+
{
40+
Assert.That(stream.ToArray(), Is.EqualTo(expectedData));
41+
Assert.That(stream.CanRead, Is.True);
42+
}
4043
}
4144
}
4245
}

ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectSerializationTestCase.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,17 @@ public void SerializesToBinaryStructure()
5050

5151
ms.Seek(0, SeekOrigin.Begin);
5252
var deserialized = KVSerializer.Create(KVSerializationFormat.KeyValues1Binary).Deserialize(ms);
53-
Assert.That(deserialized.Name, Is.EqualTo("TestObject"));
54-
Assert.That((string)deserialized["key"], Is.EqualTo("value"));
55-
Assert.That((string)deserialized["key_utf8"], Is.EqualTo("邪恶的战"));
56-
Assert.That((int)deserialized["int"], Is.EqualTo(0x10203040));
57-
Assert.That((float)deserialized["flt"], Is.EqualTo(1234.5678f));
58-
Assert.That((IntPtr)deserialized["ptr"], Is.EqualTo(new IntPtr(0x12345678)));
59-
Assert.That((ulong)deserialized["lng"], Is.EqualTo(0x8877665544332211u));
60-
Assert.That((long)deserialized["i64"], Is.EqualTo(0x0102030405060708));
53+
using (Assert.EnterMultipleScope())
54+
{
55+
Assert.That(deserialized.Name, Is.EqualTo("TestObject"));
56+
Assert.That((string)deserialized["key"], Is.EqualTo("value"));
57+
Assert.That((string)deserialized["key_utf8"], Is.EqualTo("邪恶的战"));
58+
Assert.That((int)deserialized["int"], Is.EqualTo(0x10203040));
59+
Assert.That((float)deserialized["flt"], Is.EqualTo(1234.5678f));
60+
Assert.That((IntPtr)deserialized["ptr"], Is.EqualTo(new IntPtr(0x12345678)));
61+
Assert.That((ulong)deserialized["lng"], Is.EqualTo(0x8877665544332211u));
62+
Assert.That((long)deserialized["i64"], Is.EqualTo(0x0102030405060708));
63+
}
6164
}
6265

6366
[Test]
@@ -79,7 +82,7 @@ public void NewValueTypesAreWidenedInBinarySerialization()
7982
ms.Seek(0, SeekOrigin.Begin);
8083
var deserialized = KVSerializer.Create(KVSerializationFormat.KeyValues1Binary).Deserialize(ms);
8184

82-
Assert.Multiple(() =>
85+
using (Assert.EnterMultipleScope())
8386
{
8487
Assert.That((int)deserialized["bool"], Is.EqualTo(1));
8588
Assert.That((int)deserialized["i16"], Is.EqualTo(42));
@@ -88,7 +91,7 @@ public void NewValueTypesAreWidenedInBinarySerialization()
8891
Assert.That((float)deserialized["f64"], Is.EqualTo(3.14f).Within(0.01));
8992
Assert.That((string)deserialized["blob"], Is.EqualTo("AB CD"));
9093
Assert.That((string)deserialized["null"], Is.EqualTo(string.Empty));
91-
});
94+
}
9295
}
9396
}
9497
}

ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectSerializationTypedTestCase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void SerializesToBinaryStructure()
7171

7272
ms.Seek(0, SeekOrigin.Begin);
7373
var deserialized = KVSerializer.Create(KVSerializationFormat.KeyValues1Binary).Deserialize<TestObject>(ms);
74-
Assert.Multiple(() =>
74+
using (Assert.EnterMultipleScope())
7575
{
7676
Assert.That(deserialized.ptr, Is.EqualTo(kvo.ptr));
7777
Assert.That(deserialized.key, Is.EqualTo(kvo.key));
@@ -80,7 +80,7 @@ public void SerializesToBinaryStructure()
8080
Assert.That(deserialized.flt, Is.EqualTo(kvo.flt));
8181
Assert.That(deserialized.lng, Is.EqualTo(kvo.lng));
8282
Assert.That(deserialized.i64, Is.EqualTo(kvo.i64));
83-
});
83+
}
8484
}
8585
}
8686
}

0 commit comments

Comments
 (0)