tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix param caching test

pull/2180/head
James Jackson-South 4 years ago
parent
8d50996ce7
commit
6dbc5ec70a
2 changed files with 52 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs
  2. 65
      tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs

5
tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs
View File

@ -82,6 +82,11 @@ namespace SixLabors.ImageSharp.Tests
{ {
foreach (PropertyInfo p in type.GetProperties(BindingFlags.Public | BindingFlags.Instance)) foreach (PropertyInfo p in type.GetProperties(BindingFlags.Public | BindingFlags.Instance))
{ {
if (p.PropertyType == typeof(DecoderOptions))
{
continue;
}
string key = $"{type.FullName}.{p.Name}"; string key = $"{type.FullName}.{p.Name}";
data[key] = p.GetValue(options); data[key] = p.GetValue(options);
} }

65
tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs
View File

@ -109,19 +109,31 @@ namespace SixLabors.ImageSharp.Tests
TestDecoderWithParameters.DoTestThreadSafe( TestDecoderWithParameters.DoTestThreadSafe(
() => () =>
{ {
string testName = nameof(this const string testName = nameof(this
.GetImage_WithCustomParametricDecoder_ShouldNotUtilizeCache_WhenParametersAreNotEqual); .GetImage_WithCustomParametricDecoder_ShouldNotUtilizeCache_WhenParametersAreNotEqual);
var decoder1 = new TestDecoderWithParameters { Param1 = "Lol", Param2 = 42 }; TestDecoderWithParameters decoder1 = new();
TestDecoderWithParametersOptions options1 = new()
{
Param1 = "Lol",
Param2 = 42
};
decoder1.InitCaller(testName); decoder1.InitCaller(testName);
var decoder2 = new TestDecoderWithParameters { Param1 = "LoL", Param2 = 42 }; TestDecoderWithParameters decoder2 = new();
TestDecoderWithParametersOptions options2 = new()
{
Param1 = "LoL",
Param2 = 42
};
decoder2.InitCaller(testName); decoder2.InitCaller(testName);
provider.GetImage(decoder1); provider.GetImage(decoder1, options1);
Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName));
provider.GetImage(decoder2); provider.GetImage(decoder2, options2);
Assert.Equal(2, TestDecoderWithParameters.GetInvocationCount(testName)); Assert.Equal(2, TestDecoderWithParameters.GetInvocationCount(testName));
}); });
} }
@ -143,19 +155,31 @@ namespace SixLabors.ImageSharp.Tests
TestDecoderWithParameters.DoTestThreadSafe( TestDecoderWithParameters.DoTestThreadSafe(
() => () =>
{ {
string testName = nameof(this const string testName = nameof(this
.GetImage_WithCustomParametricDecoder_ShouldUtilizeCache_WhenParametersAreEqual); .GetImage_WithCustomParametricDecoder_ShouldUtilizeCache_WhenParametersAreEqual);
var decoder1 = new TestDecoderWithParameters { Param1 = "Lol", Param2 = 666 }; TestDecoderWithParameters decoder1 = new();
TestDecoderWithParametersOptions options1 = new()
{
Param1 = "Lol",
Param2 = 666
};
decoder1.InitCaller(testName); decoder1.InitCaller(testName);
var decoder2 = new TestDecoderWithParameters { Param1 = "Lol", Param2 = 666 }; TestDecoderWithParameters decoder2 = new();
TestDecoderWithParametersOptions options2 = new()
{
Param1 = "Lol",
Param2 = 666
};
decoder2.InitCaller(testName); decoder2.InitCaller(testName);
provider.GetImage(decoder1); provider.GetImage(decoder1, options1);
Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName));
provider.GetImage(decoder2); provider.GetImage(decoder2, options2);
Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName));
}); });
} }
@ -365,7 +389,7 @@ namespace SixLabors.ImageSharp.Tests
} }
} }
private class TestDecoderWithParameters : ImageDecoder<TestDecoderOptions> private class TestDecoderWithParameters : ImageDecoder<TestDecoderWithParametersOptions>
{ {
private static readonly ConcurrentDictionary<string, int> InvocationCounts = new(); private static readonly ConcurrentDictionary<string, int> InvocationCounts = new();
@ -373,10 +397,6 @@ namespace SixLabors.ImageSharp.Tests
private string callerName; private string callerName;
public string Param1 { get; set; }
public int Param2 { get; set; }
public static void DoTestThreadSafe(Action action) public static void DoTestThreadSafe(Action action)
{ {
lock (Monitor) lock (Monitor)
@ -385,16 +405,16 @@ namespace SixLabors.ImageSharp.Tests
} }
} }
public override IImageInfo IdentifySpecialized(TestDecoderOptions options, Stream stream, CancellationToken cancellationToken) public override IImageInfo IdentifySpecialized(TestDecoderWithParametersOptions options, Stream stream, CancellationToken cancellationToken)
=> this.DecodeSpecialized<Rgba32>(options, stream, cancellationToken); => this.DecodeSpecialized<Rgba32>(options, stream, cancellationToken);
public override Image<TPixel> DecodeSpecialized<TPixel>(TestDecoderOptions options, Stream stream, CancellationToken cancellationToken) public override Image<TPixel> DecodeSpecialized<TPixel>(TestDecoderWithParametersOptions options, Stream stream, CancellationToken cancellationToken)
{ {
InvocationCounts[this.callerName]++; InvocationCounts[this.callerName]++;
return new Image<TPixel>(42, 42); return new Image<TPixel>(42, 42);
} }
public override Image DecodeSpecialized(TestDecoderOptions options, Stream stream, CancellationToken cancellationToken) public override Image DecodeSpecialized(TestDecoderWithParametersOptions options, Stream stream, CancellationToken cancellationToken)
=> this.DecodeSpecialized<Rgba32>(options, stream, cancellationToken); => this.DecodeSpecialized<Rgba32>(options, stream, cancellationToken);
internal static int GetInvocationCount(string callerName) => InvocationCounts[callerName]; internal static int GetInvocationCount(string callerName) => InvocationCounts[callerName];
@ -410,5 +430,14 @@ namespace SixLabors.ImageSharp.Tests
{ {
public DecoderOptions GeneralOptions { get; set; } = new(); public DecoderOptions GeneralOptions { get; set; } = new();
} }
private class TestDecoderWithParametersOptions : ISpecializedDecoderOptions
{
public string Param1 { get; set; }
public int Param2 { get; set; }
public DecoderOptions GeneralOptions { get; set; } = new();
}
} }
} }

Write Preview
Loading…
Cancel
Save