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

Commit 21495eb

Browse files
author
Meaghan Lewis
committed
update nunit in UnitTests
1 parent ddfaa0f commit 21495eb

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎test/UnitTests/GitHub.Api/LoginManagerTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public async Task HandlerNotifiedOfExceptionIn2FAChallengeResponse()
153153
new TwoFactorChallengeResult("123456"));
154154

155155
var target = new LoginManager(keychain, tfa, "id", "secret");
156-
Assert.Throws<LoginAttemptsExceededException>(() => target.Login(host, client, "foo", "bar"));
156+
Assert.ThrowsAsync<LoginAttemptsExceededException>(async () => await target.Login(host, client, "foo", "bar"));
157157

158158
await client.Authorization.Received(1).GetOrCreateApplicationAuthentication(
159159
"id",
@@ -223,7 +223,7 @@ public async Task ErasesLoginWhenUnauthorized()
223223
var tfa = new Lazy<ITwoFactorChallengeHandler>(() => Substitute.For<ITwoFactorChallengeHandler>());
224224

225225
var target = new LoginManager(keychain, tfa, "id", "secret");
226-
Assert.Throws<AuthorizationException>(async () => target.Login(enterprise, client, "foo", "bar"));
226+
Assert.ThrowsAsync<AuthorizationException>(async () => await target.Login(enterprise, client, "foo", "bar"));
227227

228228
await keychain.Received().Delete(enterprise);
229229
}
@@ -241,7 +241,7 @@ public async Task ErasesLoginWhenNonOctokitExceptionThrown()
241241
var tfa = new Lazy<ITwoFactorChallengeHandler>(() => Substitute.For<ITwoFactorChallengeHandler>());
242242

243243
var target = new LoginManager(keychain, tfa, "id", "secret");
244-
Assert.Throws<InvalidOperationException>(async () => target.Login(host, client, "foo", "bar"));
244+
Assert.ThrowsAsync<InvalidOperationException>(async () => await target.Login(host, client, "foo", "bar"));
245245

246246
await keychain.Received().Delete(host);
247247
}
@@ -264,7 +264,7 @@ public async Task ErasesLoginWhenNonOctokitExceptionThrownIn2FA()
264264
tfa.Value.HandleTwoFactorException(exception).Returns(new TwoFactorChallengeResult("123456"));
265265

266266
var target = new LoginManager(keychain, tfa, "id", "secret");
267-
Assert.Throws<InvalidOperationException>(async() => target.Login(host, client, "foo", "bar"));
267+
Assert.ThrowsAsync<InvalidOperationException>(async() => await target.Login(host, client, "foo", "bar"));
268268

269269
await keychain.Received().Delete(host);
270270
}

‎test/UnitTests/GitHub.App/Caches/ImageCacheTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public async Task WhenLoadingFromCacheFailsInvalidatesCacheEntry()
5353
.FirstAsync();
5454

5555
Assert.That(retrieved, Is.Null);
56-
Assert.Throws<KeyNotFoundException>(async () => await cache.Get("https://fake/"));
56+
Assert.ThrowsAsync<KeyNotFoundException>(async () => await cache.Get("https://fake/"));
5757
}
5858

5959
[Test]
@@ -86,7 +86,7 @@ public async Task ThrowsKeyNotFoundExceptionWhenItemNotInCacheAndImageFetchThrow
8686

8787
var imageCache = new ImageCache(cacheFactory, Substitute.For<IEnvironment>(), new Lazy<IImageDownloader>(() => imageDownloader));
8888

89-
Assert.Throws<KeyNotFoundException>(async () =>
89+
Assert.ThrowsAsync<KeyNotFoundException>(async () => await
9090
imageCache.GetImage(imageUri).FirstAsync());
9191
}
9292

@@ -102,8 +102,8 @@ public async Task ThrowsKeyNotFoundExceptionWhenItemNotInCacheAndImageFetchRetur
102102

103103
var imageCache = new ImageCache(cacheFactory, Substitute.For<IEnvironment>(), new Lazy<IImageDownloader>(() => imageDownloader));
104104

105-
Assert.Throws<KeyNotFoundException>(async () =>
106-
imageCache.GetImage(imageUri).FirstAsync());
105+
Assert.ThrowsAsync<KeyNotFoundException>(async () => await
106+
imageCache.GetImage(imageUri).FirstAsync());
107107
}
108108

109109
[Test]
@@ -151,7 +151,7 @@ public async Task RemovesImageFromCache()
151151

152152
await imageCache.Invalidate(new Uri("https://fake/"));
153153

154-
Assert.Throws<KeyNotFoundException>(async () => cache.Get("https://fake/"));
154+
Assert.ThrowsAsync<KeyNotFoundException>(async () => await cache.Get("https://fake/"));
155155
}
156156
}
157157

‎test/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,7 @@ public async void MergeBaseNotAvailable_ThrowsNotFoundException()
303303
var head = false;
304304
var mergeBaseException = new NotFoundException();
305305

306-
//var ex = await Assert.ThrowsAsync<NotFoundException>(() => ExtractFile(baseSha, baseFileContent, headSha, headFileContent, mergeBaseSha, mergeBaseFileContent,
307-
// fileName, head, Encoding.UTF8, mergeBaseException: mergeBaseException));
308-
var ex = Assert.Throws<NotFoundException>(async () => ExtractFile(baseSha, baseFileContent, headSha, headFileContent, mergeBaseSha, mergeBaseFileContent,
306+
var ex = Assert.ThrowsAsync<NotFoundException>(() => ExtractFile(baseSha, baseFileContent, headSha, headFileContent, mergeBaseSha, mergeBaseFileContent,
309307
fileName, head, Encoding.UTF8, mergeBaseException: mergeBaseException));
310308
}
311309

‎test/UnitTests/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModelTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public async Task SetsOperationErrorOnCheckoutFailure()
240240

241241
Assert.True(target.Checkout.CanExecute(null));
242242

243-
Assert.Throws<FileNotFoundException>(async () => target.Checkout.ExecuteAsyncTask());
243+
Assert.ThrowsAsync<FileNotFoundException>(async () => await target.Checkout.ExecuteAsyncTask());
244244

245245
Assert.That("Switch threw", Is.EqualTo(target.OperationError));
246246
}
@@ -255,7 +255,7 @@ public async Task ClearsOperationErrorOnCheckoutSuccess()
255255
await target.Load(CreatePullRequest());
256256

257257
Assert.True(target.Checkout.CanExecute(null));
258-
Assert.Throws<FileNotFoundException>(async () => target.Checkout.ExecuteAsyncTask());
258+
Assert.ThrowsAsync<FileNotFoundException>(async () => await target.Checkout.ExecuteAsyncTask());
259259
Assert.That("Switch threw", Is.EqualTo(target.OperationError));
260260

261261
await target.Checkout.ExecuteAsync();
@@ -272,7 +272,7 @@ public async Task ClearsOperationErrorOnCheckoutRefresh()
272272
await target.Load(CreatePullRequest());
273273

274274
Assert.True(target.Checkout.CanExecute(null));
275-
Assert.Throws<FileNotFoundException>(async () => target.Checkout.ExecuteAsyncTask());
275+
Assert.ThrowsAsync<FileNotFoundException>(async () => await target.Checkout.ExecuteAsyncTask());
276276
Assert.That("Switch threw", Is.EqualTo(target.OperationError));
277277

278278
await target.Refresh();
@@ -369,7 +369,7 @@ public async Task UpdatesOperationErrorWithExceptionMessage()
369369

370370
await target.Load(CreatePullRequest());
371371

372-
Assert.Throws<FileNotFoundException>(async () => target.Pull.ExecuteAsyncTask(null));
372+
Assert.ThrowsAsync<FileNotFoundException>(() => target.Pull.ExecuteAsyncTask(null));
373373
Assert.That("Pull threw", Is.EqualTo(target.OperationError));
374374
}
375375
}
@@ -479,7 +479,7 @@ public async Task UpdatesOperationErrorWithExceptionMessage()
479479

480480
await target.Load(CreatePullRequest());
481481

482-
Assert.Throws<FileNotFoundException>(async () => target.Push.ExecuteAsyncTask(null));
482+
Assert.ThrowsAsync<FileNotFoundException>(() => target.Push.ExecuteAsyncTask(null));
483483
Assert.That("Push threw", Is.EqualTo(target.OperationError));
484484
}
485485
}

‎test/UnitTests/GitHub.VisualStudio/Services/ConnectionManagerTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public async Task ThrowsWhenLoginFails()
124124
CreateLoginManager(),
125125
Substitute.For<IUsageTracker>());
126126

127-
Assert.Throws<AuthorizationException>(async () =>
128-
target.LogIn(HostAddress.Create("invalid.com"), "user", "pass"));
127+
Assert.ThrowsAsync<AuthorizationException>(async () =>
128+
await target.LogIn(HostAddress.Create("invalid.com"), "user", "pass"));
129129
}
130130

131131
[Test]
@@ -138,8 +138,8 @@ public async Task ThrowsWhenExistingConnectionExists()
138138
CreateLoginManager(),
139139
Substitute.For<IUsageTracker>());
140140

141-
Assert.Throws<InvalidOperationException>(async () =>
142-
target.LogIn(HostAddress.GitHubDotComHostAddress, "user", "pass"));
141+
Assert.ThrowsAsync<InvalidOperationException>(async () =>
142+
await target.LogIn(HostAddress.GitHubDotComHostAddress, "user", "pass"));
143143
}
144144

145145
[Test]
@@ -207,8 +207,8 @@ public async Task ThrowsIfConnectionDoesntExist()
207207
loginManager,
208208
Substitute.For<IUsageTracker>());
209209

210-
Assert.Throws<KeyNotFoundException>(async () =>
211-
target.LogOut(HostAddress.GitHubDotComHostAddress));
210+
Assert.ThrowsAsync<KeyNotFoundException>(async () =>
211+
await target.LogOut(HostAddress.GitHubDotComHostAddress));
212212
}
213213

214214
[Test]

‎test/UnitTests/UnitTests.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@
161161
<HintPath>..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll</HintPath>
162162
<Private>True</Private>
163163
</Reference>
164+
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
165+
<HintPath>..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
166+
</Reference>
164167
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
165168
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
166169
<Private>True</Private>
@@ -206,10 +209,6 @@
206209
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
207210
<Private>False</Private>
208211
</Reference>
209-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
210-
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
211-
<Private>True</Private>
212-
</Reference>
213212
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
214213
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
215214
<Private>False</Private>

‎test/UnitTests/packages.config‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,20 @@
2525
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
2626
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net461" />
2727
<package id="NSubstitute" version="2.0.3" targetFramework="net461" />
28+
<package id="NUnit" version="3.9.0" targetFramework="net461" />
29+
<package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
30+
<package id="NUnit.Extension.AppVeyor.NUnit3ResultWriter" version="0.1" />
31+
<package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net461" />
32+
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
33+
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
34+
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
35+
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net461" />
36+
<package id="NUnit.Runners" version="3.7.0" targetFramework="net461" />
2837
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
2938
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />
3039
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" />
3140
<package id="Rx-Main" version="2.2.5-custom" targetFramework="net45" />
3241
<package id="Rx-PlatformServices" version="2.2.5-custom" targetFramework="net45" />
3342
<package id="Rx-Testing" version="2.2.5-custom" targetFramework="net45" />
3443
<package id="Rx-XAML" version="2.2.5-custom" targetFramework="net45" />
35-
<package id="NUnit.Extension.AppVeyor.NUnit3ResultWriter" version="0.1" />
36-
<package id="NUnit" version="2.6.4" targetFramework="net452" />
37-
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
38-
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
39-
<package id="NUnit.Runners" version="2.6.4" targetFramework="net452" />
40-
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net452" />
4144
</packages>

0 commit comments

Comments
 (0)