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

Commit 428ddd7

Browse files
grokysgrokys
committed
Remove TestUtils.WithScheduler.
No longer needed after #1997.
1 parent 73b2275 commit 428ddd7

File tree

4 files changed

+201
-234
lines changed

4 files changed

+201
-234
lines changed

‎test/GitHub.App.UnitTests/ViewModels/CommentThreadViewModelTests.cs‎

Lines changed: 29 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,74 +17,62 @@ public class CommentThreadViewModelTests
1717
[Test]
1818
public async Task SavesDraftForEditingComment()
1919
{
20-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
21-
{
22-
var scheduler = new HistoricalScheduler();
23-
var drafts = Substitute.For<IMessageDraftStore>();
24-
var target = CreateTarget(drafts: drafts, scheduler: scheduler);
20+
var scheduler = new HistoricalScheduler();
21+
var drafts = Substitute.For<IMessageDraftStore>();
22+
var target = CreateTarget(drafts: drafts, scheduler: scheduler);
2523

26-
await target.AddPlaceholder(true);
27-
target.Comments[0].Body = "Edited comment.";
24+
await target.AddPlaceholder(true);
25+
target.Comments[0].Body = "Edited comment.";
2826

29-
await drafts.DidNotReceiveWithAnyArgs().UpdateDraft<CommentDraft>(null, null, null);
27+
await drafts.DidNotReceiveWithAnyArgs().UpdateDraft<CommentDraft>(null, null, null);
3028

31-
scheduler.AdvanceBy(TimeSpan.FromSeconds(1));
29+
scheduler.AdvanceBy(TimeSpan.FromSeconds(1));
3230

33-
await drafts.Received().UpdateDraft(
34-
"file.cs",
35-
"10",
36-
Arg.Is<CommentDraft>(x => x.Body == "Edited comment."));
37-
}
31+
await drafts.Received().UpdateDraft(
32+
"file.cs",
33+
"10",
34+
Arg.Is<CommentDraft>(x => x.Body == "Edited comment."));
3835
}
3936

4037
[Test]
4138
public async Task DoesntSaveDraftForNonEditingComment()
4239
{
43-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
44-
{
45-
var scheduler = new HistoricalScheduler();
46-
var drafts = Substitute.For<IMessageDraftStore>();
47-
var target = CreateTarget(drafts: drafts, scheduler: scheduler);
40+
var scheduler = new HistoricalScheduler();
41+
var drafts = Substitute.For<IMessageDraftStore>();
42+
var target = CreateTarget(drafts: drafts, scheduler: scheduler);
4843

49-
await target.AddPlaceholder(false);
50-
target.Comments[0].Body = "Edited comment.";
44+
await target.AddPlaceholder(false);
45+
target.Comments[0].Body = "Edited comment.";
5146

52-
scheduler.AdvanceBy(TimeSpan.FromSeconds(1));
47+
scheduler.AdvanceBy(TimeSpan.FromSeconds(1));
5348

54-
await drafts.DidNotReceiveWithAnyArgs().UpdateDraft<CommentDraft>(null, null, null);
55-
}
49+
await drafts.DidNotReceiveWithAnyArgs().UpdateDraft<CommentDraft>(null, null, null);
5650
}
5751

5852
[Test]
5953
public async Task CommitEditDeletesDraft()
6054
{
61-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
62-
{
63-
var drafts = Substitute.For<IMessageDraftStore>();
64-
var target = CreateTarget(drafts: drafts);
55+
var drafts = Substitute.For<IMessageDraftStore>();
56+
var target = CreateTarget(drafts: drafts);
6557

66-
await target.AddPlaceholder(false);
58+
await target.AddPlaceholder(false);
6759

68-
drafts.ClearReceivedCalls();
69-
await target.Comments[0].CommitEdit.Execute();
60+
drafts.ClearReceivedCalls();
61+
await target.Comments[0].CommitEdit.Execute();
7062

71-
await drafts.Received().DeleteDraft("file.cs", "10");
72-
}
63+
await drafts.Received().DeleteDraft("file.cs", "10");
7364
}
7465

7566
[Test]
7667
public async Task CancelEditDeletesDraft()
7768
{
78-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
79-
{
80-
var drafts = Substitute.For<IMessageDraftStore>();
81-
var target = CreateTarget(drafts: drafts);
69+
var drafts = Substitute.For<IMessageDraftStore>();
70+
var target = CreateTarget(drafts: drafts);
8271

83-
await target.AddPlaceholder(false);
84-
await target.Comments[0].CancelEdit.Execute();
72+
await target.AddPlaceholder(false);
73+
await target.Comments[0].CancelEdit.Execute();
8574

86-
await drafts.Received().DeleteDraft("file.cs", "10");
87-
}
75+
await drafts.Received().DeleteDraft("file.cs", "10");
8876
}
8977

9078
static Target CreateTarget(

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

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -152,53 +152,50 @@ public async Task CreatingPRsAsync(
152152
string targetRepoOwner, string targetBranchName,
153153
string title, string body)
154154
{
155-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
156-
{
157-
var remote = "origin";
158-
var data = PrepareTestData(repoName, sourceRepoOwner, sourceBranchName, targetRepoOwner, targetBranchName, "origin",
159-
repoIsFork, sourceBranchIsTracking);
160-
161-
var targetRepo = data.TargetRepo;
162-
var gitClient = data.GitClient;
163-
var l2repo = data.L2Repo;
164-
var activeRepo = data.ActiveRepo;
165-
var sourceBranch = data.SourceBranch;
166-
var targetBranch = data.TargetBranch;
167-
var ms = data.ModelService;
168-
169-
var prservice = new PullRequestService(data.GitClient, data.GitService, Substitute.For<IVSGitExt>(), Substitute.For<IGraphQLClientFactory>(), data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
170-
var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService, Substitute.For<IMessageDraftStore>());
171-
await vm.InitializeAsync(data.ActiveRepo, data.Connection);
172-
173-
// the TargetBranch property gets set to whatever the repo default is (we assume master here),
174-
// so we only set it manually to emulate the user selecting a different target branch
175-
if (targetBranchName != "master")
176-
vm.TargetBranch = new BranchModel(targetBranchName, targetRepo);
177-
178-
if (title != null)
179-
vm.PRTitle = title;
180-
181-
// this is optional
182-
if (body != null)
183-
vm.Description = body;
184-
185-
ms.CreatePullRequest(activeRepo, targetRepo, sourceBranch, targetBranch, Arg.Any<string>(), Arg.Any<string>())
186-
.Returns(x =>
187-
{
188-
var pr = Substitute.For<IPullRequestModel>();
189-
pr.Base.Returns(new GitReferenceModel("ref", "label", "sha", "https://clone.url"));
190-
return Observable.Return(pr);
191-
});
192-
193-
await vm.CreatePullRequest.Execute();
194-
195-
var unused2 = gitClient.Received().Push(l2repo, sourceBranchName, remote);
196-
if (!sourceBranchIsTracking)
197-
unused2 = gitClient.Received().SetTrackingBranch(l2repo, sourceBranchName, remote);
198-
else
199-
unused2 = gitClient.DidNotReceiveWithAnyArgs().SetTrackingBranch(Args.LibGit2Repo, Args.String, Args.String);
200-
var unused = ms.Received().CreatePullRequest(activeRepo, targetRepo, sourceBranch, targetBranch, title ?? "Source branch", body ?? String.Empty);
201-
}
155+
var remote = "origin";
156+
var data = PrepareTestData(repoName, sourceRepoOwner, sourceBranchName, targetRepoOwner, targetBranchName, "origin",
157+
repoIsFork, sourceBranchIsTracking);
158+
159+
var targetRepo = data.TargetRepo;
160+
var gitClient = data.GitClient;
161+
var l2repo = data.L2Repo;
162+
var activeRepo = data.ActiveRepo;
163+
var sourceBranch = data.SourceBranch;
164+
var targetBranch = data.TargetBranch;
165+
var ms = data.ModelService;
166+
167+
var prservice = new PullRequestService(data.GitClient, data.GitService, Substitute.For<IVSGitExt>(), Substitute.For<IGraphQLClientFactory>(), data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
168+
var vm = new PullRequestCreationViewModel(data.GetModelServiceFactory(), prservice, data.NotificationService, Substitute.For<IMessageDraftStore>());
169+
await vm.InitializeAsync(data.ActiveRepo, data.Connection);
170+
171+
// the TargetBranch property gets set to whatever the repo default is (we assume master here),
172+
// so we only set it manually to emulate the user selecting a different target branch
173+
if (targetBranchName != "master")
174+
vm.TargetBranch = new BranchModel(targetBranchName, targetRepo);
175+
176+
if (title != null)
177+
vm.PRTitle = title;
178+
179+
// this is optional
180+
if (body != null)
181+
vm.Description = body;
182+
183+
ms.CreatePullRequest(activeRepo, targetRepo, sourceBranch, targetBranch, Arg.Any<string>(), Arg.Any<string>())
184+
.Returns(x =>
185+
{
186+
var pr = Substitute.For<IPullRequestModel>();
187+
pr.Base.Returns(new GitReferenceModel("ref", "label", "sha", "https://clone.url"));
188+
return Observable.Return(pr);
189+
});
190+
191+
await vm.CreatePullRequest.Execute();
192+
193+
var unused2 = gitClient.Received().Push(l2repo, sourceBranchName, remote);
194+
if (!sourceBranchIsTracking)
195+
unused2 = gitClient.Received().SetTrackingBranch(l2repo, sourceBranchName, remote);
196+
else
197+
unused2 = gitClient.DidNotReceiveWithAnyArgs().SetTrackingBranch(Args.LibGit2Repo, Args.String, Args.String);
198+
var unused = ms.Received().CreatePullRequest(activeRepo, targetRepo, sourceBranch, targetBranch, title ?? "Source branch", body ?? String.Empty);
202199
}
203200

204201
[Test]

‎test/GitHub.App.UnitTests/ViewModels/PullRequestReviewCommentThreadViewModelTests.cs‎

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -58,60 +58,51 @@ public async Task PlaceholderCommitEnabledWhenCommentHasBody()
5858
[Test]
5959
public async Task PostsCommentInReplyToCorrectComment()
6060
{
61-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
62-
{
63-
var session = CreateSession();
64-
var target = await CreateTarget(
65-
session: session,
66-
comments: CreateComments("Comment 1", "Comment 2"));
61+
var session = CreateSession();
62+
var target = await CreateTarget(
63+
session: session,
64+
comments: CreateComments("Comment 1", "Comment 2"));
6765

68-
target.Comments[2].Body = "New Comment";
69-
await target.Comments[2].CommitEdit.Execute();
66+
target.Comments[2].Body = "New Comment";
67+
await target.Comments[2].CommitEdit.Execute();
7068

71-
session.Received(1).PostReviewComment("New Comment", "1");
72-
}
69+
session.Received(1).PostReviewComment("New Comment", "1");
7370
}
7471

7572
[Test]
7673
public async Task LoadsDraftForNewThread()
7774
{
78-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
79-
{
80-
var draftStore = Substitute.For<IMessageDraftStore>();
75+
var draftStore = Substitute.For<IMessageDraftStore>();
8176

82-
draftStore.GetDraft<PullRequestReviewCommentDraft>(
83-
"pr-review-comment|https://github.com/owner/repo|47|file.cs", "10")
84-
.Returns(new PullRequestReviewCommentDraft
85-
{
86-
Body = "Draft comment.",
87-
Side = DiffSide.Right,
88-
});
77+
draftStore.GetDraft<PullRequestReviewCommentDraft>(
78+
"pr-review-comment|https://github.com/owner/repo|47|file.cs", "10")
79+
.Returns(new PullRequestReviewCommentDraft
80+
{
81+
Body = "Draft comment.",
82+
Side = DiffSide.Right,
83+
});
8984

90-
var target = await CreateTarget(draftStore: draftStore, newThread: true);
85+
var target = await CreateTarget(draftStore: draftStore, newThread: true);
9186

92-
Assert.That(target.Comments[0].Body, Is.EqualTo("Draft comment."));
93-
}
87+
Assert.That(target.Comments[0].Body, Is.EqualTo("Draft comment."));
9488
}
9589

9690
[Test]
9791
public async Task LoadsDraftForExistingThread()
9892
{
99-
using (TestUtils.WithScheduler(Scheduler.CurrentThread))
100-
{
101-
var draftStore = Substitute.For<IMessageDraftStore>();
93+
var draftStore = Substitute.For<IMessageDraftStore>();
10294

103-
draftStore.GetDraft<PullRequestReviewCommentDraft>(
104-
"pr-review-comment|https://github.com/owner/repo|47|file.cs", "10")
105-
.Returns(new PullRequestReviewCommentDraft
106-
{
107-
Body = "Draft comment.",
108-
Side = DiffSide.Right,
109-
});
95+
draftStore.GetDraft<PullRequestReviewCommentDraft>(
96+
"pr-review-comment|https://github.com/owner/repo|47|file.cs", "10")
97+
.Returns(new PullRequestReviewCommentDraft
98+
{
99+
Body = "Draft comment.",
100+
Side = DiffSide.Right,
101+
});
110102

111-
var target = await CreateTarget(draftStore: draftStore);
103+
var target = await CreateTarget(draftStore: draftStore);
112104

113-
Assert.That(target.Comments[0].Body, Is.EqualTo("Draft comment."));
114-
}
105+
Assert.That(target.Comments[0].Body, Is.EqualTo("Draft comment."));
115106
}
116107

117108
async Task<PullRequestReviewCommentThreadViewModel> CreateTarget(

0 commit comments

Comments
 (0)