Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Pass IPackageSettings to UsageTracker ctor. #1598

Merged
merged 3 commits into from
Apr 13, 2018
Merged

Pass IPackageSettings to UsageTracker ctor. #1598

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
e9b501f
Pass IPackageSettings to UsageTracker ctor.
grokys Apr 13, 2018
57b165c
Make tests compile.
grokys Apr 13, 2018
bb7dc41
Helps if you save the file before committing.
grokys Apr 13, 2018
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: 2 additions & 1 deletion src/GitHub.VisualStudio/GitHubPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
{
var usageService = await GetServiceAsync(typeof(IUsageService)) as IUsageService;
var serviceProvider = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
return new UsageTracker(serviceProvider, usageService);
var settings = await GetServiceAsync(typeof(IPackageSettings)) as IPackageSettings;
return new UsageTracker(serviceProvider, usageService, settings);
}
else if (serviceType == typeof(IVSGitExt))
{
Expand Down
8 changes: 4 additions & 4 deletions src/GitHub.VisualStudio/Services/UsageTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ public sealed class UsageTracker : IUsageTracker, IDisposable
IDisposable timer;
bool firstTick = true;

[ImportingConstructor]
public UsageTracker(
IGitHubServiceProvider gitHubServiceProvider,
IUsageService service)
IUsageService service,
IPackageSettings settings)
{
this.gitHubServiceProvider = gitHubServiceProvider;
this.service = service;
timer = StartTimer();
this.userSettings = settings;
timer = StartTimer();
}

public void Dispose()
Expand Down Expand Up @@ -71,7 +72,6 @@ async Task Initialize()

client = gitHubServiceProvider.TryGetService<IMetricsService>();
connectionManager = gitHubServiceProvider.GetService<IConnectionManager>();
userSettings = gitHubServiceProvider.GetService<IPackageSettings>();
vsservices = gitHubServiceProvider.GetService<IVSServices>();
initialized = true;
}
Expand Down
23 changes: 15 additions & 8 deletions test/UnitTests/GitHub.VisualStudio/Services/MetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class UsageTrackerTests : TestBaseClass
public void ShouldStartTimer()
{
var service = Substitute.For<IUsageService>();
var target = new UsageTracker(CreateServiceProvider(), service);
var target = new UsageTracker(CreateServiceProvider(), service, CreatePackageSettings());

service.Received(1).StartTimer(Arg.Any<Func<Task>>(), TimeSpan.FromMinutes(3), TimeSpan.FromHours(8));
}
Expand Down Expand Up @@ -147,7 +147,8 @@ public async Task ShouldIncrementCounter()
var usageService = CreateUsageService(model);
var target = new UsageTracker(
CreateServiceProvider(),
usageService);
usageService,
CreatePackageSettings());

await target.IncrementCounter(x => x.NumberOfClones);
UsageData result = usageService.ReceivedCalls().First(x => x.GetMethodInfo().Name == "WriteLocalData").GetArguments()[0] as UsageData;
Expand All @@ -162,7 +163,8 @@ public async Task ShouldWriteData()

var target = new UsageTracker(
CreateServiceProvider(),
service);
service,
CreatePackageSettings());

await target.IncrementCounter(x => x.NumberOfClones);
await service.Received(1).WriteLocalData(Arg.Is<UsageData>(data =>
Expand Down Expand Up @@ -196,7 +198,8 @@ public async Task ShouldWriteUpdatedData()

var target = new UsageTracker(
CreateServiceProvider(),
service);
service,
CreatePackageSettings());

await target.IncrementCounter(x => x.NumberOfClones);
await service.Received(1).WriteLocalData(Arg.Is<UsageData>(data =>
Expand All @@ -218,7 +221,7 @@ static Tuple<UsageTracker, Func<Task>> CreateTargetAndGetTick(
service.WhenForAnyArgs(x => x.StartTimer(null, new TimeSpan(), new TimeSpan()))
.Do(x => tick = x.ArgAt<Func<Task>>(0));

var target = new UsageTracker(serviceProvider, service);
var target = new UsageTracker(serviceProvider, service, CreatePackageSettings());

return Tuple.Create(target, tick);
}
Expand All @@ -228,20 +231,24 @@ static IGitHubServiceProvider CreateServiceProvider(bool hasMetricsService = tru
var result = Substitute.For<IGitHubServiceProvider>();
var connectionManager = Substitute.For<IConnectionManager>();
var metricsService = Substitute.For<IMetricsService>();
var packageSettings = Substitute.For<IPackageSettings>();
var vsservices = Substitute.For<IVSServices>();

connectionManager.Connections.Returns(new ObservableCollectionEx<IConnection>());
packageSettings.CollectMetrics.Returns(true);

result.GetService<IConnectionManager>().Returns(connectionManager);
result.GetService<IPackageSettings>().Returns(packageSettings);
result.GetService<IVSServices>().Returns(vsservices);
result.TryGetService<IMetricsService>().Returns(hasMetricsService ? metricsService : null);

return result;
}

static IPackageSettings CreatePackageSettings()
{
var result = Substitute.For<IPackageSettings>();
result.CollectMetrics.Returns(true);
return result;
}

static IUsageService CreateUsageService(
UsageModel model = null)
{
Expand Down