Skip to content

Commit 6f1987e

Browse files
committed
Use in-memory config data instead of a JSON config file
1 parent 528c43f commit 6f1987e

File tree

3 files changed

+35
-34
lines changed

3 files changed

+35
-34
lines changed

test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/BasicConfig.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/Microsoft.Extensions.Caching.Hybrid.Tests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,4 @@
2323
<PackageReference Include="Xunit.SkippableFact" />
2424
</ItemGroup>
2525

26-
<ItemGroup>
27-
<None Update="BasicConfig.json">
28-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
29-
</None>
30-
</ItemGroup>
31-
3226
</Project>

test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/ServiceConstructionTests.cs

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,12 @@ public void CanCreateRedisAndSqlServerBackedHybridCaches()
270270
[Fact]
271271
public void CanParseOptions_NoEntryOptions()
272272
{
273-
var source = new JsonConfigurationSource { Path = "BasicConfig.json" };
274-
var configBuilder = new ConfigurationBuilder { Sources = { source } };
273+
var configBuilder = new ConfigurationBuilder();
274+
275+
configBuilder.AddInMemoryCollection([
276+
new("no_entry_options:MaximumKeyLength", "937")
277+
]);
278+
275279
var config = configBuilder.Build();
276280
var options = new HybridCacheOptions();
277281
ConfigurationBinder.Bind(config, "no_entry_options", options);
@@ -283,8 +287,14 @@ public void CanParseOptions_NoEntryOptions()
283287
[Fact]
284288
public void CanParseOptions_WithEntryOptions() // in particular, check we can parse the timespan and [Flags] enums
285289
{
286-
var source = new JsonConfigurationSource { Path = "BasicConfig.json" };
287-
var configBuilder = new ConfigurationBuilder { Sources = { source } };
290+
var configBuilder = new ConfigurationBuilder();
291+
292+
configBuilder.AddInMemoryCollection([
293+
new("with_entry_options:MaximumKeyLength", "937"),
294+
new("with_entry_options:DefaultEntryOptions:Flags", "DisableCompression, DisableLocalCacheRead"),
295+
new("with_entry_options:DefaultEntryOptions:LocalCacheExpiration", "00:02:00")
296+
]);
297+
288298
var config = configBuilder.Build();
289299
var options = new HybridCacheOptions();
290300
ConfigurationBinder.Bind(config, "with_entry_options", options);
@@ -300,8 +310,13 @@ public void CanParseOptions_WithEntryOptions() // in particular, check we can pa
300310
[Fact]
301311
public void CanCreateKeyedServicesWithKeyedDistributedCaches_UsingNamedOptions()
302312
{
303-
var source = new JsonConfigurationSource { Path = "BasicConfig.json" };
304-
var configBuilder = new ConfigurationBuilder { Sources = { source } };
313+
var configBuilder = new ConfigurationBuilder();
314+
315+
configBuilder.AddInMemoryCollection([
316+
new("HybridOne:DistributedCacheServiceKey", "DistributedOne"),
317+
new("HybridTwo:DistributedCacheServiceKey", "DistributedTwo")
318+
]);
319+
305320
var config = configBuilder.Build();
306321

307322
var services = new ServiceCollection();
@@ -335,8 +350,13 @@ public void CanCreateKeyedServicesWithKeyedDistributedCaches_UsingNamedOptions()
335350
[Fact]
336351
public void CanCreateKeyedServicesWithKeyedDistributedCaches_UsingSetupActions()
337352
{
338-
var source = new JsonConfigurationSource { Path = "BasicConfig.json" };
339-
var configBuilder = new ConfigurationBuilder { Sources = { source } };
353+
var configBuilder = new ConfigurationBuilder();
354+
355+
configBuilder.AddInMemoryCollection([
356+
new("HybridOne:DistributedCacheServiceKey", "DistributedOne"),
357+
new("HybridTwo:DistributedCacheServiceKey", "DistributedTwo")
358+
]);
359+
340360
var config = configBuilder.Build();
341361

342362
var services = new ServiceCollection();
@@ -368,8 +388,13 @@ public void CanCreateKeyedServicesWithKeyedDistributedCaches_UsingSetupActions()
368388
[Fact]
369389
public void CanCreateKeyedServicesWithKeyedDistributedCaches_UsingNamedOptionsAndSetupActions()
370390
{
371-
var source = new JsonConfigurationSource { Path = "BasicConfig.json" };
372-
var configBuilder = new ConfigurationBuilder { Sources = { source } };
391+
var configBuilder = new ConfigurationBuilder();
392+
393+
configBuilder.AddInMemoryCollection([
394+
new("HybridOne:DistributedCacheServiceKey", "DistributedOne"),
395+
new("HybridTwo:DistributedCacheServiceKey", "DistributedTwo")
396+
]);
397+
373398
var config = configBuilder.Build();
374399

375400
var services = new ServiceCollection();

0 commit comments

Comments
 (0)