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

Commit 5223a8d

Browse files
StanleyGoldmanStanleyGoldman
committed
Fixing test inconsistencies
1 parent 55cda96 commit 5223a8d

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

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

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ 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().GitStatusUpdated(Args.GitStatus);
4748
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
48-
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
49+
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
4950
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
5051
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
5152
}
@@ -72,6 +73,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
7273
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
7374
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
7475
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
76+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
7577

7678
repositoryManagerListener.ClearReceivedCalls();
7779
repositoryManagerEvents.Reset();
@@ -85,13 +87,12 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
8587
repositoryManagerEvents.WaitForNotBusy();
8688

8789
repositoryManagerEvents.GitStatusUpdated.WaitOne(Timeout).Should().BeTrue();
88-
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
8990

9091
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
9192
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
9293
repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
9394
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
94-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
95+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
9596
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
9697
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
9798
}
@@ -118,6 +119,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
118119
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
119120
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
120121
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
122+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
121123

122124
repositoryManagerListener.ClearReceivedCalls();
123125
repositoryManagerEvents.Reset();
@@ -139,7 +141,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
139141
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
140142
repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
141143
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
142-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
144+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
143145
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
144146
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
145147

@@ -189,6 +191,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
189191
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
190192
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
191193
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
194+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
192195

193196
repositoryManagerListener.ClearReceivedCalls();
194197
repositoryManagerEvents.Reset();
@@ -204,14 +207,13 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
204207
RepositoryManager.WaitForEvents();
205208
repositoryManagerEvents.WaitForNotBusy();
206209

207-
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
208210
repositoryManagerEvents.GitStatusUpdated.WaitOne(Timeout).Should().BeTrue();
209211

210212
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
211213
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
212214
repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
213215
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
214-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
216+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
215217
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
216218
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
217219

@@ -260,6 +262,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
260262
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
261263
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
262264
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
265+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
263266

264267
repositoryManagerListener.ClearReceivedCalls();
265268
repositoryManagerEvents.Reset();
@@ -305,6 +308,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
305308
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
306309
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
307310
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
311+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
308312

309313
repositoryManagerListener.ClearReceivedCalls();
310314
repositoryManagerEvents.Reset();
@@ -323,7 +327,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
323327
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
324328
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
325329
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
326-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
330+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
327331
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
328332
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
329333
}
@@ -350,6 +354,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
350354
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
351355
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
352356
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
357+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
353358

354359
repositoryManagerListener.ClearReceivedCalls();
355360

@@ -366,7 +371,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
366371
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
367372
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
368373
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
369-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
374+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
370375
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
371376
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
372377

@@ -412,6 +417,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
412417
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
413418
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
414419
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
420+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
415421

416422
repositoryManagerListener.ClearReceivedCalls();
417423
repositoryManagerEvents.Reset();
@@ -430,7 +436,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
430436
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
431437
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
432438
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
433-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
439+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
434440
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
435441
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
436442

@@ -479,6 +485,7 @@ await Initialize(TestRepoMasterTwoRemotes, initializeRepository: false,
479485
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
480486
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
481487
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
488+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
482489

483490
repositoryManagerListener.ClearReceivedCalls();
484491
repositoryManagerEvents.Reset();
@@ -493,6 +500,7 @@ await RepositoryManager.CreateBranch("branch2", "another/master")
493500
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
494501
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
495502
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
503+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
496504

497505
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
498506
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
@@ -546,6 +554,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
546554
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
547555
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
548556
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
557+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
549558

550559
repositoryManagerListener.ClearReceivedCalls();
551560

@@ -561,7 +570,7 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
561570
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
562571
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
563572
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
564-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
573+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
565574
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
566575
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
567576
}
@@ -588,6 +597,7 @@ await Initialize(TestRepoMasterCleanUnsynchronized, initializeRepository: false,
588597
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
589598
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
590599
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
600+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
591601

592602
repositoryManagerListener.ClearReceivedCalls();
593603
repositoryManagerEvents.Reset();
@@ -598,15 +608,14 @@ await Initialize(TestRepoMasterCleanUnsynchronized, initializeRepository: false,
598608
RepositoryManager.WaitForEvents();
599609
repositoryManagerEvents.WaitForNotBusy();
600610

601-
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
602-
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
611+
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
603612

604613
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
605614
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
606615
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
607616
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
608-
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
609-
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
617+
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
618+
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
610619
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
611620
}
612621
finally

0 commit comments

Comments
 (0)