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

Commit 2dbfba2

Browse files
Fixing more unit tests
1 parent 4efffc9 commit 2dbfba2

File tree

2 files changed

+48
-22
lines changed

2 files changed

+48
-22
lines changed

src/tests/IntegrationTests/Events/RepositoryManagerTests.cs

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ public async Task ShouldDetectFileChanges()
9494
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
9595
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
9696
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
97-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
97+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
98+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
9899
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
99100
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
100101
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -152,7 +153,8 @@ public async Task ShouldAddAndCommitFiles()
152153
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
153154
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
154155
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
155-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
156+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
157+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
156158
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
157159
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
158160
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -177,7 +179,8 @@ await RepositoryManager
177179
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
178180
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
179181
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
180-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
182+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
183+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
181184
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
182185
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
183186
repositoryManagerListener.Received().OnLocalBranchUpdated(expectedLocalBranch);
@@ -227,7 +230,8 @@ public async Task ShouldAddAndCommitAllFiles()
227230
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
228231
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
229232
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
230-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
233+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
234+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
231235
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
232236
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
233237
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -252,7 +256,8 @@ await RepositoryManager
252256
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
253257
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
254258
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
255-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
259+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
260+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
256261
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
257262
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
258263
repositoryManagerListener.Received().OnLocalBranchUpdated(expectedLocalBranch);
@@ -292,7 +297,8 @@ public async Task ShouldDetectBranchChange()
292297
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
293298
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
294299
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
295-
repositoryManagerListener.Received().OnHeadUpdated(Args.String);
300+
repositoryManagerListener.Received().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
301+
repositoryManagerListener.Received().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
296302
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
297303
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
298304
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -346,7 +352,8 @@ public async Task ShouldDetectBranchDelete()
346352
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
347353
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
348354
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
349-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
355+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
356+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
350357
repositoryManagerListener.Received().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
351358
repositoryManagerListener.Received().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
352359
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -397,7 +404,8 @@ public async Task ShouldDetectBranchCreate()
397404
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
398405
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
399406
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
400-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
407+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
408+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
401409
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
402410
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
403411
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -444,7 +452,8 @@ public async Task ShouldDetectBranchCreate()
444452
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
445453
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
446454
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
447-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
455+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
456+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
448457
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
449458
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
450459
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -499,7 +508,8 @@ public async Task ShouldDetectChangesToRemotes()
499508
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
500509
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
501510
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
502-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
511+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
512+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
503513
repositoryManagerListener.Received().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
504514
repositoryManagerListener.Received().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
505515
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -542,7 +552,8 @@ public async Task ShouldDetectChangesToRemotes()
542552
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
543553
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
544554
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
545-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
555+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
556+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
546557
repositoryManagerListener.Received().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
547558
repositoryManagerListener.Received().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
548559
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -621,7 +632,8 @@ await RepositoryManager.CreateBranch("branch2", "another/master")
621632
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
622633
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
623634
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
624-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
635+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
636+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
625637
repositoryManagerListener.Received().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
626638
repositoryManagerListener.Received().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
627639
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -671,9 +683,10 @@ await RepositoryManager.SwitchBranch("branch2")
671683
WaitForHeadUpdated(repositoryManagerEvents);
672684

673685
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
674-
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
686+
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
675687
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
676-
repositoryManagerListener.Received().OnHeadUpdated(Args.String);
688+
repositoryManagerListener.Received().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
689+
repositoryManagerListener.Received().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
677690
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
678691
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
679692
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -738,7 +751,8 @@ public async Task ShouldDetectGitPull()
738751
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
739752
repositoryManagerListener.Received().OnStatusUpdated(Args.GitStatus);
740753
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
741-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
754+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
755+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
742756
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
743757
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
744758
repositoryManagerListener.Received().OnLocalBranchUpdated(Args.String);
@@ -796,8 +810,12 @@ public async Task ShouldDetectGitFetch()
796810
Repository.Owner.Should().Be("EvilStanleyGoldman");
797811
Repository.LocalPath.Should().Be(TestRepoMasterCleanUnsynchronized);
798812
Repository.IsGitHub.Should().BeTrue();
799-
Repository.CurrentBranchName.Should().Be(null);
800-
Repository.CurrentBranch.HasValue.Should().BeFalse();
813+
Repository.CurrentBranchName.Should().Be("master");
814+
Repository.CurrentBranch.HasValue.Should().BeTrue();
815+
Repository.CurrentBranch.Value.Name.Should().Be("master");
816+
Repository.CurrentBranch.Value.Remote.HasValue.Should().BeTrue();
817+
Repository.CurrentBranch.Value.Remote.Value.Name.Should().Be("origin");
818+
Repository.CurrentBranch.Value.Remote.Value.Url.Should().Be("https://github.com/EvilStanleyGoldman/IOTestsRepo.git");
801819
Repository.CurrentRemote.HasValue.Should().BeTrue();
802820
Repository.CurrentRemote.Value.Name.Should().Be("origin");
803821
Repository.CurrentRemote.Value.Url.Should().Be("https://github.com/EvilStanleyGoldman/IOTestsRepo.git");
@@ -818,7 +836,8 @@ public async Task ShouldDetectGitFetch()
818836
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
819837
repositoryManagerListener.DidNotReceive().OnStatusUpdated(Args.GitStatus);
820838
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
821-
repositoryManagerListener.DidNotReceive().OnHeadUpdated(Args.String);
839+
repositoryManagerListener.DidNotReceive().OnCurrentBranchUpdated(Arg.Any<ConfigBranch?>());
840+
repositoryManagerListener.DidNotReceive().OnCurrentRemoteUpdated(Arg.Any<ConfigRemote?>());
822841
repositoryManagerListener.DidNotReceive().OnLocalBranchListUpdated(Arg.Any<Dictionary<string, ConfigBranch>>());
823842
repositoryManagerListener.DidNotReceive().OnRemoteBranchListUpdated(Arg.Any<Dictionary<string, Dictionary<string, ConfigBranch>>>());
824843
repositoryManagerListener.DidNotReceive().OnLocalBranchUpdated(Args.String);
@@ -832,8 +851,12 @@ public async Task ShouldDetectGitFetch()
832851
Repository.Owner.Should().Be("EvilStanleyGoldman");
833852
Repository.LocalPath.Should().Be(TestRepoMasterCleanUnsynchronized);
834853
Repository.IsGitHub.Should().BeTrue();
835-
Repository.CurrentBranchName.Should().Be(null);
836-
Repository.CurrentBranch.HasValue.Should().BeFalse();
854+
Repository.CurrentBranchName.Should().Be("master");
855+
Repository.CurrentBranch.HasValue.Should().BeTrue();
856+
Repository.CurrentBranch.Value.Name.Should().Be("master");
857+
Repository.CurrentBranch.Value.Remote.HasValue.Should().BeTrue();
858+
Repository.CurrentBranch.Value.Remote.Value.Name.Should().Be("origin");
859+
Repository.CurrentBranch.Value.Remote.Value.Url.Should().Be("https://github.com/EvilStanleyGoldman/IOTestsRepo.git");
837860
Repository.CurrentRemote.HasValue.Should().BeTrue();
838861
Repository.CurrentRemote.Value.Name.Should().Be("origin");
839862
Repository.CurrentRemote.Value.Url.Should().Be("https://github.com/EvilStanleyGoldman/IOTestsRepo.git");

src/tests/UnitTests/Git/RepositoryTests.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ public void Repository()
5959

6060
var remoteDictionary = remotes.ToDictionary(remote => remote.Name);
6161

62+
var masterOriginBranch = new ConfigBranch { Name = "master", Remote = origin };
63+
6264
var branches = new[] {
63-
new ConfigBranch { Name = "master", Remote = origin },
65+
masterOriginBranch,
6466
new ConfigBranch { Name = "features/feature-1", Remote = origin }
6567
};
6668

@@ -97,7 +99,8 @@ public void Repository()
9799

98100
repositoryEvents.OnRemoteBranchListChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnRemoteBranchListChanged not raised");
99101

100-
repositoryManager.OnHeadUpdated += Raise.Event<Action<string>>("ref:refs/heads/master");
102+
repositoryManager.OnCurrentBranchUpdated += Raise.Event<Action<ConfigBranch?>>(masterOriginBranch);
103+
repositoryManager.OnCurrentRemoteUpdated += Raise.Event<Action<ConfigRemote?>>(origin);
101104

102105
repositoryEvents.OnCurrentBranchChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnCurrentBranchChanged not raised");
103106
repositoryEvents.OnCurrentRemoteChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnCurrentRemoteChanged not raised");

0 commit comments

Comments
 (0)