Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 49b281b

Browse files
author
Meaghan Lewis
committed
Start changing GitHub.InlineReviews.UnitTests to use nunit
1 parent 6428081 commit 49b281b

11 files changed

+249
-264
lines changed

test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
5-
<Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
6-
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
7-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
83
<PropertyGroup>
94
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
105
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -112,21 +107,25 @@
112107
<Reference Include="Microsoft.CSharp" />
113108
<Reference Include="System.Data" />
114109
<Reference Include="System.Xml" />
115-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
116-
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
117-
<Private>True</Private>
110+
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
111+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
112+
<Private>False</Private>
118113
</Reference>
119-
<Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
120-
<HintPath>..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
121-
<Private>True</Private>
114+
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
115+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
116+
<Private>False</Private>
122117
</Reference>
123-
<Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
124-
<HintPath>..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
118+
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
119+
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
125120
<Private>True</Private>
126121
</Reference>
127-
<Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
128-
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
129-
<Private>True</Private>
122+
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
123+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
124+
<Private>False</Private>
125+
</Reference>
126+
<Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
127+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
128+
<Private>False</Private>
130129
</Reference>
131130
</ItemGroup>
132131
<ItemGroup>
@@ -195,21 +194,12 @@
195194
<ItemGroup>
196195
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
197196
</ItemGroup>
198-
<ItemGroup>
199-
<Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
200-
</ItemGroup>
201197
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
202198
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
203199
<PropertyGroup>
204200
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
205201
</PropertyGroup>
206-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
207-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
208-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
209-
<Error Condition="!Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props'))" />
210-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
211202
</Target>
212-
<Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
213203
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
214204
Other similar extension points exist, see Microsoft.Common.targets.
215205
<Target Name="BeforeBuild">

test/GitHub.InlineReviews.UnitTests/Models/DiffUtilitiesTests.cs

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
using System.IO;
33
using System.Linq;
44
using GitHub.Models;
5-
using Xunit;
5+
using NUnit.Framework;
66

77
namespace GitHub.InlineReviews.UnitTests.Models
88
{
99
public class DiffUtilitiesTests
1010
{
1111
public class TheParseFragmentMethod
1212
{
13-
[Fact]
13+
[Test]
1414
public void EmptyDiff_NoDiffChunks()
1515
{
1616
var chunks = DiffUtilities.ParseFragment("");
@@ -50,11 +50,11 @@ public void HeaderOnly_OldAndNewLineNumbers(string header, int expectOldLineNumb
5050
var chunks = DiffUtilities.ParseFragment(header);
5151
var chunk = chunks.First();
5252

53-
Assert.Equal(expectOldLineNumber, chunk.OldLineNumber);
54-
Assert.Equal(expectNewLineNumber, chunk.NewLineNumber);
53+
Assert.AreEqual(expectOldLineNumber, chunk.OldLineNumber);
54+
Assert.AreEqual(expectNewLineNumber, chunk.NewLineNumber);
5555
}
5656

57-
[Fact]
57+
[Test]
5858
public void HeaderOnlyNoNewLineAtEnd_NoLines()
5959
{
6060
var header =
@@ -67,7 +67,7 @@ public void HeaderOnlyNoNewLineAtEnd_NoLines()
6767
Assert.Empty(chunk.Lines);
6868
}
6969

70-
[Fact]
70+
[Test]
7171
public void NoNewLineNotAtEndOfChunk_CheckLineCount()
7272
{
7373
var header =
@@ -78,10 +78,10 @@ public void NoNewLineNotAtEndOfChunk_CheckLineCount()
7878

7979
var chunk = DiffUtilities.ParseFragment(header).First();
8080

81-
Assert.Equal(2, chunk.Lines.Count());
81+
Assert.AreEqual(2, chunk.Lines.Count());
8282
}
8383

84-
[Fact]
84+
[Test]
8585
public void NoNewLineNotAtEndOfChunk_CheckDiffLineNumber()
8686
{
8787
var header =
@@ -93,7 +93,7 @@ public void NoNewLineNotAtEndOfChunk_CheckDiffLineNumber()
9393
var chunk = DiffUtilities.ParseFragment(header).First();
9494

9595
var line = chunk.Lines.Last();
96-
Assert.Equal(3, line.DiffLineNumber);
96+
Assert.AreEqual(3, line.DiffLineNumber);
9797
}
9898

9999
[Theory]
@@ -108,8 +108,8 @@ public void FirstChunk_CheckLineContent(string diffLines, string contentLine0, s
108108

109109
var chunk = DiffUtilities.ParseFragment(diff).First();
110110

111-
Assert.Equal(contentLine0, chunk.Lines[0].Content);
112-
Assert.Equal(contentLine1, chunk.Lines[1].Content);
111+
Assert.AreEqual(contentLine0, chunk.Lines[0].Content);
112+
Assert.AreEqual(contentLine1, chunk.Lines[1].Content);
113113
}
114114

115115
[Theory]
@@ -123,8 +123,8 @@ public void FirstChunk_CheckNewLineNumber(string diffLines, int lineNumber0, int
123123

124124
var chunk = DiffUtilities.ParseFragment(diff).First();
125125

126-
Assert.Equal(lineNumber0, chunk.Lines[0].NewLineNumber);
127-
Assert.Equal(lineNumber1, chunk.Lines[1].NewLineNumber);
126+
Assert.AreEqual(lineNumber0, chunk.Lines[0].NewLineNumber);
127+
Assert.AreEqual(lineNumber1, chunk.Lines[1].NewLineNumber);
128128
}
129129

130130
[Theory]
@@ -138,19 +138,19 @@ public void FirstChunk_CheckOldLineNumber(string diffLines, int lineNumber0, int
138138

139139
var chunk = DiffUtilities.ParseFragment(diff).First();
140140

141-
Assert.Equal(lineNumber0, chunk.Lines[0].OldLineNumber);
142-
Assert.Equal(lineNumber1, chunk.Lines[1].OldLineNumber);
141+
Assert.AreEqual(lineNumber0, chunk.Lines[0].OldLineNumber);
142+
Assert.AreEqual(lineNumber1, chunk.Lines[1].OldLineNumber);
143143
}
144144

145-
[Fact]
145+
[Test]
146146
public void FirstChunk_CheckDiffLineZeroBased()
147147
{
148148
var expectDiffLine = 0;
149149
var header = "@@ -1 +1 @@";
150150

151151
var chunk = DiffUtilities.ParseFragment(header).First();
152152

153-
Assert.Equal(expectDiffLine, chunk.DiffLine);
153+
Assert.AreEqual(expectDiffLine, chunk.DiffLine);
154154
}
155155

156156
[Theory]
@@ -161,8 +161,8 @@ public void FirstChunk_CheckLineNumbers(int oldLineNumber, int newLineNumber)
161161

162162
var chunk = DiffUtilities.ParseFragment(header).First();
163163

164-
Assert.Equal(oldLineNumber, chunk.OldLineNumber);
165-
Assert.Equal(newLineNumber, chunk.NewLineNumber);
164+
Assert.AreEqual(oldLineNumber, chunk.OldLineNumber);
165+
Assert.AreEqual(newLineNumber, chunk.NewLineNumber);
166166
}
167167

168168
[Theory]
@@ -176,8 +176,8 @@ public void FirstLine_CheckLineNumbers(int oldLineNumber, int newLineNumber, str
176176
var chunk = DiffUtilities.ParseFragment(header).First();
177177
var diffLine = chunk.Lines.First();
178178

179-
Assert.Equal(expectOldLineNumber, diffLine.OldLineNumber);
180-
Assert.Equal(expectNewLineNumber, diffLine.NewLineNumber);
179+
Assert.AreEqual(expectOldLineNumber, diffLine.OldLineNumber);
180+
Assert.AreEqual(expectNewLineNumber, diffLine.NewLineNumber);
181181
}
182182

183183
[Theory]
@@ -191,7 +191,7 @@ public void SkipNLines_CheckDiffLineNumber(string lines, int skip, int expectDif
191191
var result = DiffUtilities.ParseFragment(fragment);
192192

193193
var firstLine = result.First().Lines.Skip(skip).First();
194-
Assert.Equal(expectDiffLineNumber, firstLine.DiffLineNumber);
194+
Assert.AreEqual(expectDiffLineNumber, firstLine.DiffLineNumber);
195195
}
196196

197197
[Theory]
@@ -206,7 +206,7 @@ public void FirstLine_CheckToString(string line)
206206

207207
var str = firstLine.ToString();
208208

209-
Assert.Equal(line, str);
209+
Assert.AreEqual(line, str);
210210
}
211211

212212
[Theory]
@@ -220,7 +220,7 @@ public void FirstLine_CheckContent(string line)
220220
var result = DiffUtilities.ParseFragment(fragment);
221221
var firstLine = result.First().Lines.First();
222222

223-
Assert.Equal(line, firstLine.Content);
223+
Assert.AreEqual(line, firstLine.Content);
224224
}
225225

226226
[Theory]
@@ -234,7 +234,7 @@ public void FirstLine_CheckDiffChangeTypes(string line, DiffChangeType expectTyp
234234
var result = DiffUtilities.ParseFragment(fragment);
235235

236236
var firstLine = result.First().Lines.First();
237-
Assert.Equal(expectType, firstLine.Type);
237+
Assert.AreEqual(expectType, firstLine.Type);
238238
}
239239

240240
[Theory]
@@ -246,7 +246,7 @@ public void InvalidDiffLineChangeChar(string line, string expectMessage)
246246
var result = DiffUtilities.ParseFragment(fragment);
247247
var e = Assert.Throws<InvalidDataException>(() => result.First());
248248

249-
Assert.Equal(expectMessage, e.Message);
249+
Assert.AreEqual(expectMessage, e.Message);
250250
}
251251
}
252252

@@ -286,10 +286,10 @@ public class TheMatchMethod
286286
var line = DiffUtilities.Match(chunks1, targetLines);
287287

288288
var diffLineNumber = (line != null) ? line.DiffLineNumber : -1;
289-
Assert.Equal(expectedDiffLineNumber, diffLineNumber);
289+
Assert.AreEqual(expectedDiffLineNumber, diffLineNumber);
290290
}
291291

292-
[Fact]
292+
[Test]
293293
public void MatchSameLine()
294294
{
295295
var diff = "@@ -1 +1 @@\n 1";
@@ -301,10 +301,10 @@ public void MatchSameLine()
301301

302302
var line = DiffUtilities.Match(chunks1, targetLines);
303303

304-
Assert.Equal(expectLine, line);
304+
Assert.AreEqual(expectLine, line);
305305
}
306306

307-
[Fact]
307+
[Test]
308308
public void NoLineMatchesFromNoLines()
309309
{
310310
var chunks = new DiffChunk[0];
@@ -334,15 +334,15 @@ public class TheLineReaderClass
334334
public void ReadLines(string text, string[] expectLines)
335335
{
336336
var lineReader = new DiffUtilities.LineReader(text);
337-
337+
338338
foreach (var expectLine in expectLines)
339339
{
340340
var line = lineReader.ReadLine();
341-
Assert.Equal(expectLine, line);
341+
Assert.AreEqual(expectLine, line);
342342
}
343343
}
344344

345-
[Fact]
345+
[Test]
346346
public void Constructor_NullText_ArgumentNullException()
347347
{
348348
Assert.Throws<ArgumentNullException>(() => new DiffUtilities.LineReader(null));
@@ -358,10 +358,10 @@ public void CountCarriageReturns(string text, int expectCount)
358358
{
359359
var count = DiffUtilities.LineReader.CountCarriageReturns(text);
360360

361-
Assert.Equal(expectCount, count);
361+
Assert.AreEqual(expectCount, count);
362362
}
363363

364-
[Fact]
364+
[Test]
365365
public void CountCarriageReturns_NullText_ArgumentNullException()
366366
{
367367
Assert.Throws<ArgumentNullException>(() => DiffUtilities.LineReader.CountCarriageReturns(null));

test/GitHub.InlineReviews.UnitTests/Services/DiffServiceTests.cs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,52 @@
66
using GitHub.Services;
77
using GitHub.Models;
88
using NSubstitute;
9-
using Xunit;
9+
using NUnit.Framework;
1010

1111
namespace GitHub.InlineReviews.UnitTests.Services
1212
{
1313
public class DiffServiceTests
1414
{
1515
public class TheParseFragmentMethod
1616
{
17-
[Fact]
17+
[Test]
1818
public void ShouldParsePr960()
1919
{
2020
var target = new DiffService(Substitute.For<IGitClient>());
2121
var result = DiffUtilities.ParseFragment(Resources.pr_960_diff).ToList();
2222

23-
Assert.Equal(4, result.Count);
23+
Assert.AreEqual(4, result.Count);
2424

25-
Assert.Equal(11, result[0].OldLineNumber);
26-
Assert.Equal(11, result[0].NewLineNumber);
27-
Assert.Equal(24, result[0].Lines.Count);
25+
Assert.AreEqual(11, result[0].OldLineNumber);
26+
Assert.AreEqual(11, result[0].NewLineNumber);
27+
Assert.AreEqual(24, result[0].Lines.Count);
2828

29-
Assert.Equal(61, result[1].OldLineNumber);
30-
Assert.Equal(61, result[1].NewLineNumber);
31-
Assert.Equal(21, result[1].Lines.Count);
29+
Assert.AreEqual(61, result[1].OldLineNumber);
30+
Assert.AreEqual(61, result[1].NewLineNumber);
31+
Assert.AreEqual(21, result[1].Lines.Count);
3232

33-
Assert.Equal(244, result[2].OldLineNumber);
34-
Assert.Equal(247, result[2].NewLineNumber);
35-
Assert.Equal(15, result[2].Lines.Count);
33+
Assert.AreEqual(244, result[2].OldLineNumber);
34+
Assert.AreEqual(247, result[2].NewLineNumber);
35+
Assert.AreEqual(15, result[2].Lines.Count);
3636

37-
Assert.Equal(268, result[3].OldLineNumber);
38-
Assert.Equal(264, result[3].NewLineNumber);
39-
Assert.Equal(15, result[3].Lines.Count);
37+
Assert.AreEqual(268, result[3].OldLineNumber);
38+
Assert.AreEqual(264, result[3].NewLineNumber);
39+
Assert.AreEqual(15, result[3].Lines.Count);
4040

4141
// - public class UsageTracker : IUsageTracker
42-
Assert.Equal(17, result[0].Lines[7].OldLineNumber);
43-
Assert.Equal(-1, result[0].Lines[7].NewLineNumber);
44-
Assert.Equal(8, result[0].Lines[7].DiffLineNumber);
42+
Assert.AreEqual(17, result[0].Lines[7].OldLineNumber);
43+
Assert.AreEqual(-1, result[0].Lines[7].NewLineNumber);
44+
Assert.AreEqual(8, result[0].Lines[7].DiffLineNumber);
4545

4646
// + public sealed class UsageTracker : IUsageTracker, IDisposable
47-
Assert.Equal(-1, result[0].Lines[8].OldLineNumber);
48-
Assert.Equal(18, result[0].Lines[8].NewLineNumber);
49-
Assert.Equal(9, result[0].Lines[8].DiffLineNumber);
47+
Assert.AreEqual(-1, result[0].Lines[8].OldLineNumber);
48+
Assert.AreEqual(18, result[0].Lines[8].NewLineNumber);
49+
Assert.AreEqual(9, result[0].Lines[8].DiffLineNumber);
5050

5151
// IConnectionManager connectionManager;
52-
Assert.Equal(26, result[0].Lines[17].OldLineNumber);
53-
Assert.Equal(25, result[0].Lines[17].NewLineNumber);
54-
Assert.Equal(18, result[0].Lines[17].DiffLineNumber);
52+
Assert.AreEqual(26, result[0].Lines[17].OldLineNumber);
53+
Assert.AreEqual(25, result[0].Lines[17].NewLineNumber);
54+
Assert.AreEqual(18, result[0].Lines[17].DiffLineNumber);
5555
}
5656
}
5757
}

0 commit comments

Comments
 (0)