+[](https://github.com/SixLabors/ImageSharp/actions)
[](https://raw.githubusercontent.com/SixLabors/ImageSharp/master/LICENSE)
[](https://gitter.im/ImageSharp/General?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[](https://twitter.com/intent/tweet?hashtags=imagesharp,dotnet,oss&text=ImageSharp.+A+new+cross-platform+2D+graphics+API+in+C%23&url=https%3a%2f%2fgithub.com%2fSixLabors%2fImageSharp&via=sixlabors)
@@ -45,12 +46,13 @@ The **ImageSharp** library is made up of multiple packages:
- Transform methods like Resize, Crop, Skew, Rotate - anything that alters the dimensions of the image
- Non-transform methods like Gaussian Blur, Pixelate, Edge Detection - anything that maintains the original image dimensions
+
### Questions?
- Do you have questions? We are happy to help! Please [join our gitter channel](https://gitter.im/ImageSharp/General), or ask them on [stackoverflow](https://stackoverflow.com) using the `ImageSharp` tag. **Do not** open issues for questions!
diff --git a/ci-build.ps1 b/ci-build.ps1
index ad757dc9e2..17c6e6603b 100644
--- a/ci-build.ps1
+++ b/ci-build.ps1
@@ -1,20 +1,13 @@
param(
[Parameter(Mandatory, Position = 0)]
[string]$version,
- [Parameter(Mandatory = $false, Position = 1)]
- [string]$targetFramework = 'ALL'
+ [Parameter(Mandatory = $true, Position = 1)]
+ [string]$targetFramework
)
dotnet clean -c Release
$repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
-if ($targetFramework -ne 'ALL') {
- # Building for a specific framework.
- dotnet build -c Release -f $targetFramework /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
-}
-else {
-
- # Building for packing and publishing.
- dotnet pack -c Release --output "$PSScriptRoot/artifacts" /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
-}
+# Building for a specific framework.
+dotnet build -c Release -f $targetFramework /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
diff --git a/ci-pack.ps1 b/ci-pack.ps1
new file mode 100644
index 0000000000..a4e846db95
--- /dev/null
+++ b/ci-pack.ps1
@@ -0,0 +1,11 @@
+param(
+ [Parameter(Mandatory, Position = 0)]
+ [string]$version
+)
+
+dotnet clean -c Release
+
+$repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
+
+# Building for packing and publishing.
+dotnet pack -c Release --output "$PSScriptRoot/artifacts" /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 3d8286971e..64f79e3248 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -24,7 +24,7 @@
-
+
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 9ee9c226d3..137a7a0305 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -17,7 +17,7 @@
-
+
@@ -28,10 +28,12 @@
true
true
- opencover
+ [SixLabors.*]*
+ lcov
- $(MSBuildThisFileDirectory)..\coverage.xml
-
+ $(MSBuildThisFileDirectory)..\
+ $(CoverletOutputPath)$(AssemblyName).$(TargetFramework).lcov
+
true
@@ -43,13 +45,13 @@
+
-
-
-
+
+
diff --git a/tests/ImageSharp.Sandbox46/README.md b/tests/ImageSharp.Sandbox46/README.md
deleted file mode 100644
index b05afb8538..0000000000
--- a/tests/ImageSharp.Sandbox46/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## Purpose
-This project aims to workaround certain .NET Core tooling issues in Visual Studio based developer workflow at the time of it's creation (January 2017):
-- .NET Core Performance profiling is not possible neither with Visual Studio nor with JetBrains profilers
-- ~~JetBrains Unit Test explorer does not work with .NET Core projects~~
-
-## How does it work?
-- By referencing .NET 4.5 dll-s created by net45 target's of ImageSharp projects. NOTE: These are not project references!
-- By including test classes (and utility classes) of the `ImageSharp.Tests` project using MSBUILD ``
-- Compiling `ImageSharp.Sandbox46` should trigger the compilation of ImageSharp subprojects using a manually defined solution dependencies
-
-## How to profile unit tests
-
-#### 1. With Visual Studio 2015 Test Runner
-- **Do not** build `ImageSharp.Tests`
-- Build `ImageSharp.Sandbox46`
-- Use the [context menu in Test Explorer](https://adamprescott.net/2012/12/12/performance-profiling-for-unit-tests/)
-
-NOTE:
-There was no *Profile test* option in my VS Professional. Maybe things were messed by VS2017 RC installation. [This post suggests](http://stackoverflow.com/questions/32034375/profiling-tests-in-visual-studio-community-2015) it's necessary to own Premium or Ultimate edition of Visual Studio to profile tests.
-
-#### 2. With JetBrains ReSharper Ultimate
-- The `Sandbox46` project is no longer needed here. The classic `ImageSharp.Tests` project can be discovered by Unit Test Explorer.
-- You can use [context menus](https://www.jetbrains.com/resharper/features/unit_testing.html) from your test class, or from unit Test Exporer/Unit Test Sessions windows.
-
\ No newline at end of file
diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
similarity index 70%
rename from tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
rename to tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
index e89b28dc11..99269e339a 100644
--- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
+++ b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
@@ -2,26 +2,26 @@
- SixLabors.ImageSharp.Sandbox46
+ ImageSharp.Tests.ProfilingSandbox
A cross-platform library for processing of image files written in C#
Exe
false
- SixLabors.ImageSharp.Sandbox46
+ SixLabors.ImageSharp.Tests.ProfilingSandbox
win7-x64
netcoreapp3.1;netcoreapp2.1;net472
- SixLabors.ImageSharp.Sandbox46.Program
+ SixLabors.ImageSharp.Tests.ProfilingSandbox.Program
false
-
-
-
-
+
+
+
+
diff --git a/tests/ImageSharp.Sandbox46/Program.cs b/tests/ImageSharp.Tests.ProfilingSandbox/Program.cs
similarity index 88%
rename from tests/ImageSharp.Sandbox46/Program.cs
rename to tests/ImageSharp.Tests.ProfilingSandbox/Program.cs
index 93fe74076e..f041e16eb5 100644
--- a/tests/ImageSharp.Sandbox46/Program.cs
+++ b/tests/ImageSharp.Tests.ProfilingSandbox/Program.cs
@@ -1,18 +1,14 @@
-//
-// Copyright (c) James Jackson-South and contributors.
+// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
-//
+using System;
+using SixLabors.ImageSharp.Tests.Formats.Jpg;
using SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations;
using SixLabors.ImageSharp.Tests.ProfilingBenchmarks;
+using Xunit.Abstractions;
-namespace SixLabors.ImageSharp.Sandbox46
+namespace SixLabors.ImageSharp.Tests.ProfilingSandbox
{
- using System;
- using SixLabors.ImageSharp.Tests.Formats.Jpg;
-
- using Xunit.Abstractions;
-
public class Program
{
private class ConsoleOutput : ITestOutputHelper
diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/README.md b/tests/ImageSharp.Tests.ProfilingSandbox/README.md
new file mode 100644
index 0000000000..43fdab9ef6
--- /dev/null
+++ b/tests/ImageSharp.Tests.ProfilingSandbox/README.md
@@ -0,0 +1,2 @@
+## ImageSharp.Tests.ProfilingSandbox
+Helper project to run and profile unit tests or other "sandbox" code from a single .exe entry point.
diff --git a/tests/ImageSharp.Sandbox46/app.config b/tests/ImageSharp.Tests.ProfilingSandbox/app.config
similarity index 100%
rename from tests/ImageSharp.Sandbox46/app.config
rename to tests/ImageSharp.Tests.ProfilingSandbox/app.config
diff --git a/tests/ImageSharp.Tests/AssemblyInfo.cs b/tests/ImageSharp.Tests/AssemblyInfo.cs
new file mode 100644
index 0000000000..944fbe101e
--- /dev/null
+++ b/tests/ImageSharp.Tests/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Runtime.CompilerServices;
+
+[assembly:InternalsVisibleTo("ImageSharp.Tests.ProfilingSandbox")]
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
index 2485561f1e..59b6963eb9 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
@@ -2,7 +2,9 @@
// Licensed under the Apache License, Version 2.0.
+using Microsoft.DotNet.RemoteExecutor;
using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Tests.TestUtilities;
using Xunit;
// ReSharper disable InconsistentNaming
@@ -15,22 +17,23 @@ public partial class JpegDecoderTests
public void DecodeBaselineJpeg(TestImageProvider provider)
where TPixel : struct, IPixel
{
- if (SkipTest(provider))
+ static void RunTest(string providerDump)
{
- // skipping to avoid OutOfMemoryException on CI
- return;
- }
+ TestImageProvider provider =
+ BasicSerializer.Deserialize>(providerDump);
- using (Image image = provider.GetImage(JpegDecoder))
- {
+ using Image image = provider.GetImage(JpegDecoder);
image.DebugSave(provider);
provider.Utility.TestName = DecodeBaselineJpegOutputName;
image.CompareToReferenceOutput(
- this.GetImageComparer(provider),
+ GetImageComparer(provider),
provider,
appendPixelTypeToFileName: false);
}
+
+ string providerDump = BasicSerializer.Serialize(provider);
+ RemoteExecutor.Invoke(RunTest, providerDump).Dispose();
}
[Theory]
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
index 77bc9f5404..4f155e9c3a 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
@@ -1,7 +1,9 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
+using Microsoft.DotNet.RemoteExecutor;
using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Tests.TestUtilities;
using Xunit;
// ReSharper disable InconsistentNaming
@@ -16,22 +18,23 @@ public partial class JpegDecoderTests
public void DecodeProgressiveJpeg(TestImageProvider provider)
where TPixel : struct, IPixel
{
- if (SkipTest(provider))
+ static void RunTest(string providerDump)
{
- // skipping to avoid OutOfMemoryException on CI
- return;
- }
+ TestImageProvider provider =
+ BasicSerializer.Deserialize>(providerDump);
- using (Image image = provider.GetImage(JpegDecoder))
- {
+ using Image image = provider.GetImage(JpegDecoder);
image.DebugSave(provider);
provider.Utility.TestName = DecodeProgressiveJpegOutputName;
image.CompareToReferenceOutput(
- this.GetImageComparer(provider),
+ GetImageComparer(provider),
provider,
appendPixelTypeToFileName: false);
}
+
+ string dump = BasicSerializer.Serialize(provider);
+ RemoteExecutor.Invoke(RunTest, dump).Dispose();
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 009f86483e..90caea387d 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -4,11 +4,12 @@
using System;
using System.IO;
using System.Linq;
-
+using Microsoft.DotNet.RemoteExecutor;
using SixLabors.ImageSharp.Formats.Jpeg;
using SixLabors.ImageSharp.Memory;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
+using SixLabors.ImageSharp.Tests.TestUtilities;
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
using Xunit;
@@ -23,9 +24,15 @@ public partial class JpegDecoderTests
public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Argb32 | PixelTypes.RgbaVector;
private const float BaselineTolerance = 0.001F / 100;
+
private const float ProgressiveTolerance = 0.2F / 100;
- private ImageComparer GetImageComparer(TestImageProvider provider)
+ static JpegDecoderTests()
+ {
+ TestEnvironment.PrepareRemoteExecutor();
+ }
+
+ private static ImageComparer GetImageComparer(TestImageProvider provider)
where TPixel : struct, IPixel
{
string file = provider.SourceFileOrDescription;
@@ -88,23 +95,19 @@ public void ParseStream_BasicPropertiesAreCorrect()
public void JpegDecoder_IsNotBoundToSinglePixelType(TestImageProvider provider)
where TPixel : struct, IPixel
{
- if (SkipTest(provider))
- {
- return;
- }
-
- // For 32 bit test environments:
- provider.Configuration.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling();
-
- using (Image image = provider.GetImage(JpegDecoder))
+ static void RunTest(string providerDump)
{
+ TestImageProvider provider =
+ BasicSerializer.Deserialize>(providerDump);
+ using Image image = provider.GetImage(JpegDecoder);
image.DebugSave(provider);
provider.Utility.TestName = DecodeBaselineJpegOutputName;
image.CompareToReferenceOutput(ImageComparer.Tolerant(BaselineTolerance), provider, appendPixelTypeToFileName: false);
}
- provider.Configuration.MemoryAllocator.ReleaseRetainedResources();
+ string dump = BasicSerializer.Serialize(provider);
+ RemoteExecutor.Invoke(RunTest, dump).Dispose();
}
// DEBUG ONLY!
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 4aabc2f4e2..34cdca49a1 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -18,6 +18,7 @@
+
diff --git a/tests/ImageSharp.Tests/Memory/Alocators/ArrayPoolMemoryAllocatorTests.cs b/tests/ImageSharp.Tests/Memory/Alocators/ArrayPoolMemoryAllocatorTests.cs
index d38b5b9ddb..227d627784 100644
--- a/tests/ImageSharp.Tests/Memory/Alocators/ArrayPoolMemoryAllocatorTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Alocators/ArrayPoolMemoryAllocatorTests.cs
@@ -4,39 +4,36 @@
// ReSharper disable InconsistentNaming
using System;
using System.Buffers;
+using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using Microsoft.DotNet.RemoteExecutor;
+using Microsoft.Win32;
using SixLabors.ImageSharp.Tests;
using Xunit;
namespace SixLabors.ImageSharp.Memory.Tests
{
- // TODO: Re-enable memory-intensive tests with arcade RemoteExecutor:
- // https://github.com/dotnet/runtime/blob/master/docs/project/writing-tests.md#remoteexecutor
public class ArrayPoolMemoryAllocatorTests
{
private const int MaxPooledBufferSizeInBytes = 2048;
private const int PoolSelectorThresholdInBytes = MaxPooledBufferSizeInBytes / 2;
- private MemoryAllocator MemoryAllocator { get; set; } =
- new ArrayPoolMemoryAllocator(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes);
-
///
- /// Rent a buffer -> return it -> re-rent -> verify if it's span points to the previous location.
+ /// Contains SUT for in-process tests.
///
- private bool CheckIsRentingPooledBuffer(int length)
- where T : struct
- {
- IMemoryOwner buffer = this.MemoryAllocator.Allocate(length);
- ref T ptrToPrevPosition0 = ref buffer.GetReference();
- buffer.Dispose();
+ private MemoryAllocatorFixture LocalFixture { get; } = new MemoryAllocatorFixture();
- buffer = this.MemoryAllocator.Allocate(length);
- bool sameBuffers = Unsafe.AreSame(ref ptrToPrevPosition0, ref buffer.GetReference());
- buffer.Dispose();
+ ///
+ /// Contains SUT for tests executed by ,
+ /// recreated in each external process.
+ ///
+ private static MemoryAllocatorFixture StaticFixture { get; } = new MemoryAllocatorFixture();
- return sameBuffers;
+ static ArrayPoolMemoryAllocatorTests()
+ {
+ TestEnvironment.PrepareRemoteExecutor();
}
public class BufferTests : BufferTestSuite
@@ -78,21 +75,21 @@ public void When_PoolSelectorThresholdInBytes_IsGreaterThan_MaxPooledBufferSizeI
[InlineData(MaxPooledBufferSizeInBytes - 1)]
public void SmallBuffersArePooled_OfByte(int size)
{
- Assert.True(this.CheckIsRentingPooledBuffer(size));
+ Assert.True(this.LocalFixture.CheckIsRentingPooledBuffer(size));
}
- [Theory(Skip = "Should be executed from a separate process.")]
+ [Theory]
[InlineData(128 * 1024 * 1024)]
[InlineData(MaxPooledBufferSizeInBytes + 1)]
public void LargeBuffersAreNotPooled_OfByte(int size)
{
- if (!TestEnvironment.Is64BitProcess)
+ static void RunTest(string sizeStr)
{
- // can lead to OutOfMemoryException
- return;
+ int size = int.Parse(sizeStr);
+ StaticFixture.CheckIsRentingPooledBuffer(size);
}
- Assert.False(this.CheckIsRentingPooledBuffer(size));
+ RemoteExecutor.Invoke(RunTest, size.ToString()).Dispose();
}
[Fact]
@@ -100,21 +97,15 @@ public unsafe void SmallBuffersArePooled_OfBigValueType()
{
int count = (MaxPooledBufferSizeInBytes / sizeof(LargeStruct)) - 1;
- Assert.True(this.CheckIsRentingPooledBuffer(count));
+ Assert.True(this.LocalFixture.CheckIsRentingPooledBuffer(count));
}
- [Fact(Skip = "Should be executed from a separate process.")]
+ [Fact]
public unsafe void LaregeBuffersAreNotPooled_OfBigValueType()
{
- if (!TestEnvironment.Is64BitProcess)
- {
- // can lead to OutOfMemoryException
- return;
- }
-
int count = (MaxPooledBufferSizeInBytes / sizeof(LargeStruct)) + 1;
- Assert.False(this.CheckIsRentingPooledBuffer(count));
+ Assert.False(this.LocalFixture.CheckIsRentingPooledBuffer(count));
}
[Theory]
@@ -122,12 +113,13 @@ public unsafe void LaregeBuffersAreNotPooled_OfBigValueType()
[InlineData(AllocationOptions.Clean)]
public void CleaningRequests_AreControlledByAllocationParameter_Clean(AllocationOptions options)
{
- using (IMemoryOwner firstAlloc = this.MemoryAllocator.Allocate(42))
+ MemoryAllocator memoryAllocator = this.LocalFixture.MemoryAllocator;
+ using (IMemoryOwner firstAlloc = memoryAllocator.Allocate(42))
{
firstAlloc.GetSpan().Fill(666);
}
- using (IMemoryOwner secondAlloc = this.MemoryAllocator.Allocate(42, options))
+ using (IMemoryOwner secondAlloc = memoryAllocator.Allocate(42, options))
{
int expected = options == AllocationOptions.Clean ? 0 : 666;
Assert.Equal(expected, secondAlloc.GetSpan()[0]);
@@ -139,7 +131,8 @@ public void CleaningRequests_AreControlledByAllocationParameter_Clean(Allocation
[InlineData(true)]
public void ReleaseRetainedResources_ReplacesInnerArrayPool(bool keepBufferAlive)
{
- IMemoryOwner buffer = this.MemoryAllocator.Allocate(32);
+ MemoryAllocator memoryAllocator = this.LocalFixture.MemoryAllocator;
+ IMemoryOwner buffer = memoryAllocator.Allocate(32);
ref int ptrToPrev0 = ref MemoryMarshal.GetReference(buffer.GetSpan());
if (!keepBufferAlive)
@@ -147,9 +140,9 @@ public void ReleaseRetainedResources_ReplacesInnerArrayPool(bool keepBufferAlive
buffer.Dispose();
}
- this.MemoryAllocator.ReleaseRetainedResources();
+ memoryAllocator.ReleaseRetainedResources();
- buffer = this.MemoryAllocator.Allocate(32);
+ buffer = memoryAllocator.Allocate(32);
Assert.False(Unsafe.AreSame(ref ptrToPrev0, ref buffer.GetReference()));
}
@@ -157,87 +150,69 @@ public void ReleaseRetainedResources_ReplacesInnerArrayPool(bool keepBufferAlive
[Fact]
public void ReleaseRetainedResources_DisposingPreviouslyAllocatedBuffer_IsAllowed()
{
- IMemoryOwner buffer = this.MemoryAllocator.Allocate(32);
- this.MemoryAllocator.ReleaseRetainedResources();
+ MemoryAllocator memoryAllocator = this.LocalFixture.MemoryAllocator;
+ IMemoryOwner buffer = memoryAllocator.Allocate(32);
+ memoryAllocator.ReleaseRetainedResources();
buffer.Dispose();
}
- [Fact(Skip = "Should be executed from a separate process.")]
+ [Fact]
public void AllocationOverLargeArrayThreshold_UsesDifferentPool()
{
- if (!TestEnvironment.Is64BitProcess)
+ static void RunTest()
{
- // can lead to OutOfMemoryException
- return;
- }
+ const int ArrayLengthThreshold = PoolSelectorThresholdInBytes / sizeof(int);
- const int ArrayLengthThreshold = PoolSelectorThresholdInBytes / sizeof(int);
+ IMemoryOwner small = StaticFixture.MemoryAllocator.Allocate(ArrayLengthThreshold - 1);
+ ref int ptr2Small = ref small.GetReference();
+ small.Dispose();
- IMemoryOwner small = this.MemoryAllocator.Allocate(ArrayLengthThreshold - 1);
- ref int ptr2Small = ref small.GetReference();
- small.Dispose();
+ IMemoryOwner large = StaticFixture.MemoryAllocator.Allocate(ArrayLengthThreshold + 1);
- IMemoryOwner large = this.MemoryAllocator.Allocate(ArrayLengthThreshold + 1);
+ Assert.False(Unsafe.AreSame(ref ptr2Small, ref large.GetReference()));
+ }
- Assert.False(Unsafe.AreSame(ref ptr2Small, ref large.GetReference()));
+ RemoteExecutor.Invoke(RunTest).Dispose();
}
- [Fact(Skip = "Should be executed from a separate process.")]
+ [Fact]
public void CreateWithAggressivePooling()
{
- if (!TestEnvironment.Is64BitProcess)
+ static void RunTest()
{
- // can lead to OutOfMemoryException
- return;
+ StaticFixture.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithAggressivePooling();
+ Assert.True(StaticFixture.CheckIsRentingPooledBuffer(4096 * 4096));
}
- this.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithAggressivePooling();
-
- Assert.True(this.CheckIsRentingPooledBuffer(4096 * 4096));
+ RemoteExecutor.Invoke(RunTest).Dispose();
}
- [Fact(Skip = "Should be executed from a separate process.")]
+ [Fact]
public void CreateDefault()
{
- if (!TestEnvironment.Is64BitProcess)
+ static void RunTest()
{
- // can lead to OutOfMemoryException
- return;
- }
+ StaticFixture.MemoryAllocator = ArrayPoolMemoryAllocator.CreateDefault();
- this.MemoryAllocator = ArrayPoolMemoryAllocator.CreateDefault();
+ Assert.False(StaticFixture.CheckIsRentingPooledBuffer(2 * 4096 * 4096));
+ Assert.True(StaticFixture.CheckIsRentingPooledBuffer(2048 * 2048));
+ }
- Assert.False(this.CheckIsRentingPooledBuffer(2 * 4096 * 4096));
- Assert.True(this.CheckIsRentingPooledBuffer(2048 * 2048));
+ RemoteExecutor.Invoke(RunTest).Dispose();
}
[Fact]
public void CreateWithModeratePooling()
{
- if (!TestEnvironment.Is64BitProcess)
+ static void RunTest()
{
- // can lead to OutOfMemoryException
- return;
+ StaticFixture.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling();
+ Assert.False(StaticFixture.CheckIsRentingPooledBuffer(2048 * 2048));
+ Assert.True(StaticFixture.CheckIsRentingPooledBuffer(1024 * 16));
}
- this.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling();
-
- Assert.False(this.CheckIsRentingPooledBuffer(2048 * 2048));
- Assert.True(this.CheckIsRentingPooledBuffer(1024 * 16));
- }
-
- [StructLayout(LayoutKind.Sequential)]
- private struct Rgba32
- {
- private readonly uint dummy;
- }
-
- private const int SizeOfLargeStruct = MaxPooledBufferSizeInBytes / 5;
-
- [StructLayout(LayoutKind.Explicit, Size = SizeOfLargeStruct)]
- private struct LargeStruct
- {
+ RemoteExecutor.Invoke(RunTest).Dispose();
}
[Theory]
@@ -245,7 +220,8 @@ private struct LargeStruct
[InlineData((int.MaxValue / SizeOfLargeStruct) + 1)]
public void AllocateIncorrectAmount_ThrowsCorrect_ArgumentOutOfRangeException(int length)
{
- ArgumentOutOfRangeException ex = Assert.Throws(() => this.MemoryAllocator.Allocate(length));
+ ArgumentOutOfRangeException ex = Assert.Throws(() =>
+ this.LocalFixture.MemoryAllocator.Allocate(length));
Assert.Equal("length", ex.ParamName);
}
@@ -253,8 +229,45 @@ public void AllocateIncorrectAmount_ThrowsCorrect_ArgumentOutOfRangeException(in
[InlineData(-1)]
public void AllocateManagedByteBuffer_IncorrectAmount_ThrowsCorrect_ArgumentOutOfRangeException(int length)
{
- ArgumentOutOfRangeException ex = Assert.Throws(() => this.MemoryAllocator.AllocateManagedByteBuffer(length));
+ ArgumentOutOfRangeException ex = Assert.Throws(() =>
+ this.LocalFixture.MemoryAllocator.AllocateManagedByteBuffer(length));
Assert.Equal("length", ex.ParamName);
}
+
+ private class MemoryAllocatorFixture
+ {
+ public MemoryAllocator MemoryAllocator { get; set; } =
+ new ArrayPoolMemoryAllocator(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes);
+
+ ///
+ /// Rent a buffer -> return it -> re-rent -> verify if it's span points to the previous location.
+ ///
+ public bool CheckIsRentingPooledBuffer(int length)
+ where T : struct
+ {
+ IMemoryOwner buffer = MemoryAllocator.Allocate(length);
+ ref T ptrToPrevPosition0 = ref buffer.GetReference();
+ buffer.Dispose();
+
+ buffer = MemoryAllocator.Allocate(length);
+ bool sameBuffers = Unsafe.AreSame(ref ptrToPrevPosition0, ref buffer.GetReference());
+ buffer.Dispose();
+
+ return sameBuffers;
+ }
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ private struct SmallStruct
+ {
+ private readonly uint dummy;
+ }
+
+ private const int SizeOfLargeStruct = MaxPooledBufferSizeInBytes / 5;
+
+ [StructLayout(LayoutKind.Explicit, Size = SizeOfLargeStruct)]
+ private struct LargeStruct
+ {
+ }
}
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
index 859be6b205..6706e4077a 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
@@ -29,8 +29,8 @@ private static Span AsSpan(T value)
public void NormalBlendFunction(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = PorterDuffFunctions.NormalSrcOver((TPixel)back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = PorterDuffFunctions.NormalSrcOver(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -38,8 +38,8 @@ public void NormalBlendFunction(TestPixel back, TestPixel(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.NormalSrcOver().Blend(back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = new DefaultPixelBlenders.NormalSrcOver().Blend(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -49,7 +49,7 @@ public void NormalBlendFunctionBlenderBulk(TestPixel back, TestP
{
var dest = new Span(new TPixel[1]);
new DefaultPixelBlenders.NormalSrcOver().Blend(this.Configuration, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
- VectorAssert.Equal(expected, dest[0], 2);
+ VectorAssert.Equal(expected.AsPixel(), dest[0], 2);
}
public static TheoryData MultiplyFunctionData = new TheoryData {
@@ -68,8 +68,8 @@ public void NormalBlendFunctionBlenderBulk(TestPixel back, TestP
public void MultiplyFunction(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = PorterDuffFunctions.MultiplySrcOver((TPixel)back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = PorterDuffFunctions.MultiplySrcOver(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -77,8 +77,8 @@ public void MultiplyFunction(TestPixel back, TestPixel s
public void MultiplyFunctionBlender(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.MultiplySrcOver().Blend(back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = new DefaultPixelBlenders.MultiplySrcOver().Blend(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -88,7 +88,7 @@ public void MultiplyFunctionBlenderBulk(TestPixel back, TestPixe
{
var dest = new Span(new TPixel[1]);
new DefaultPixelBlenders.MultiplySrcOver().Blend(this.Configuration, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
- VectorAssert.Equal(expected, dest[0], 2);
+ VectorAssert.Equal(expected.AsPixel(), dest[0], 2);
}
public static TheoryData AddFunctionData = new TheoryData {
@@ -107,8 +107,8 @@ public void MultiplyFunctionBlenderBulk(TestPixel back, TestPixe
public void AddFunction(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = PorterDuffFunctions.AddSrcOver((TPixel)back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = PorterDuffFunctions.AddSrcOver(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -116,8 +116,8 @@ public void AddFunction(TestPixel back, TestPixel source
public void AddFunctionBlender(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.AddSrcOver().Blend(back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = new DefaultPixelBlenders.AddSrcOver().Blend(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -127,7 +127,7 @@ public void AddFunctionBlenderBulk(TestPixel back, TestPixel(new TPixel[1]);
new DefaultPixelBlenders.AddSrcOver().Blend(this.Configuration, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
- VectorAssert.Equal(expected, dest[0], 2);
+ VectorAssert.Equal(expected.AsPixel(), dest[0], 2);
}
public static TheoryData SubtractFunctionData = new TheoryData {
@@ -146,8 +146,8 @@ public void AddFunctionBlenderBulk(TestPixel back, TestPixel(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = PorterDuffFunctions.SubtractSrcOver((TPixel)back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = PorterDuffFunctions.SubtractSrcOver(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -155,8 +155,8 @@ public void SubtractFunction(TestPixel back, TestPixel s
public void SubtractFunctionBlender(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.SubtractSrcOver().Blend(back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = new DefaultPixelBlenders.SubtractSrcOver().Blend(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -166,7 +166,7 @@ public void SubtractFunctionBlenderBulk(TestPixel back, TestPixe
{
var dest = new Span(new TPixel[1]);
new DefaultPixelBlenders.SubtractSrcOver().Blend(this.Configuration, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
- VectorAssert.Equal(expected, dest[0], 2);
+ VectorAssert.Equal(expected.AsPixel(), dest[0], 2);
}
public static TheoryData ScreenFunctionData = new TheoryData {
@@ -185,8 +185,8 @@ public void SubtractFunctionBlenderBulk(TestPixel back, TestPixe
public void ScreenFunction(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = PorterDuffFunctions.ScreenSrcOver((TPixel)back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = PorterDuffFunctions.ScreenSrcOver(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -194,8 +194,8 @@ public void ScreenFunction(TestPixel back, TestPixel sou
public void ScreenFunctionBlender(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.ScreenSrcOver().Blend(back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = new DefaultPixelBlenders.ScreenSrcOver().Blend(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -205,7 +205,7 @@ public void ScreenFunctionBlenderBulk(TestPixel back, TestPixel<
{
var dest = new Span(new TPixel[1]);
new DefaultPixelBlenders.ScreenSrcOver().Blend(this.Configuration, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
- VectorAssert.Equal(expected, dest[0], 2);
+ VectorAssert.Equal(expected.AsPixel(), dest[0], 2);
}
public static TheoryData DarkenFunctionData = new TheoryData {
@@ -224,8 +224,8 @@ public void ScreenFunctionBlenderBulk(TestPixel back, TestPixel<
public void DarkenFunction(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = PorterDuffFunctions.DarkenSrcOver((TPixel)back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = PorterDuffFunctions.DarkenSrcOver(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -233,8 +233,8 @@ public void DarkenFunction(TestPixel back, TestPixel sou
public void DarkenFunctionBlender(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.DarkenSrcOver().Blend(back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = new DefaultPixelBlenders.DarkenSrcOver().Blend(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -244,7 +244,7 @@ public void DarkenFunctionBlenderBulk(TestPixel back, TestPixel<
{
var dest = new Span(new TPixel[1]);
new DefaultPixelBlenders.DarkenSrcOver().Blend(this.Configuration, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
- VectorAssert.Equal(expected, dest[0], 2);
+ VectorAssert.Equal(expected.AsPixel(), dest[0], 2);
}
public static TheoryData LightenFunctionData = new TheoryData {
@@ -263,8 +263,8 @@ public void DarkenFunctionBlenderBulk(TestPixel back, TestPixel<
public void LightenFunction(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = PorterDuffFunctions.LightenSrcOver((TPixel)back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = PorterDuffFunctions.LightenSrcOver(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -272,8 +272,8 @@ public void LightenFunction(TestPixel back, TestPixel so
public void LightenFunctionBlender(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.LightenSrcOver().Blend(back, source, amount);
- VectorAssert.Equal(expected, actual, 2);
+ TPixel actual = new DefaultPixelBlenders.LightenSrcOver().Blend(back.AsPixel(), source.AsPixel(), amount);
+ VectorAssert.Equal(expected.AsPixel(), actual, 2);
}
[Theory]
@@ -283,7 +283,7 @@ public void LightenFunctionBlenderBulk(TestPixel back, TestPixel
{
var dest = new Span(new TPixel[1]);
new DefaultPixelBlenders.LightenSrcOver().Blend(this.Configuration, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
- VectorAssert.Equal(expected, dest[0], 2);
+ VectorAssert.Equal(expected.AsPixel(), dest[0], 2);
}
public static TheoryData OverlayFunctionData = new TheoryData {
@@ -302,8 +302,8 @@ public void LightenFunctionBlenderBulk(TestPixel back, TestPixel
public void OverlayFunction(TestPixel back, TestPixel source, float amount, TestPixel