Skip to content

Commit 6f10f06

Browse files
mfklmfkl
committed
test: update NUnit and tests
1 parent 706692f commit 6f10f06

11 files changed

+105
-105
lines changed

‎src/LibVLCSharp.Tests/DialogTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public async Task PostLogin()
3838
mp.Play();
3939

4040
await tcs.Task;
41-
Assert.True(tcs.Task.Result);
41+
Assert.That(tcs.Task.Result);
4242
}
4343

4444
[Test]
@@ -67,7 +67,7 @@ public async Task ShouldThrowIfPostLoginsTwice()
6767
mp.Play();
6868

6969
await tcs.Task;
70-
Assert.True(tcs.Task.Result);
70+
Assert.That(tcs.Task.Result);
7171
}
7272

7373
[Test]
@@ -80,9 +80,9 @@ public async Task ShouldNotThrowAndReturnFalseIfDimissingTwice()
8080
(dialog, title, text, username, store, token) =>
8181
{
8282
var result = dialog.Dismiss();
83-
Assert.IsTrue(result);
83+
Assert.That(result, Is.True);
8484
result = dialog.Dismiss();
85-
Assert.IsFalse(result);
85+
Assert.That(result, Is.False);
8686
tcs.TrySetResult(true);
8787
return Task.CompletedTask;
8888
},
@@ -98,7 +98,7 @@ public async Task ShouldNotThrowAndReturnFalseIfDimissingTwice()
9898
mp.Play();
9999

100100
await tcs.Task;
101-
Assert.True(tcs.Task.Result);
101+
Assert.That(tcs.Task.Result);
102102
}
103103

104104
[Test]
@@ -110,11 +110,11 @@ public void ShouldUnsetDialogHandlersWhenInstanceDisposed()
110110
(dialog, title, text, indeterminate, position, cancelText, token) => Task.CompletedTask,
111111
(dialog, position, text) => Task.CompletedTask);
112112

113-
Assert.True(_libVLC.DialogHandlersSet);
113+
Assert.That(_libVLC.DialogHandlersSet);
114114

115115
_libVLC.Dispose();
116116

117-
Assert.False(_libVLC.DialogHandlersSet);
117+
Assert.That(_libVLC.DialogHandlersSet, Is.False);
118118
}
119119
}
120120
}

‎src/LibVLCSharp.Tests/EqualizerTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public void BasicNativeCallTest()
1212
{
1313
var equalizer = new Equalizer();
1414
equalizer.SetAmp(-1, 1);
15-
Assert.AreEqual(-1, equalizer.Amp(1));
15+
Assert.That(-1 == equalizer.Amp(1));
1616
}
1717

1818
[Test]
@@ -21,7 +21,7 @@ public void DisposeEqualizer()
2121
var equalizer = new Equalizer();
2222
equalizer.SetAmp(-1, 1);
2323
equalizer.Dispose();
24-
Assert.AreEqual(IntPtr.Zero, equalizer.NativeReference);
24+
Assert.That(IntPtr.Zero == equalizer.NativeReference);
2525
}
2626
}
27-
}
27+
}

‎src/LibVLCSharp.Tests/EventManagerTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ public void MetaChangedEventSubscribe()
1717
const MetadataType description = MetadataType.Description;
1818
media.MetaChanged += (sender, args) =>
1919
{
20-
Assert.AreEqual(description, args.MetadataType);
20+
Assert.That(description == args.MetadataType);
2121
eventHandlerCalled = true;
2222
};
2323
media.SetMeta(MetadataType.Description, "test");
24-
Assert.True(eventHandlerCalled);
24+
Assert.That(eventHandlerCalled);
2525
}
2626

27-
public void DurationChanged()
27+
public async void DurationChanged()
2828
{
2929
var media = new Media(_libVLC, RealMp3Path);
3030
var called = false;
@@ -36,10 +36,10 @@ public void DurationChanged()
3636
duration = args.Duration;
3737
};
3838

39-
media.Parse();
39+
await media.Parse();
4040

41-
Assert.True(called);
42-
Assert.NotZero(duration);
41+
Assert.That(called);
42+
Assert.That(duration, Is.Not.Zero);
4343
}
4444

4545
[Test]
@@ -54,7 +54,7 @@ public void FreedMedia()
5454

5555
media.Dispose();
5656

57-
Assert.True(eventCalled);
57+
Assert.That(eventCalled);
5858
}
5959

6060
[Test]
@@ -76,8 +76,8 @@ public async Task OpeningStateChanged()
7676
var mp = new MediaPlayer(media);
7777
mp.Play();
7878
await tcs.Task;
79-
Assert.True(tcs.Task.Result);
80-
Assert.True(openingCalled);
79+
Assert.That(tcs.Task.Result);
80+
Assert.That(openingCalled);
8181
}
8282
}
83-
}
83+
}

‎src/LibVLCSharp.Tests/LibVLCAPICoverage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public async Task CheckLibVLCCoverage()
138138
Debug.WriteLine(miss);
139139
}
140140

141-
Assert.Zero(missingApisCount);
141+
Assert.That(missingApisCount, Is.Zero);
142142
}
143143
}
144144
}

‎src/LibVLCSharp.Tests/LibVLCSharp.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<DebugSymbols>true</DebugSymbols>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
15-
<PackageReference Include="NUnit" Version="3.13.2" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
17-
<PackageReference Include="NUnitLite" Version="3.13.2" />
18-
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.16" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15+
<PackageReference Include="NUnit" Version="4.3.2" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
17+
<PackageReference Include="NUnitLite" Version="4.3.2" />
18+
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.21" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<ProjectReference Include="..\LibVLCSharp\LibVLCSharp.csproj" />

‎src/LibVLCSharp.Tests/LibVLCTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class LibVLCTests : BaseSetup
1515
public void DisposeInstanceNativeRelease()
1616
{
1717
_libVLC.Dispose();
18-
Assert.AreEqual(IntPtr.Zero, _libVLC.NativeReference);
18+
Assert.That(IntPtr.Zero == _libVLC.NativeReference);
1919
}
2020

2121
[Test]
@@ -71,7 +71,7 @@ public void AudioOutputDevices()
7171
[Test]
7272
public void EqualityTests()
7373
{
74-
Assert.AreNotSame(new LibVLC("--no-audio"), new LibVLC("--no-audio"));
74+
Assert.That(new LibVLC("--no-audio"), Is.Not.SameAs(new LibVLC("--no-audio")));
7575
}
7676

7777
[Test]
@@ -99,7 +99,7 @@ public void SetLogFile()
9999
_libVLC.SetLogFile(path);
100100
_libVLC.CloseLogFile();
101101
var logs = File.ReadAllText(path);
102-
Assert.True(logs.StartsWith("VLC media player"));
102+
Assert.That(logs.StartsWith("VLC media player"));
103103
}
104104

105105
[Test]
@@ -111,24 +111,24 @@ public void DisposeLibVLC()
111111
(dialog, title, text, indeterminate, position, cancelText, token) => Task.CompletedTask,
112112
(dialog, position, text) => Task.CompletedTask);
113113

114-
Assert.IsTrue(_libVLC.DialogHandlersSet);
114+
Assert.That(_libVLC.DialogHandlersSet, Is.True);
115115

116116
_libVLC.Dispose();
117117

118-
Assert.AreEqual(IntPtr.Zero, _libVLC.NativeReference);
119-
Assert.IsFalse(_libVLC.DialogHandlersSet);
118+
Assert.That(IntPtr.Zero == _libVLC.NativeReference);
119+
Assert.That(_libVLC.DialogHandlersSet, Is.False);
120120
}
121121

122122
[Test]
123123
public void LibVLCVersion()
124124
{
125-
Assert.True(_libVLC.Version.StartsWith("3"));
125+
Assert.That(_libVLC.Version.StartsWith("3"));
126126
}
127127

128128
[Test]
129129
public void LibVLCChangeset()
130130
{
131-
Assert.IsNotNull(_libVLC.Changeset);
131+
Assert.That(_libVLC.Changeset, Is.Not.Null);
132132
}
133133
}
134134
}

‎src/LibVLCSharp.Tests/MediaDiscovererTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ public void CreateStartAndStopDiscoverer()
1515
{
1616
var mds = _libVLC.MediaDiscoverers(MediaDiscovererCategory.Lan);
1717
var md = new MediaDiscoverer(_libVLC, mds.First().Name!);
18-
Assert.True(md.Start());
19-
Assert.True(md.IsRunning);
18+
Assert.That(md.Start());
19+
Assert.That(md.IsRunning);
2020
md.Stop();
21-
Assert.False(md.IsRunning);
21+
Assert.That(md.IsRunning, Is.False);
2222
}
2323

2424
[Test]
2525
public async Task DisposeMediaDiscoverer()
2626
{
2727
var mds = _libVLC.MediaDiscoverers(MediaDiscovererCategory.Lan);
2828
var md = new MediaDiscoverer(_libVLC, mds.First().Name!);
29-
Assert.True(md.Start());
30-
Assert.True(md.IsRunning);
31-
Assert.NotNull(md.MediaList);
29+
Assert.That(md.Start());
30+
Assert.That(md.IsRunning);
31+
Assert.That(md.MediaList, Is.Not.Null);
3232
await Task.Delay(1000);
3333
foreach(var media in md.MediaList!)
3434
{
3535
Debug.WriteLine(media.Mrl);
3636
}
3737
md.Dispose();
38-
Assert.IsNull(md.MediaList);
39-
Assert.False(md.IsRunning);
40-
Assert.AreEqual(IntPtr.Zero, md.NativeReference);
38+
Assert.That(md.MediaList, Is.Null);
39+
Assert.That(md.IsRunning, Is.False);
40+
Assert.That(IntPtr.Zero == md.NativeReference);
4141
}
4242
}
4343
}

‎src/LibVLCSharp.Tests/MediaListTests.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.IO;
3+
using System.Linq;
34
using LibVLCSharp.Shared;
45
using NUnit.Framework;
56

@@ -18,21 +19,21 @@ public void AddAndRemoveMediaFromMediaList()
1819
mediaList.ItemAdded += (sender, args) => itemAdded = true;
1920
mediaList.ItemDeleted += (sender, args) => itemDeleted = true;
2021
mediaList.AddMedia(media);
21-
Assert.AreEqual(media, mediaList[0]);
22-
Assert.AreEqual(1, mediaList.Count);
23-
Assert.True(itemAdded);
24-
Assert.Zero(mediaList.IndexOf(media));
22+
Assert.That(media.NativeReference == mediaList.First().NativeReference);
23+
Assert.That(1 == mediaList.Count);
24+
Assert.That(itemAdded);
25+
Assert.That(mediaList.IndexOf(media), Is.Zero);
2526
mediaList.RemoveIndex(0);
26-
Assert.Zero(mediaList.Count);
27-
Assert.True(itemDeleted);
27+
Assert.That(mediaList.Count, Is.Zero);
28+
Assert.That(itemDeleted);
2829
}
2930

3031
[Test]
3132
public void DisposeMediaList()
3233
{
3334
var mediaList = new MediaList(_libVLC);
3435
mediaList.Dispose();
35-
Assert.AreEqual(IntPtr.Zero, mediaList.NativeReference);
36+
Assert.That(IntPtr.Zero == mediaList.NativeReference);
3637
}
3738
}
3839
}

0 commit comments

Comments
 (0)