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

Refactor RepositoryWatcher event batching #328

Merged
StanleyGoldman merged 3 commits into from
Sep 19, 2017
Merged

Refactor RepositoryWatcher event batching #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b4d77e
Missing fix
StanleyGoldman Sep 18, 2017
4b6c178
Merge branch 'fixes/integration-tests' into fixes/repository-watcher-…
StanleyGoldman Sep 18, 2017
553c13b
Fixing tests
StanleyGoldman Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/GitHub.Api/Git/RepositoryManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,9 @@ private void RefreshConfigData(bool resetConfig = false)
LoadBranchesFromConfig();
LoadRemotesFromConfig();

OnLocalBranchListChanged?.Invoke();
OnRemoteBranchListChanged?.Invoke();

OnActiveBranchChanged?.Invoke(GetActiveBranch());
OnActiveRemoteChanged?.Invoke(GetActiveRemote());
}
Expand Down
16 changes: 10 additions & 6 deletions src/tests/IntegrationTests/Events/RepositoryManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ public async Task ShouldDetectChangesToRemotes()
await RepositoryManager.RemoteRemove("origin").StartAsAsync();
await TaskManager.Wait();
RepositoryManager.WaitForEvents();
WaitForNotBusy(repositoryManagerEvents);
repositoryManagerEvents.OnRemoteBranchListChanged.WaitOne(TimeSpan.FromSeconds(1));

Environment.Repository.CurrentRemote.HasValue.Should().BeFalse();

Expand All @@ -310,7 +312,7 @@ public async Task ShouldDetectChangesToRemotes()
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnRemoteBranchListChanged();
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
Expand All @@ -321,6 +323,8 @@ public async Task ShouldDetectChangesToRemotes()
await RepositoryManager.RemoteAdd("origin", "https://github.com/EvilShana/IOTestsRepo.git").StartAsAsync();
await TaskManager.Wait();
RepositoryManager.WaitForEvents();
WaitForNotBusy(repositoryManagerEvents);
repositoryManagerEvents.OnRemoteBranchListChanged.WaitOne(TimeSpan.FromSeconds(1));

Environment.Repository.CurrentRemote.HasValue.Should().BeTrue();
Environment.Repository.CurrentRemote.Value.Name.Should().Be("origin");
Expand All @@ -332,8 +336,8 @@ public async Task ShouldDetectChangesToRemotes()
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
repositoryManagerListener.Received().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnRemoteBranchListChanged();
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
}
Expand Down Expand Up @@ -422,7 +426,7 @@ public async Task ShouldUpdateCloneUrlIfRemoteIsDeleted()
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnRemoteBranchListChanged();
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);

Expand All @@ -443,8 +447,8 @@ public async Task ShouldUpdateCloneUrlIfRemoteIsDeleted()
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
repositoryManagerListener.Received().OnLocalBranchListChanged();
repositoryManagerListener.Received().OnRemoteBranchListChanged();
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
}

Expand Down
2 changes: 1 addition & 1 deletion src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public async Task ShouldDetectFileChanges()
Logger.Trace("Continue test");

repositoryWatcherListener.DidNotReceive().ConfigChanged();
repositoryWatcherListener.DidNotReceive().HeadChanged(Args.String);
repositoryWatcherListener.DidNotReceive().HeadChanged();
repositoryWatcherListener.Received().IndexChanged();
repositoryWatcherListener.DidNotReceive().LocalBranchCreated(Args.String);
repositoryWatcherListener.DidNotReceive().LocalBranchDeleted(Args.String);
Expand Down
4 changes: 2 additions & 2 deletions src/tests/IntegrationTests/IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@
<Link>sfw_x64.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll.meta">
<Link>sfw_x64.dll.meta</Link>
<None Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll">
<Link>pthreadVC2.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand Down