Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 476cad3

Browse files
StanleyGoldmanStanleyGoldman
committed
Merge commit '004f1677ce70b6ffe965a093e063ef2b536c59dd' into fixes/update-after-push
2 parents ee17f1a + 004f167 commit 476cad3

File tree

1 file changed

+29
-20
lines changed

1 file changed

+29
-20
lines changed

‎src/tests/IntegrationTests/Events/RepositoryManagerTests.cs

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
4040
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
4141
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
4242
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
43+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
4344

4445
repositoryManagerListener.DidNotReceive().OnIsBusyChanged(Args.Bool);
4546
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
4647
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
4748
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
4849
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
49-
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
50+
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
5051
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
5152
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
5253
}
@@ -73,6 +74,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
7374
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
7475
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
7576
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
77+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
7678

7779
repositoryManagerListener.ClearReceivedCalls();
7880
repositoryManagerEvents.Reset();
@@ -86,14 +88,13 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
8688
repositoryManagerEvents.WaitForNotBusy();
8789

8890
repositoryManagerEvents.GitStatusUpdated.WaitOne(Timeout).Should().BeTrue();
89-
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
9091

9192
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
9293
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
9394
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
9495
repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
9596
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
96-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
97+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
9798
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
9899
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
99100
}
@@ -120,6 +121,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
120121
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
121122
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
122123
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
124+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
123125

124126
repositoryManagerListener.ClearReceivedCalls();
125127
repositoryManagerEvents.Reset();
@@ -142,7 +144,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
142144
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
143145
repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
144146
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
145-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
147+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
146148
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
147149
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
148150

@@ -193,6 +195,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
193195
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
194196
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
195197
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
198+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
196199

197200
repositoryManagerListener.ClearReceivedCalls();
198201
repositoryManagerEvents.Reset();
@@ -208,15 +211,14 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
208211
RepositoryManager.WaitForEvents();
209212
repositoryManagerEvents.WaitForNotBusy();
210213

211-
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
212214
repositoryManagerEvents.GitStatusUpdated.WaitOne(Timeout).Should().BeTrue();
213215

214216
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
215217
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
216218
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
217219
repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
218220
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
219-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
221+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
220222
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
221223
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
222224

@@ -266,6 +268,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
266268
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
267269
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
268270
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
271+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
269272

270273
repositoryManagerListener.ClearReceivedCalls();
271274
repositoryManagerEvents.Reset();
@@ -312,6 +315,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
312315
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
313316
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
314317
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
318+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
315319

316320
repositoryManagerListener.ClearReceivedCalls();
317321
repositoryManagerEvents.Reset();
@@ -322,16 +326,16 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
322326
RepositoryManager.WaitForEvents();
323327
repositoryManagerEvents.WaitForNotBusy();
324328

325-
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
326-
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
327-
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
329+
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
330+
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
331+
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
328332

329333
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
330334
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
331335
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
332336
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
333337
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
334-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
338+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
335339
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
336340
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
337341
}
@@ -358,6 +362,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
358362
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
359363
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
360364
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
365+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
361366

362367
repositoryManagerListener.ClearReceivedCalls();
363368

@@ -368,14 +373,14 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
368373
RepositoryManager.WaitForEvents();
369374
repositoryManagerEvents.WaitForNotBusy();
370375

371-
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
376+
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
372377

373378
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
374379
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
375380
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
376381
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
377382
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
378-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
383+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
379384
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
380385
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
381386

@@ -388,7 +393,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
388393
RepositoryManager.WaitForEvents();
389394
repositoryManagerEvents.WaitForNotBusy();
390395

391-
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
396+
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
392397

393398
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
394399
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
@@ -422,6 +427,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
422427
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
423428
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
424429
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
430+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
425431

426432
repositoryManagerListener.ClearReceivedCalls();
427433
repositoryManagerEvents.Reset();
@@ -441,7 +447,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
441447
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
442448
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
443449
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
444-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
450+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
445451
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
446452
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
447453

@@ -491,6 +497,7 @@ await Initialize(TestRepoMasterTwoRemotes, initializeRepository: false,
491497
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
492498
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
493499
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
500+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
494501

495502
repositoryManagerListener.ClearReceivedCalls();
496503
repositoryManagerEvents.Reset();
@@ -505,6 +512,7 @@ await RepositoryManager.CreateBranch("branch2", "another/master")
505512
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
506513
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
507514
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
515+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
508516

509517
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
510518
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
@@ -560,6 +568,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
560568
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
561569
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
562570
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
571+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
563572

564573
repositoryManagerListener.ClearReceivedCalls();
565574

@@ -569,14 +578,14 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
569578
RepositoryManager.WaitForEvents();
570579
repositoryManagerEvents.WaitForNotBusy();
571580

572-
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
581+
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
573582

574583
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
575584
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
576585
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
577586
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
578587
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
579-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
588+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
580589
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
581590
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
582591
}
@@ -603,6 +612,7 @@ await Initialize(TestRepoMasterCleanUnsynchronized, initializeRepository: false,
603612
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
604613
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
605614
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
615+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
606616

607617
repositoryManagerListener.ClearReceivedCalls();
608618
repositoryManagerEvents.Reset();
@@ -613,16 +623,15 @@ await Initialize(TestRepoMasterCleanUnsynchronized, initializeRepository: false,
613623
RepositoryManager.WaitForEvents();
614624
repositoryManagerEvents.WaitForNotBusy();
615625

616-
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
617-
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
626+
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
618627

619628
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
620629
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
621630
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
622631
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
623632
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
624-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
625-
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
633+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
634+
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
626635
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
627636
}
628637
finally

0 commit comments

Comments
 (0)