Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions src/Microsoft.FeatureManagement/FeatureManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,21 @@ private class ConfigurationCacheItem
/// </summary>
/// <param name="featureDefinitionProvider">The provider of feature flag definitions.</param>
/// <param name="options">Options controlling the behavior of the feature manager.</param>
/// <param name="featureFilters">The collection of feature filter metadata.</param>
/// <param name="sessionManagers">The collection of session managers.</param>
/// <exception cref="ArgumentNullException">Thrown if <paramref name="featureDefinitionProvider"/> is null.</exception>
public FeatureManager(
IFeatureDefinitionProvider featureDefinitionProvider,
FeatureManagementOptions options = null)
FeatureManagementOptions options = null,
IEnumerable<IFeatureFilterMetadata> featureFilters = null,
IEnumerable<ISessionManager> sessionManagers = null)
{
_filterMetadataCache = new ConcurrentDictionary<string, IFeatureFilterMetadata>();
_contextualFeatureFilterCache = new ConcurrentDictionary<string, ContextualFeatureFilterEvaluator>();
_featureDefinitionProvider = featureDefinitionProvider ?? throw new ArgumentNullException(nameof(featureDefinitionProvider));
_options = options ?? new FeatureManagementOptions();
_featureFilters = Enumerable.Empty<IFeatureFilterMetadata>();
_sessionManagers = Enumerable.Empty<ISessionManager>();
_featureFilters = featureFilters ?? Enumerable.Empty<IFeatureFilterMetadata>();
_sessionManagers = sessionManagers ?? Enumerable.Empty<ISessionManager>();
}

/// <summary>
Expand Down
36 changes: 36 additions & 0 deletions tests/Tests.FeatureManagement/FeatureManagement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1027,5 +1027,41 @@ public async Task BindsFeatureFlagSettings()

Assert.True(called);
}

[Fact]
public void ConstructorUsesFallbackValues()
{
var config = new ConfigurationBuilder().AddJsonFile("appsettings.json").Build();
var configDefinitionProvider = new ConfigurationFeatureDefinitionProvider(config);
var featureManager = new FeatureManager(configDefinitionProvider);

Assert.Empty(featureManager.FeatureFilters);
Assert.Empty(featureManager.SessionManagers);
}

[Fact]
public void ConstructorSetsOptionalValues()
{
var config = new ConfigurationBuilder().AddJsonFile("appsettings.json").Build();
var configDefinitionProvider = new ConfigurationFeatureDefinitionProvider(config);
var options = new FeatureManagementOptions();
var featureFilters = new List<IFeatureFilterMetadata>
{
new TestFilter()
};
var sessionManagers = new List<ISessionManager>
{
new TestSessionManager()
};
var featureManager = new FeatureManager(
configDefinitionProvider,
options,
featureFilters,
sessionManagers
);

Assert.Single(featureManager.FeatureFilters);
Assert.Single(featureManager.SessionManagers);
}
}
}
25 changes: 25 additions & 0 deletions tests/Tests.FeatureManagement/TestSessionManager.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.FeatureManagement;

namespace Tests.FeatureManagement
{
class TestSessionManager : ISessionManager
{
private readonly IDictionary<string, bool> _features = new Dictionary<string, bool>();

public Task SetAsync(string featureName, bool enabled)
{
_features[featureName] = enabled;

return Task.CompletedTask;
}

public Task<bool?> GetAsync(string featureName)
{
bool? result = _features.TryGetValue(featureName, out var feature) ? feature : null;

return Task.FromResult(result);
}
}
}