Skip to content

Commit be3b6a3

Browse files
committed
Extracted common interface
1 parent 81bbc07 commit be3b6a3

File tree

9 files changed

+24
-20
lines changed

9 files changed

+24
-20
lines changed

RetailCoder.VBE/Rubberduck.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,10 @@
407407
<Compile Include="UI\SourceControl\IDeleteBranchView.cs" />
408408
<Compile Include="UI\SourceControl\IMergeView.cs" />
409409
<Compile Include="UI\SourceControl\IProviderPresenter.cs" />
410+
<Compile Include="UI\SourceControl\IRefreshableView.cs" />
410411
<Compile Include="UI\SourceControl\ISettingsView.cs" />
411412
<Compile Include="UI\SourceControl\ISourceControlView.cs" />
412-
<Compile Include="UI\SourceControl\IUnsyncedCommitsView.cs" />
413+
<Compile Include="UI\SourceControl\IUnSyncedCommitsView.cs" />
413414
<Compile Include="UI\SourceControl\MergeForm.cs">
414415
<SubType>Form</SubType>
415416
</Compile>

RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
namespace Rubberduck.UI.SourceControl
88
{
9-
public interface IBranchesPresenter : IProviderPresenter
9+
public interface IBranchesPresenter : IProviderPresenter, IRefreshable
1010
{
11-
void RefreshView();
1211
event EventHandler<EventArgs> BranchChanged;
1312
}
1413

RetailCoder.VBE/UI/SourceControl/ChangesPresenter.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
namespace Rubberduck.UI.SourceControl
77
{
8-
public interface IChangesPresenter : IProviderPresenter
8+
public interface IChangesPresenter : IProviderPresenter, IRefreshable
99
{
10-
void Refresh();
1110
void Commit();
1211
}
1312

@@ -47,7 +46,7 @@ private bool ShouldEnableCommit()
4746
return !string.IsNullOrEmpty(_view.CommitMessage) && _view.CommitAction != CommitAction.Unset;
4847
}
4948

50-
public void Refresh()
49+
public void RefreshView()
5150
{
5251
var fileStats = this.Provider.Status().ToList();
5352

@@ -86,7 +85,7 @@ private void OnCommit(object sender, EventArgs e)
8685
{
8786
Commit();
8887
_view.CommitMessage = string.Empty;
89-
Refresh();
88+
RefreshView();
9089
}
9190
}
9291
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace Rubberduck.UI.SourceControl
2+
{
3+
public interface IRefreshable
4+
{
5+
void RefreshView();
6+
}
7+
}

RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public SourceControlPresenter
4848

4949
private void _branchesPresenter_BranchChanged(object sender, EventArgs e)
5050
{
51-
_changesPresenter.Refresh();
51+
_changesPresenter.RefreshView();
5252
}
5353

5454
private void OnInitNewRepository(object sender, EventArgs e)
@@ -147,7 +147,7 @@ private void SetChildPresenterSourceControlProviders(ISourceControlProvider prov
147147
_unsyncedPresenter.Provider = provider;
148148

149149
_branchesPresenter.RefreshView();
150-
_changesPresenter.Refresh();
150+
_changesPresenter.RefreshView();
151151
// Purposely not refreshing settingsPresenter.
152152
// Settings it's provider doesn't affect it's view.
153153
}

RetailCoder.VBE/UI/SourceControl/UnsyncedCommitsPresenter.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77

88
namespace Rubberduck.UI.SourceControl
99
{
10-
public interface IUnsyncedCommitsPresenter
10+
public interface IUnsyncedCommitsPresenter : IProviderPresenter, IRefreshable
1111
{
12-
ISourceControlProvider Provider { get; set; }
13-
void Refresh();
1412
}
1513

1614
public class UnsyncedCommitsPresenter : IUnsyncedCommitsPresenter
@@ -51,7 +49,7 @@ void OnSync(object sender, EventArgs e)
5149
Provider.Push();
5250
}
5351

54-
public void Refresh()
52+
public void RefreshView()
5553
{
5654
if (this.Provider != null)
5755
{

RubberduckTests/SourceControl/ChangesPresenterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void RefreshDisplaysChangedFiles()
111111

112112
var presenter = new ChangesPresenter(_viewMock.Object, _providerMock.Object);
113113
//act
114-
presenter.Refresh();
114+
presenter.RefreshView();
115115

116116
//Assert
117117
Assert.AreEqual(2, _viewMock.Object.IncludedChanges.Count, "Incorrect Included Changes");
@@ -184,7 +184,7 @@ public void ExcludedIsClearedAfterRefresh()
184184
Assert.IsTrue(_viewMock.Object.ExcludedChanges.Any(), "No changes found prior to refresh. Issue with Test code.");
185185

186186
//act
187-
presenter.Refresh();
187+
presenter.RefreshView();
188188

189189
//
190190
Assert.IsFalse(_viewMock.Object.ExcludedChanges.Any());

RubberduckTests/SourceControl/SCPresenterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private void SetupValidVbProject()
9393
private void VerifyOffline()
9494
{
9595
Assert.AreEqual("Offline", _view.Object.Status);
96-
_changesPresenter.Verify(c => c.Refresh(), Times.Never);
96+
_changesPresenter.Verify(c => c.RefreshView(), Times.Never);
9797
_branchesPresenter.Verify(b => b.RefreshView(), Times.Never);
9898
}
9999

@@ -178,7 +178,7 @@ public void ChangesRefreshOnRefreshEvent()
178178
_view.Raise(v => v.RefreshData += null, new EventArgs());
179179

180180
//assert
181-
_changesPresenter.Verify(c => c.Refresh(), Times.Once);
181+
_changesPresenter.Verify(c => c.RefreshView(), Times.Once);
182182
}
183183

184184
[TestMethod]

RubberduckTests/SourceControl/UnsyncedCommitsPresenterTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void UnsyncedPresenter_AfterRefresh_ViewBranchIsCurrentBranch()
4444
//Arrange
4545

4646
//Act
47-
_presenter.Refresh();
47+
_presenter.RefreshView();
4848

4949
//Assert
5050
Assert.AreEqual(_initialBranch.Name, _view.Object.CurrentBranch);
@@ -56,7 +56,7 @@ public void UnsyncedPresenter_AfterRefresh_IncomingCommitsAreDisplayed()
5656
//Arrange
5757

5858
//Act
59-
_presenter.Refresh();
59+
_presenter.RefreshView();
6060

6161
//Assert
6262
CollectionAssert.AreEquivalent(_provider.Object.UnsyncedRemoteCommits.ToList(), _view.Object.IncomingCommits.ToList());
@@ -68,7 +68,7 @@ public void UnsyncedPresenter_AfterRefresh_OutgoingCommitsAreDisplayed()
6868
//Arrange
6969

7070
//Act
71-
_presenter.Refresh();
71+
_presenter.RefreshView();
7272

7373
//Assert
7474
CollectionAssert.AreEquivalent(_provider.Object.UnsyncedLocalCommits.ToList(), _view.Object.OutgoingCommits.ToList());

0 commit comments

Comments
 (0)