Skip to content

Commit 1116a97

Browse files
304NotModified304NotModified
authored
Upgrade to NUnit 4 (#192)
Co-authored-by: Julian Verdurmen <304NotModified@users.noreply.github.com>
1 parent eac72d0 commit 1116a97

File tree

5 files changed

+86
-86
lines changed

5 files changed

+86
-86
lines changed

‎tests/BitPackageTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public class BitPackageTest
4646
[Test]
4747
public void TestPack()
4848
{
49-
Assert.AreEqual(BitPackage.Pack4bits(0,0,0,0,0,0,0,0), 0);
50-
Assert.AreEqual(BitPackage.Pack4bits(1,1,1,1,1,1,1,1), 286331153);
51-
Assert.AreEqual(BitPackage.Pack4bits(2,2,2,2,2,2,2,2), 572662306);
52-
Assert.AreEqual(BitPackage.Pack4bits(15,15,15,15,15,15,15,15), -1);
49+
Assert.That(BitPackage.Pack4bits(0,0,0,0,0,0,0,0), Is.EqualTo(0));
50+
Assert.That(BitPackage.Pack4bits(1,1,1,1,1,1,1,1), Is.EqualTo(286331153));
51+
Assert.That(BitPackage.Pack4bits(2,2,2,2,2,2,2,2), Is.EqualTo(572662306));
52+
Assert.That(BitPackage.Pack4bits(15,15,15,15,15,15,15,15), Is.EqualTo(-1));
5353
}
5454

5555
[Test]
@@ -69,7 +69,7 @@ public void TestUnpack()
6969

7070
for (int i = 0; i < 16; i++) {
7171
int n = pkg.Unpack(i);
72-
Assert.AreEqual(n, i);
72+
Assert.That(n, Is.EqualTo(i));
7373
}
7474
}
7575
}

‎tests/CharsetDetectorTest.cs

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// CharsetDetectorTest.cs created with MonoDevelop
1+
// CharsetDetectorTest.cs created with MonoDevelop
22
//
33
// Author:
44
// Rudi Pettazzi <rudi.pettazzi@gmail.com>
@@ -25,9 +25,9 @@ public void TestAscii()
2525
using (stream)
2626
{
2727
var result = CharsetDetector.DetectFromStream(stream);
28-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
29-
Assert.AreEqual(1.0f, result.Detected.Confidence);
30-
Assert.IsFalse(result.Detected.HasBOM);
28+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
29+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
30+
Assert.That(result.Detected.HasBOM, Is.False);
3131
}
3232
}
3333

@@ -42,9 +42,9 @@ public async Task TestAsciiAsync()
4242
using (stream)
4343
{
4444
var result = await CharsetDetector.DetectFromStreamAsync(stream);
45-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
46-
Assert.AreEqual(1.0f, result.Detected.Confidence);
47-
Assert.IsFalse(result.Detected.HasBOM);
45+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
46+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
47+
Assert.That(result.Detected.HasBOM, Is.False);
4848
}
4949
}
5050

@@ -56,8 +56,8 @@ public void TestAscii_with_HZ_sequence()
5656
using (stream)
5757
{
5858
var result = CharsetDetector.DetectFromStream(stream);
59-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
60-
Assert.AreEqual(1.0f, result.Detected.Confidence);
59+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
60+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
6161
}
6262
}
6363

@@ -69,8 +69,8 @@ public async Task TestAscii_with_HZ_sequenceAsync()
6969
using (stream)
7070
{
7171
var result = await CharsetDetector.DetectFromStreamAsync(stream);
72-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
73-
Assert.AreEqual(1.0f, result.Detected.Confidence);
72+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
73+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
7474
}
7575
}
7676

@@ -98,7 +98,7 @@ public void DetectFromStreamMaxBytes(int? maxBytes, int expectedPosition, int st
9898
CharsetDetector.DetectFromStream(stream, maxBytes);
9999

100100
// Assert
101-
Assert.AreEqual(expectedPosition, stream.Position);
101+
Assert.That(stream.Position, Is.EqualTo(expectedPosition));
102102
}
103103

104104
[Test]
@@ -120,7 +120,7 @@ public async Task DetectFromStreamMaxBytesAsync(int? maxBytes, int expectedPosit
120120
await CharsetDetector.DetectFromStreamAsync(stream, maxBytes);
121121

122122
// Assert
123-
Assert.AreEqual(expectedPosition, stream.Position);
123+
Assert.That(stream.Position, Is.EqualTo(expectedPosition));
124124
}
125125

126126
[Test]
@@ -138,9 +138,9 @@ public void DetectFromByteArray(int offset, int len, string detectedCodepage)
138138
var result = CharsetDetector.DetectFromBytes(bytes, offset, len);
139139

140140
// Assert
141-
Assert.AreEqual(detectedCodepage, result.Detected.EncodingName);
142-
Assert.AreEqual(1.0f, result.Detected.Confidence);
143-
Assert.IsFalse(result.Detected.HasBOM);
141+
Assert.That(result.Detected.EncodingName, Is.EqualTo(detectedCodepage));
142+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
143+
Assert.That(result.Detected.HasBOM, Is.False);
144144
}
145145

146146
[Test]
@@ -153,9 +153,9 @@ public void TestCaseBomUtf7(byte[] bufferBytes)
153153
{
154154
var result = CharsetDetector.DetectFromBytes(bufferBytes)
155155
.Detected;
156-
Assert.AreEqual(CodepageName.UTF7, result.EncodingName);
157-
Assert.AreEqual(1.0f, result.Confidence);
158-
Assert.IsTrue(result.HasBOM);
156+
Assert.That(result.EncodingName, Is.EqualTo(CodepageName.UTF7));
157+
Assert.That(result.Confidence, Is.EqualTo(1.0f));
158+
Assert.That(result.HasBOM, Is.True);
159159
}
160160

161161
[Test]
@@ -164,9 +164,9 @@ public void TestBomGb18030()
164164
var bufferBytes = new byte[] { 0x84, 0x31, 0x95, 0x33 };
165165
var result = CharsetDetector.DetectFromBytes(bufferBytes)
166166
.Detected;
167-
Assert.AreEqual(CodepageName.GB18030, result.EncodingName);
168-
Assert.AreEqual(1.0f, result.Confidence);
169-
Assert.IsTrue(result.HasBOM);
167+
Assert.That(result.EncodingName, Is.EqualTo(CodepageName.GB18030));
168+
Assert.That(result.Confidence, Is.EqualTo(1.0f));
169+
Assert.That(result.HasBOM, Is.True);
170170
}
171171

172172
[Test]
@@ -178,19 +178,19 @@ public void TestUTF8_1()
178178
"利用案内でどうぞ。";
179179
byte[] buf = Encoding.UTF8.GetBytes(s);
180180
var result = CharsetDetector.DetectFromBytes(buf);
181-
Assert.AreEqual(CodepageName.UTF8, result.Detected.EncodingName);
182-
Assert.AreEqual(1.0f, result.Detected.Confidence);
183-
Assert.IsFalse(result.Detected.HasBOM);
181+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF8));
182+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
183+
Assert.That(result.Detected.HasBOM, Is.False);
184184
}
185185

186186
[Test]
187187
public void TestBomUtf8()
188188
{
189189
byte[] buf = { 0xEF, 0xBB, 0xBF, 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0x21 };
190190
var result = CharsetDetector.DetectFromBytes(buf);
191-
Assert.AreEqual(CodepageName.UTF8, result.Detected.EncodingName);
192-
Assert.AreEqual(1.0f, result.Detected.Confidence);
193-
Assert.IsTrue(result.Detected.HasBOM);
191+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF8));
192+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
193+
Assert.That(result.Detected.HasBOM, Is.True);
194194
}
195195

196196
[Test]
@@ -199,9 +199,9 @@ public void Test2byteArrayBomUTF16_BE()
199199
byte[] buf = { 0xFE, 0xFF, };
200200

201201
var result = CharsetDetector.DetectFromBytes(buf);
202-
Assert.AreEqual(CodepageName.UTF16_BE, result.Detected.EncodingName);
203-
Assert.AreEqual(1.0f, result.Detected.Confidence);
204-
Assert.IsTrue(result.Detected.HasBOM);
202+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF16_BE));
203+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
204+
Assert.That(result.Detected.HasBOM, Is.True);
205205
}
206206

207207
[Test]
@@ -210,9 +210,9 @@ public void TestBomUTF16_BE()
210210
byte[] buf = { 0xFE, 0xFF, 0x00, 0x68, 0x00, 0x65 };
211211

212212
var result = CharsetDetector.DetectFromBytes(buf);
213-
Assert.AreEqual(CodepageName.UTF16_BE, result.Detected.EncodingName);
214-
Assert.AreEqual(1.0f, result.Detected.Confidence);
215-
Assert.IsTrue(result.Detected.HasBOM);
213+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF16_BE));
214+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
215+
Assert.That(result.Detected.HasBOM, Is.True);
216216
}
217217

218218
[Test]
@@ -222,9 +222,9 @@ public void TestBomX_ISO_10646_UCS_4_3412()
222222
byte[] buf = { 0xFE, 0xFF, 0x00, 0x00, 0x65 };
223223

224224
var result = CharsetDetector.DetectFromBytes(buf);
225-
Assert.AreEqual(CodepageName.X_ISO_10646_UCS_4_3412, result.Detected.EncodingName);
226-
Assert.AreEqual(1.0f, result.Detected.Confidence);
227-
Assert.IsTrue(result.Detected.HasBOM);
225+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.X_ISO_10646_UCS_4_3412));
226+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
227+
Assert.That(result.Detected.HasBOM, Is.True);
228228
}
229229

230230
[Test]
@@ -234,88 +234,88 @@ public void TestBomX_ISO_10646_UCS_4_2143()
234234
byte[] buf = { 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x65 };
235235

236236
var result = CharsetDetector.DetectFromBytes(buf);
237-
Assert.AreEqual(CodepageName.X_ISO_10646_UCS_4_2143, result.Detected.EncodingName);
238-
Assert.AreEqual(1.0f, result.Detected.Confidence);
239-
Assert.IsTrue(result.Detected.HasBOM);
237+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.X_ISO_10646_UCS_4_2143));
238+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
239+
Assert.That(result.Detected.HasBOM, Is.True);
240240
}
241241

242242
[Test]
243243
public void Test2byteArrayBomUTF16_LE()
244244
{
245245
byte[] buf = { 0xFF, 0xFE, };
246246
var result = CharsetDetector.DetectFromBytes(buf);
247-
Assert.AreEqual(CodepageName.UTF16_LE, result.Detected.EncodingName);
248-
Assert.AreEqual(1.0f, result.Detected.Confidence);
249-
Assert.IsTrue(result.Detected.HasBOM);
247+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF16_LE));
248+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
249+
Assert.That(result.Detected.HasBOM, Is.True);
250250
}
251251

252252
[Test]
253253
public void TestBomUTF16_LE()
254254
{
255255
byte[] buf = { 0xFF, 0xFE, 0x68, 0x00, 0x65, 0x00 };
256256
var result = CharsetDetector.DetectFromBytes(buf);
257-
Assert.AreEqual(CodepageName.UTF16_LE, result.Detected.EncodingName);
258-
Assert.AreEqual(1.0f, result.Detected.Confidence);
259-
Assert.IsTrue(result.Detected.HasBOM);
257+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF16_LE));
258+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
259+
Assert.That(result.Detected.HasBOM, Is.True);
260260
}
261261

262262
[Test]
263263
public void TestBomUTF32_BE()
264264
{
265265
byte[] buf = { 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x68 };
266266
var result = CharsetDetector.DetectFromBytes(buf);
267-
Assert.AreEqual(CodepageName.UTF32_BE, result.Detected.EncodingName);
268-
Assert.AreEqual(1.0f, result.Detected.Confidence);
269-
Assert.IsTrue(result.Detected.HasBOM);
267+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF32_BE));
268+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
269+
Assert.That(result.Detected.HasBOM, Is.True);
270270
}
271271

272272
[Test]
273273
public void TestBomUTF32_LE()
274274
{
275275
byte[] buf = { 0xFF, 0xFE, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00 };
276276
var result = CharsetDetector.DetectFromBytes(buf);
277-
Assert.AreEqual(CodepageName.UTF32_LE, result.Detected.EncodingName);
278-
Assert.AreEqual(1.0f, result.Detected.Confidence);
279-
Assert.IsTrue(result.Detected.HasBOM);
277+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.UTF32_LE));
278+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
279+
Assert.That(result.Detected.HasBOM, Is.True);
280280
}
281281

282282
[Test]
283283
public void TestIssue3()
284284
{
285285
byte[] buf = Encoding.UTF8.GetBytes("3");
286286
var result = CharsetDetector.DetectFromBytes(buf);
287-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
288-
Assert.AreEqual(1.0f, result.Detected.Confidence);
289-
Assert.IsFalse(result.Detected.HasBOM);
287+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
288+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
289+
Assert.That(result.Detected.HasBOM, Is.False);
290290
}
291291

292292
[Test]
293293
public void TestOutOfRange()
294294
{
295295
byte[] buf = Encoding.UTF8.GetBytes("3");
296296
var result = CharsetDetector.DetectFromBytes(buf);
297-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
298-
Assert.AreEqual(1.0f, result.Detected.Confidence);
299-
Assert.IsFalse(result.Detected.HasBOM);
297+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
298+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
299+
Assert.That(result.Detected.HasBOM, Is.False);
300300
}
301301

302302
[Test]
303303
public void TestOutOfRange2()
304304
{
305305
byte[] buf = Encoding.UTF8.GetBytes("1234567890");
306306
var result = CharsetDetector.DetectFromBytes(buf);
307-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
308-
Assert.AreEqual(1.0f, result.Detected.Confidence);
309-
Assert.IsFalse(result.Detected.HasBOM);
307+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
308+
Assert.That(result.Detected.Confidence, Is.EqualTo(1.0f));
309+
Assert.That(result.Detected.HasBOM, Is.False);
310310
}
311311

312312
[Test]
313313
public void TestSingleChar()
314314
{
315315
byte[] buf = Encoding.UTF8.GetBytes("3");
316316
var result = CharsetDetector.DetectFromBytes(buf);
317-
Assert.AreEqual(CodepageName.ASCII, result.Detected.EncodingName);
318-
Assert.AreEqual(1, result.Detected.Confidence);
319-
Assert.IsFalse(result.Detected.HasBOM);
317+
Assert.That(result.Detected.EncodingName, Is.EqualTo(CodepageName.ASCII));
318+
Assert.That(result.Detected.Confidence, Is.EqualTo(1));
319+
Assert.That(result.Detected.HasBOM, Is.False);
320320
}
321-
}
321+
}

‎tests/CharsetDetectorTestBatch.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class CharsetDetectorTestBatch : IDisposable
2525
public CharsetDetectorTestBatch()
2626
{
2727
string frameworkName = GetCurrentFrameworkName();
28-
Assert.IsNotEmpty(frameworkName, "Framework name should not be empty");
28+
Assert.That(frameworkName, Is.Not.Empty, "Framework name should not be empty");
2929
_logWriter = new StreamWriter(Path.Combine(TESTS_ROOT, $"test-diag-{frameworkName}.log"));
3030
}
3131

@@ -92,9 +92,8 @@ public void TestFileUnsupportedEncodings(TestCase testCase)
9292
$"- {testCase.InputFile.FullName} ({testCase.ExpectedEncoding}) -> ",
9393
$"{JsonConvert.SerializeObject(result, Formatting.Indented, new EncodingJsonConverter())}"));
9494

95-
StringAssert.AreEqualIgnoringCase(
96-
testCase.ExpectedEncoding,
97-
detected.EncodingName,
95+
Assert.That(detected.EncodingName,
96+
Is.EqualTo(testCase.ExpectedEncoding).IgnoreCase,
9897
string.Concat(
9998
$"Charset detection failed for {testCase.InputFile.FullName}. ",
10099
$"Expected: {testCase.ExpectedEncoding}. ",
@@ -112,9 +111,8 @@ public async Task TestFileUnsupportedEncodingsAsync(TestCase testCase)
112111
$"- {testCase.InputFile.FullName} ({testCase.ExpectedEncoding}) -> ",
113112
$"{JsonConvert.SerializeObject(result, Formatting.Indented, new EncodingJsonConverter())}"));
114113

115-
StringAssert.AreEqualIgnoringCase(
116-
testCase.ExpectedEncoding,
117-
detected.EncodingName,
114+
Assert.That(detected.EncodingName,
115+
Is.EqualTo(testCase.ExpectedEncoding).IgnoreCase,
118116
string.Concat(
119117
$"Charset detection failed for {testCase.InputFile.FullName}. ",
120118
$"Expected: {testCase.ExpectedEncoding}. ",
@@ -188,9 +186,10 @@ private void TestFile(string expectedCharset, string file)
188186
var detected = result.Detected;
189187

190188
_logWriter.WriteLine($"- {file} ({expectedCharset}) -> {JsonConvert.SerializeObject(result, Formatting.Indented, new EncodingJsonConverter())}");
191-
StringAssert.AreEqualIgnoringCase(expectedCharset, detected.EncodingName,
189+
Assert.That(detected.EncodingName,
190+
Is.EqualTo(expectedCharset).IgnoreCase,
192191
$"Charset detection failed for {file}. Expected: {expectedCharset}, detected: {detected.EncodingName} ({detected.Confidence * 100.0f:0.00############}% confidence)");
193-
Assert.NotNull(detected.Encoding);
192+
Assert.That(detected.Encoding, Is.Not.Null);
194193
}
195194

196195

@@ -200,9 +199,10 @@ private async Task TestFileAsync(string expectedCharset, string file)
200199
var detected = result.Detected;
201200

202201
_logWriter.WriteLine($"- {file} ({expectedCharset}) -> {JsonConvert.SerializeObject(result, Formatting.Indented, new EncodingJsonConverter())}");
203-
StringAssert.AreEqualIgnoringCase(expectedCharset, detected.EncodingName,
202+
Assert.That(detected.EncodingName,
203+
Is.EqualTo(expectedCharset).IgnoreCase,
204204
$"Charset detection failed for {file}. Expected: {expectedCharset}, detected: {detected.EncodingName} ({detected.Confidence * 100.0f:0.00############}% confidence)");
205-
Assert.NotNull(detected.Encoding);
205+
Assert.That(detected.Encoding, Is.Not.Null);
206206
}
207207

208208
private string GetCurrentFrameworkName()
@@ -244,4 +244,4 @@ public void Cleanup()
244244
{
245245
Dispose();
246246
}
247-
}
247+
}

0 commit comments

Comments
 (0)