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

Commit 0b30623

Browse files
StanleyGoldmanStanleyGoldman
committed
Fixing most integration tests
1 parent 20541e5 commit 0b30623

File tree

2 files changed

+58
-31
lines changed

2 files changed

+58
-31
lines changed

‎src/GitHub.Api/Git/RepositoryManager.cs‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public RepositoryManager(IPlatform platform, ITaskManager taskManager, IUsageTra
147147
this.watcher = repositoryWatcher;
148148
this.config = gitConfig;
149149

150-
SetupConfig(repositoryPaths);
151150
SetupWatcher();
152151
}
153152

@@ -160,6 +159,10 @@ public void Initialize()
160159
public void Start()
161160
{
162161
Logger.Trace("Start");
162+
163+
ReadHead();
164+
RefreshConfigData();
165+
163166
watcher.Start();
164167
}
165168

@@ -225,7 +228,9 @@ public ITask RemoteAdd(string remote, string url)
225228
HookupHandlers(task);
226229
if (!platform.Environment.IsWindows)
227230
{
228-
task.Then(_ => UpdateConfigData());
231+
task.Then(_ => {
232+
RefreshConfigData(true);
233+
});
229234
}
230235
return task;
231236
}
@@ -236,7 +241,9 @@ public ITask RemoteRemove(string remote)
236241
HookupHandlers(task);
237242
if (!platform.Environment.IsWindows)
238243
{
239-
task.Then(_ => UpdateConfigData());
244+
task.Then(_ => {
245+
RefreshConfigData(true);
246+
});
240247
}
241248
return task;
242249
}
@@ -310,10 +317,9 @@ private void SetupWatcher()
310317
watcher.RemoteBranchDeleted += Watcher_OnRemoteBranchDeleted;
311318
}
312319

313-
private void SetupConfig(IRepositoryPathConfiguration repositoryPaths)
320+
private void ReadHead()
314321
{
315-
this.head = repositoryPaths.DotGitHead.ReadAllLines().FirstOrDefault();
316-
RefreshConfigData();
322+
head = repositoryPaths.DotGitHead.ReadAllLines().FirstOrDefault();
317323
}
318324

319325
private ITask HookupHandlers(ITask task, bool disableWatcher = false)
@@ -376,21 +382,15 @@ private void UpdateGitStatus()
376382

377383
private void Watcher_OnConfigChanged()
378384
{
379-
UpdateConfigData();
380-
}
381-
382-
private void UpdateConfigData()
383-
{
384-
config.Reset();
385-
RefreshConfigData();
385+
RefreshConfigData(true);
386386
}
387387

388388
private void Watcher_OnHeadChanged(string contents)
389389
{
390390
Logger.Trace("Watcher_OnHeadChanged");
391391
head = contents;
392392
OnActiveBranchChanged?.Invoke(GetActiveBranch());
393-
OnActiveRemoteChanged.Invoke(GetActiveRemote());
393+
OnActiveRemoteChanged?.Invoke(GetActiveRemote());
394394
UpdateGitStatus();
395395
}
396396

@@ -417,9 +417,15 @@ private void Watcher_OnLocalBranchChanged(string name)
417417
}
418418
}
419419

420-
private void RefreshConfigData()
420+
private void RefreshConfigData(bool resetConfig = false)
421421
{
422+
if (resetConfig)
423+
{
424+
config.Reset();
425+
}
426+
422427
Logger.Trace("RefreshConfigData");
428+
423429
LoadBranchesFromConfig();
424430
LoadRemotesFromConfig();
425431

@@ -435,6 +441,8 @@ private void LoadBranchesFromConfig()
435441

436442
private void LoadBranchesFromConfig(NPath path, IEnumerable<ConfigBranch> configBranches, string prefix)
437443
{
444+
Logger.Trace("LoadBranchesFromConfig");
445+
438446
foreach (var file in path.Files())
439447
{
440448
var branchName = prefix + file.FileName;
@@ -455,6 +463,8 @@ private void LoadBranchesFromConfig(NPath path, IEnumerable<ConfigBranch> config
455463

456464
private void LoadRemotesFromConfig()
457465
{
466+
Logger.Trace("LoadRemotesFromConfig");
467+
458468
remotes = config.GetRemotes().ToDictionary(x => x.Name, x => x);
459469
remoteBranches = new Dictionary<string, Dictionary<string, ConfigBranch>>();
460470

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

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public async Task ShouldDetectFileChanges()
5656
repositoryManagerListener.DidNotReceive().OnHeadChanged();
5757
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
5858
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
59-
repositoryManagerListener.DidNotReceive().OnIsBusyChanged(Args.Bool);
59+
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
6060
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
6161

6262
result.AssertEqual(expected);
@@ -149,7 +149,7 @@ public async Task ShouldDetectBranchChange()
149149
await RepositoryManager.SwitchBranch("feature/document").StartAsAsync();
150150
await TaskManager.Wait();
151151
RepositoryManager.WaitForEvents();
152-
WaitForNotBusy(repositoryManagerEvents, 1);
152+
WaitForNotBusy(repositoryManagerEvents, 5);
153153

154154
//TODO: Understand why this test does not pass consistently
155155
repositoryManagerListener.Received().OnStatusUpdate(Args.GitStatus);
@@ -178,8 +178,9 @@ public async Task ShouldDetectBranchDelete()
178178
WaitForNotBusy(repositoryManagerEvents, 1);
179179

180180
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
181-
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
182-
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
181+
//TODO: Deleting a branch causes a config reload, which raises OnActiveBranchChanged/OnActiveRemoteChanged
182+
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
183+
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
183184
repositoryManagerListener.DidNotReceive().OnHeadChanged();
184185
repositoryManagerListener.Received(1).OnLocalBranchListChanged();
185186
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
@@ -273,7 +274,7 @@ public async Task ShouldDetectChangesToRemotes()
273274
Environment.Repository.Owner.Should().Be("EvilShana");
274275

275276
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
276-
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
277+
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
277278
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
278279
repositoryManagerListener.DidNotReceive().OnHeadChanged();
279280
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
@@ -298,29 +299,45 @@ public async Task ShouldDetectChangesToRemotesWhenSwitchingBranches()
298299
Environment.Repository.Owner.Should().Be("EvilStanleyGoldman");
299300

300301
await RepositoryManager.CreateBranch("branch2", "another/master")
301-
.Then(RepositoryManager.SwitchBranch("branch2"))
302+
//.Then(RepositoryManager.SwitchBranch("branch2"))
302303
.StartAsAsync();
304+
305+
await TaskManager.Wait();
306+
RepositoryManager.WaitForEvents();
307+
308+
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
309+
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
310+
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
311+
repositoryManagerListener.DidNotReceive().OnHeadChanged();
312+
repositoryManagerListener.Received().OnLocalBranchListChanged();
313+
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
314+
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
315+
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
316+
317+
repositoryManagerListener.ClearReceivedCalls();
318+
repositoryManagerEvents.Reset();
319+
320+
await RepositoryManager.SwitchBranch("branch2")
321+
.StartAsAsync();
322+
303323
await TaskManager.Wait();
304324
RepositoryManager.WaitForEvents();
305325

306326
Environment.Repository.CurrentRemote.HasValue.Should().BeTrue();
307327
Environment.Repository.CurrentRemote.Value.Name.Should().Be("another");
308328

309329
var expectedRemoteUrl = "https://another.remote/Owner/Url.git";
310-
311-
Assert.AreEqual(expectedRemoteUrl, Environment.Repository.CurrentRemote.Value.Url, "Remote is wrong");
312-
Assert.AreEqual(expectedRemoteUrl, Environment.Repository.CloneUrl?.ToString(), "CloneUrl is wrong");
330+
Environment.Repository.CurrentRemote.Value.Url.Should().Be(expectedRemoteUrl);
331+
Environment.Repository.CloneUrl.ToString().Should().Be(expectedRemoteUrl);
313332
Environment.Repository.Owner.Should().Be("Owner");
314333

315-
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
316-
317334
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
318335
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
319336
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
320-
repositoryManagerListener.Received().OnHeadChanged();
337+
repositoryManagerListener.DidNotReceive().OnHeadChanged();
321338
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
322339
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
323-
repositoryManagerListener.DidNotReceive().OnIsBusyChanged(Args.Bool);
340+
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
324341
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
325342
}
326343

@@ -372,7 +389,7 @@ public async Task ShouldUpdateCloneUrlIfRemoteIsDeleted()
372389

373390
repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus);
374391
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
375-
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
392+
repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
376393
repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
377394
repositoryManagerListener.DidNotReceive().OnHeadChanged();
378395
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
@@ -403,9 +420,9 @@ public async Task ShouldDetectGitPull()
403420

404421
repositoryManagerListener.Received().OnStatusUpdate(Args.GitStatus);
405422
repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool);
406-
repositoryManagerListener.Received(1).OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
423+
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
407424
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
408-
repositoryManagerListener.Received(1).OnHeadChanged();
425+
repositoryManagerListener.DidNotReceive().OnHeadChanged();
409426
repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged();
410427
repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged();
411428
repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);

0 commit comments

Comments
 (0)