Skip to content

Supports cache entries monitoring #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatteoSp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Supports cache entries monitoring #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ In the C# example above, the `cache` variable is an instance of the `System.Runt
<cacheItemPolicy name="MyPolicy02" absoluteExpiration="09/15/2073 16:45:00" enabled="true" />
<cacheItemPolicy name="MyPolicy03" absoluteExpiration="infinite" enabled="true" />
<cacheItemPolicy name="MyPolicy04" slidingExpiration="0.00:20:00" enabled="true" />
<cacheItemPolicy name="MyPolicy05" slidingExpiration="0.00:20:00" enabled="true">
<cacheEntries>
<cacheEntry key="aKeyToBeMonitored"/>
<cacheEntry key="anotherOne"/>
<cacheEntry key="andSoOn"/>
</cacheEntries>
</cacheItemPolicy>
</cacheItemPolicies>
</configuration>

Expand Down
10 changes: 5 additions & 5 deletions src/.nuget/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
</configuration>
12 changes: 12 additions & 0 deletions src/CacheItemPolicyConfiguration.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,17 @@
<cacheItemPolicy name="TestPolicySlidingSetToZeroWithEnabledAttributeTrue" slidingExpiration="0.00:00:00" enabled="true" />
<cacheItemPolicy name="TestPolicySlidingSetToSecondsWithEnabledAttributeTrue" slidingExpiration="0.00:00:30" enabled="true" />
<cacheItemPolicy name="TestPolicySlidingWithoutEnabledAttribute" slidingExpiration="0.00:05:00"/>

<!-- Cache entries to be monitored -->
<cacheItemPolicy name="TestPolicyCacheEntries" enabled="true">
<cacheEntries>
<cacheEntry key="aKeyToBeMonitored"/>
<cacheEntry key="anotherOne"/>
<cacheEntry key="andSoOn"/>
</cacheEntries>
</cacheItemPolicy>

<!-- Empty Cache entries -->
<cacheItemPolicy name="TestPolicyCacheEntriesEmpty" enabled="true"/>
</cacheItemPolicies>
</configuration>
152 changes: 79 additions & 73 deletions src/CacheItemPolicyConfiguration.Tests/CacheItemPolicyConfiguration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{EC6ED966-52A6-4AEA-828D-75C2DFDAAB41}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CacheItemPolicyConfiguration</RootNamespace>
<AssemblyName>CacheItemPolicyConfiguration.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>082f7e14</NuGetPackageImportStamp>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Should">
<HintPath>..\packages\Should.1.1.20\lib\Should.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="xunit">
<HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
<Reference Include="xunit.extensions">
<HintPath>..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ProgrammaticConfigIntegrationTests.cs" />
<Compile Include="ConfigFileIntegrationTests.cs" />
<Compile Include="TestHelpers\MockCacheItemPolicyDateTimeProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CacheItemPolicyConfiguration\CacheItemPolicyConfiguration.csproj">
<Project>{3e8fa116-5469-4247-9787-3b08b6736c02}</Project>
<Name>CacheItemPolicyConfiguration</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{EC6ED966-52A6-4AEA-828D-75C2DFDAAB41}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CacheItemPolicyConfiguration</RootNamespace>
<AssemblyName>CacheItemPolicyConfiguration.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Should">
<HintPath>..\packages\Should.1.1.20\lib\Should.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="xunit">
<HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
<Reference Include="xunit.extensions">
<HintPath>..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ProgrammaticConfigIntegrationTests.cs" />
<Compile Include="ConfigFileIntegrationTests.cs" />
<Compile Include="TestHelpers\MockCacheItemPolicyDateTimeProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CacheItemPolicyConfiguration\CacheItemPolicyConfiguration.csproj">
<Project>{3e8fa116-5469-4247-9787-3b08b6736c02}</Project>
<Name>CacheItemPolicyConfiguration</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
-->
</Project>
43 changes: 40 additions & 3 deletions src/CacheItemPolicyConfiguration.Tests/ConfigFileIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Runtime.Caching;
using CacheItemPolicyConfiguration.ConfigFile;
using CacheItemPolicyConfiguration.TestHelpers;
using Should;
using Xunit.Extensions;

using System.Collections.ObjectModel;

namespace CacheItemPolicyConfiguration
{
/// <summary>
Expand Down Expand Up @@ -158,6 +160,41 @@ public static IEnumerable<object[]> CanCreateCacheItemPolicyWithSlidingExpiratio
yield return new object[] { "TestPolicySlidingSetToSecondsWithEnabledAttributeTrue", TimeSpan.FromSeconds(30), false };
yield return new object[] { "TestPolicySlidingWithoutEnabledAttribute", TimeSpan.FromMinutes(5), false };
}
}
}
}


[Theory, PropertyData("CanCreateCacheItemPolicyWithCacheEntriesFromDotNetConfigFileTestData")]
public void CanCreateCacheItemPolicyWithCacheEntriesFromDotNetConfigFile(string cacheItemPolicyName, ReadOnlyCollection<string> cacheEntries, bool monitorShouldBeNull)
{
// Arrange
var expected = cacheEntries;
var config = new ConfigFileBasedCacheItemPolicyConfiguration();
var factory = new CacheItemPolicyFactory(config);

// Act
var cacheItemPolicy = factory.Create(cacheItemPolicyName);
var entriesMonitor = cacheItemPolicy.ChangeMonitors.FirstOrDefault() as CacheEntryChangeMonitor;

// Assert
if (monitorShouldBeNull)
{
entriesMonitor.ShouldBeNull();
return;
}

entriesMonitor.ShouldNotBeNull();
entriesMonitor.ShouldImplement<CacheEntryChangeMonitor>();

entriesMonitor.CacheKeys.ShouldEqual(expected);
}

public static IEnumerable<object[]> CanCreateCacheItemPolicyWithCacheEntriesFromDotNetConfigFileTestData
{
get
{
yield return new object[] { "TestPolicyCacheEntries", new ReadOnlyCollection<string>(new string[] { "aKeyToBeMonitored", "anotherOne", "andSoOn" }), false };
yield return new object[] { "TestPolicyCacheEntriesEmpty", null, true };
}
}
}
}
49 changes: 44 additions & 5 deletions src/CacheItemPolicyConfiguration.Tests/ProgrammaticConfigIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Caching;
using CacheItemPolicyConfiguration.TestHelpers;
using Should;
using Xunit.Extensions;

using System.Collections.ObjectModel;

namespace CacheItemPolicyConfiguration
{
/// <summary>
Expand Down Expand Up @@ -47,8 +49,11 @@ static ProgrammaticConfigIntegrationTests()
new CacheItemPolicyConfigurationItem("TestPolicySlidingWithEnabledAttributeFalse", TimeSpan.MaxValue, false),
new CacheItemPolicyConfigurationItem("TestPolicySlidingSetToZeroWithEnabledAttributeTrue", ObjectCache.InfiniteAbsoluteExpiration),
new CacheItemPolicyConfigurationItem("TestPolicySlidingSetToSecondsWithEnabledAttributeTrue", TimeSpan.FromSeconds(30)),
new CacheItemPolicyConfigurationItem("TestPolicySlidingWithoutEnabledAttribute", TimeSpan.FromMinutes(5))
});
new CacheItemPolicyConfigurationItem("TestPolicySlidingWithoutEnabledAttribute", TimeSpan.FromMinutes(5)),

new CacheItemPolicyConfigurationItem("TestPolicyCacheEntries", new string[] { "aKeyToBeMonitored", "anotherOne", "andSoOn" }),
new CacheItemPolicyConfigurationItem("TestPolicyCacheEntriesEmpty", new string[0])
});
}
finally
{
Expand Down Expand Up @@ -197,6 +202,40 @@ public static IEnumerable<object[]> CanCreateCacheItemPolicyWithSlidingExpiratio
yield return new object[] { "TestPolicySlidingSetToSecondsWithEnabledAttributeTrue", TimeSpan.FromSeconds(30), false };
yield return new object[] { "TestPolicySlidingWithoutEnabledAttribute", TimeSpan.FromMinutes(5), false };
}
}
}
}


[Theory, PropertyData("CanCreateCacheItemPolicyWithCacheEntriesProgrammaticallyTestData")]
public void CanCreateCacheItemPolicyWithCacheEntriesProgrammatically(string cacheItemPolicyName, ReadOnlyCollection<string> cacheEntries, bool monitorShouldBeNull)
{
// Arrange
var expected = cacheEntries;
var factory = new CacheItemPolicyFactory(_configuration);

// Act
var cacheItemPolicy = factory.Create(cacheItemPolicyName);
var entriesMonitor = cacheItemPolicy.ChangeMonitors.FirstOrDefault() as CacheEntryChangeMonitor;

// Assert
if (monitorShouldBeNull)
{
entriesMonitor.ShouldBeNull();
return;
}

entriesMonitor.ShouldNotBeNull();
entriesMonitor.ShouldImplement<CacheEntryChangeMonitor>();

entriesMonitor.CacheKeys.ShouldEqual(expected);
}

public static IEnumerable<object[]> CanCreateCacheItemPolicyWithCacheEntriesProgrammaticallyTestData
{
get
{
yield return new object[] { "TestPolicyCacheEntries", new ReadOnlyCollection<string>(new string[] { "aKeyToBeMonitored", "anotherOne", "andSoOn" }), false };
yield return new object[] { "TestPolicyCacheEntriesEmpty", null, true };
}
}
}
}
11 changes: 6 additions & 5 deletions src/CacheItemPolicyConfiguration.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Should" version="1.1.20" targetFramework="net45" />
<package id="xunit" version="1.9.2" targetFramework="net45" />
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Should" version="1.1.20" targetFramework="net45" />
<package id="xunit" version="1.9.2" targetFramework="net45" />
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
</packages>
Loading