From 324302426b7eedeb2e5e1c40b82f950a5bb7cd2f Mon Sep 17 00:00:00 2001 From: Salih Date: Mon, 29 May 2023 10:00:45 +0300 Subject: [PATCH] Rename ProcessState to ImageProcessState --- docs/en/Image-Manipulation.md | 16 ++++++++-------- .../Volo/Abp/Imaging/ImageCompressResult.cs | 2 +- .../Volo/Abp/Imaging/ImageCompressor.cs | 8 ++++---- .../Volo/Abp/Imaging/ImageProcessResult.cs | 4 ++-- .../{ProcessState.cs => ImageProcessState.cs} | 2 +- .../Volo/Abp/Imaging/ImageResizeResult.cs | 2 +- .../Volo/Abp/Imaging/ImageResizer.cs | 8 ++++---- .../Volo/Abp/Imaging/CompressImageAttribute.cs | 6 +++--- .../Volo/Abp/Imaging/ResizeImageAttribute.cs | 6 +++--- .../ImageSharpImageCompressorContributor.cs | 12 ++++++------ .../Imaging/ImageSharpImageResizerContributor.cs | 10 +++++----- .../Imaging/MagickImageCompressorContributor.cs | 12 ++++++------ .../Abp/Imaging/MagickImageResizerContributor.cs | 12 ++++++------ .../Volo/Abp/Imaging/IImageCompressor_Tests.cs | 6 +++--- .../Volo/Abp/Imaging/IImageResizer_Tests.cs | 6 +++--- .../Imaging/ImageSharpImageCompressor_Tests.cs | 10 +++++----- .../Abp/Imaging/ImageSharpImageResizer_Tests.cs | 10 +++++----- .../Imaging/MagickNetImageCompressor_Tests.cs | 10 +++++----- .../Abp/Imaging/MagickNetImageResizer_Tests.cs | 10 +++++----- 19 files changed, 76 insertions(+), 76 deletions(-) rename framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/{ProcessState.cs => ImageProcessState.cs} (69%) diff --git a/docs/en/Image-Manipulation.md b/docs/en/Image-Manipulation.md index 0837075894..3d5a8c5d59 100644 --- a/docs/en/Image-Manipulation.md +++ b/docs/en/Image-Manipulation.md @@ -121,14 +121,14 @@ public enum ImageResizeMode The `ImageResizeResult` is a generic class that is used to return the result of the image resize operations. It has the following properties: * `Result`: The resized image (stream or byte array). -* `State`: The result of the resize operation (type: `ProcessState`). +* `State`: The result of the resize operation (type: `ImageProcessState`). -### ProcessState +### ImageProcessState -The `ProcessState` is an enum that is used to return the the result of the image resize operations. It has the following values: +The `ImageProcessState` is an enum that is used to return the the result of the image resize operations. It has the following values: ```csharp -public enum ProcessState : byte +public enum ImageProcessState : byte { Done = 1, Canceled = 2, @@ -179,14 +179,14 @@ var result = await _imageCompressor.CompressAsync( The `ImageCompressResult` is a generic class that is used to return the result of the image compression operations. It has the following properties: * `Result`: The compressed image (stream or byte array). -* `State`: The result of the compress operation (type: `ProcessState`). +* `State`: The result of the compress operation (type: `ImageProcessState`). -### ProcessState +### ImageProcessState -The `ProcessState` is an enum that is used to return the the result of the image compress operations. It has the following values: +The `ImageProcessState` is an enum that is used to return the the result of the image compress operations. It has the following values: ```csharp -public enum ProcessState : byte +public enum ImageProcessState : byte { Done = 1, Canceled = 2, diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressResult.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressResult.cs index ca22b60fe4..7a80083beb 100644 --- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressResult.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressResult.cs @@ -2,7 +2,7 @@ public class ImageCompressResult : ImageProcessResult { - public ImageCompressResult(T result, ProcessState state) : base(result, state) + public ImageCompressResult(T result, ImageProcessState state) : base(result, state) { } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs index a2c46b1c21..a4d6fd1aa4 100644 --- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageCompressor.cs @@ -25,7 +25,7 @@ public class ImageCompressor : IImageCompressor, ITransientDependency { var result = await imageCompressorContributor.TryCompressAsync(stream, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken)); - if (result.State == ProcessState.Unsupported) + if (result.State == ImageProcessState.Unsupported) { continue; } @@ -33,7 +33,7 @@ public class ImageCompressor : IImageCompressor, ITransientDependency return result; } - return new ImageCompressResult(stream, ProcessState.Unsupported); + return new ImageCompressResult(stream, ImageProcessState.Unsupported); } public virtual async Task> CompressAsync(byte[] bytes, string mimeType = null, CancellationToken cancellationToken = default) @@ -42,7 +42,7 @@ public class ImageCompressor : IImageCompressor, ITransientDependency { var result = await imageCompressorContributor.TryCompressAsync(bytes, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken)); - if (result.State == ProcessState.Unsupported) + if (result.State == ImageProcessState.Unsupported) { continue; } @@ -50,6 +50,6 @@ public class ImageCompressor : IImageCompressor, ITransientDependency return result; } - return new ImageCompressResult(bytes, ProcessState.Unsupported); + return new ImageCompressResult(bytes, ImageProcessState.Unsupported); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessResult.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessResult.cs index 5d77cb5e2d..fc7a24f186 100644 --- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessResult.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessResult.cs @@ -3,9 +3,9 @@ public abstract class ImageProcessResult { public T Result { get; } - public ProcessState State { get; } + public ImageProcessState State { get; } - protected ImageProcessResult(T result, ProcessState state) + protected ImageProcessResult(T result, ImageProcessState state) { Result = result; State = state; diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ProcessState.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessState.cs similarity index 69% rename from framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ProcessState.cs rename to framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessState.cs index e71594bbef..0df074baf6 100644 --- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ProcessState.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageProcessState.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Imaging; -public enum ProcessState : byte +public enum ImageProcessState : byte { Done = 1, Canceled = 2, diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeResult.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeResult.cs index dbc6b8e557..61b5c52232 100644 --- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeResult.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizeResult.cs @@ -2,7 +2,7 @@ public class ImageResizeResult : ImageProcessResult { - public ImageResizeResult(T result, ProcessState state) : base(result, state) + public ImageResizeResult(T result, ImageProcessState state) : base(result, state) { } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs index c75aa8bf23..c16eae19b9 100644 --- a/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs +++ b/framework/src/Volo.Abp.Imaging.Abstractions/Volo/Abp/Imaging/ImageResizer.cs @@ -39,7 +39,7 @@ public class ImageResizer : IImageResizer, ITransientDependency { var result = await imageResizerContributor.TryResizeAsync(stream, resizeArgs, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken)); - if (result.State == ProcessState.Unsupported) + if (result.State == ImageProcessState.Unsupported) { continue; } @@ -47,7 +47,7 @@ public class ImageResizer : IImageResizer, ITransientDependency return result; } - return new ImageResizeResult(stream, ProcessState.Unsupported); + return new ImageResizeResult(stream, ImageProcessState.Unsupported); } public virtual async Task> ResizeAsync( @@ -62,7 +62,7 @@ public class ImageResizer : IImageResizer, ITransientDependency { var result = await imageResizerContributor.TryResizeAsync(bytes, resizeArgs, mimeType, CancellationTokenProvider.FallbackToProvider(cancellationToken)); - if (result.State == ProcessState.Unsupported) + if (result.State == ImageProcessState.Unsupported) { continue; } @@ -70,7 +70,7 @@ public class ImageResizer : IImageResizer, ITransientDependency return result; } - return new ImageResizeResult(bytes, ProcessState.Unsupported); + return new ImageResizeResult(bytes, ImageProcessState.Unsupported); } protected virtual void ChangeDefaultResizeMode(ImageResizeArgs resizeArgs) diff --git a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs index 39c7a11fe0..1ddd8822be 100644 --- a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs +++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/CompressImageAttribute.cs @@ -54,7 +54,7 @@ public class CompressImageAttribute : ActionFilterAttribute var result = await imageCompressor.CompressAsync(file.OpenReadStream(), file.ContentType); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return file; } @@ -73,7 +73,7 @@ public class CompressImageAttribute : ActionFilterAttribute var result = await imageCompressor.CompressAsync(remoteStreamContent.GetStream(), remoteStreamContent.ContentType); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return remoteStreamContent; } @@ -88,7 +88,7 @@ public class CompressImageAttribute : ActionFilterAttribute { var result = await imageCompressor.CompressAsync(stream); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return stream; } diff --git a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs index 0ef98167ca..799cd81877 100644 --- a/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs +++ b/framework/src/Volo.Abp.Imaging.AspNetCore/Volo/Abp/Imaging/ResizeImageAttribute.cs @@ -67,7 +67,7 @@ public class ResizeImageAttribute : ActionFilterAttribute var result = await imageResizer.ResizeAsync(file.OpenReadStream(), new ImageResizeArgs(Width, Height, Mode), file.ContentType); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return file; } @@ -86,7 +86,7 @@ public class ResizeImageAttribute : ActionFilterAttribute var result = await imageResizer.ResizeAsync(remoteStreamContent.GetStream(), new ImageResizeArgs(Width, Height, Mode), remoteStreamContent.ContentType); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return remoteStreamContent; } @@ -101,7 +101,7 @@ public class ResizeImageAttribute : ActionFilterAttribute { var result = await imageResizer.ResizeAsync(stream, new ImageResizeArgs(Width, Height, Mode)); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return stream; } diff --git a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs index ace303ce25..a54d006b30 100644 --- a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs +++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs @@ -31,25 +31,25 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor, { if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType)) { - return new ImageCompressResult(stream, ProcessState.Unsupported); + return new ImageCompressResult(stream, ImageProcessState.Unsupported); } var (image, format) = await Image.LoadWithFormatAsync(stream, cancellationToken); if (!CanCompress(format.DefaultMimeType)) { - return new ImageCompressResult(stream, ProcessState.Unsupported); + return new ImageCompressResult(stream, ImageProcessState.Unsupported); } var memoryStream = await GetStreamFromImageAsync(image, format, cancellationToken); if (memoryStream.Length < stream.Length) { - return new ImageCompressResult(memoryStream, ProcessState.Done); + return new ImageCompressResult(memoryStream, ImageProcessState.Done); } memoryStream.Dispose(); - return new ImageCompressResult(stream, ProcessState.Canceled); + return new ImageCompressResult(stream, ImageProcessState.Canceled); } public virtual async Task> TryCompressAsync( @@ -59,13 +59,13 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor, { if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType)) { - return new ImageCompressResult(bytes, ProcessState.Unsupported); + return new ImageCompressResult(bytes, ImageProcessState.Unsupported); } using var ms = new MemoryStream(bytes); var result = await TryCompressAsync(ms, mimeType, cancellationToken); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return new ImageCompressResult(bytes, result.State); } diff --git a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs index 2cb27d76aa..d2ac92eaf7 100644 --- a/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs +++ b/framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs @@ -21,14 +21,14 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran { if (!string.IsNullOrWhiteSpace(mimeType) && !CanResize(mimeType)) { - return new ImageResizeResult(stream, ProcessState.Unsupported); + return new ImageResizeResult(stream, ImageProcessState.Unsupported); } var (image, format) = await Image.LoadWithFormatAsync(stream, cancellationToken); if (!CanResize(format.DefaultMimeType)) { - return new ImageResizeResult(stream, ProcessState.Unsupported); + return new ImageResizeResult(stream, ImageProcessState.Unsupported); } if (ResizeModeMap.TryGetValue(resizeArgs.Mode, out var resizeMode)) @@ -46,7 +46,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran { await image.SaveAsync(memoryStream, format, cancellationToken: cancellationToken); memoryStream.Position = 0; - return new ImageResizeResult(memoryStream, ProcessState.Done); + return new ImageResizeResult(memoryStream, ImageProcessState.Done); } catch { @@ -63,14 +63,14 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran { if (!string.IsNullOrWhiteSpace(mimeType) && !CanResize(mimeType)) { - return new ImageResizeResult(bytes, ProcessState.Unsupported); + return new ImageResizeResult(bytes, ImageProcessState.Unsupported); } using var ms = new MemoryStream(bytes); var result = await TryResizeAsync(ms, resizeArgs, mimeType, cancellationToken); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return new ImageResizeResult(bytes, result.State); } diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs index 8242645eef..a0900cd14a 100644 --- a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageCompressorContributor.cs @@ -33,7 +33,7 @@ public class MagickImageCompressorContributor : IImageCompressorContributor, ITr { if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType)) { - return new ImageCompressResult(stream, ProcessState.Unsupported); + return new ImageCompressResult(stream, ImageProcessState.Unsupported); } var memoryStream = await stream.CreateMemoryStreamAsync(cancellationToken: cancellationToken); @@ -42,17 +42,17 @@ public class MagickImageCompressorContributor : IImageCompressorContributor, ITr { if (!Optimizer.IsSupported(memoryStream)) { - return new ImageCompressResult(stream, ProcessState.Unsupported); + return new ImageCompressResult(stream, ImageProcessState.Unsupported); } if (Compress(memoryStream)) { - return new ImageCompressResult(memoryStream, ProcessState.Done); + return new ImageCompressResult(memoryStream, ImageProcessState.Done); } memoryStream.Dispose(); - return new ImageCompressResult(stream, ProcessState.Canceled); + return new ImageCompressResult(stream, ImageProcessState.Canceled); } catch { @@ -68,13 +68,13 @@ public class MagickImageCompressorContributor : IImageCompressorContributor, ITr { if (!string.IsNullOrWhiteSpace(mimeType) && !CanCompress(mimeType)) { - return new ImageCompressResult(bytes, ProcessState.Unsupported); + return new ImageCompressResult(bytes, ImageProcessState.Unsupported); } using var memoryStream = new MemoryStream(bytes); var result = await TryCompressAsync(memoryStream, mimeType, cancellationToken); - if (result.State != ProcessState.Done) + if (result.State != ImageProcessState.Done) { return new ImageCompressResult(bytes, result.State); } diff --git a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs index 1d221355d1..9ffb6133e5 100644 --- a/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs +++ b/framework/src/Volo.Abp.Imaging.MagickNet/Volo/Abp/Imaging/MagickImageResizerContributor.cs @@ -21,7 +21,7 @@ public class MagickImageResizerContributor : IImageResizerContributor, ITransien { if (!mimeType.IsNullOrWhiteSpace() && !CanResize(mimeType)) { - return new ImageResizeResult(stream, ProcessState.Unsupported); + return new ImageResizeResult(stream, ImageProcessState.Unsupported); } var memoryStream = await stream.CreateMemoryStreamAsync(cancellationToken: cancellationToken); @@ -32,7 +32,7 @@ public class MagickImageResizerContributor : IImageResizerContributor, ITransien if (mimeType.IsNullOrWhiteSpace() && !CanResize(image.FormatInfo?.MimeType)) { - return new ImageResizeResult(stream, ProcessState.Unsupported); + return new ImageResizeResult(stream, ImageProcessState.Unsupported); } Resize(image, resizeArgs); @@ -42,7 +42,7 @@ public class MagickImageResizerContributor : IImageResizerContributor, ITransien memoryStream.SetLength(memoryStream.Position); memoryStream.Position = 0; - return new ImageResizeResult(memoryStream, ProcessState.Done); + return new ImageResizeResult(memoryStream, ImageProcessState.Done); } catch { @@ -59,19 +59,19 @@ public class MagickImageResizerContributor : IImageResizerContributor, ITransien { if (!mimeType.IsNullOrWhiteSpace() && !CanResize(mimeType)) { - return Task.FromResult(new ImageResizeResult(bytes, ProcessState.Unsupported)); + return Task.FromResult(new ImageResizeResult(bytes, ImageProcessState.Unsupported)); } using var image = new MagickImage(bytes); if (mimeType.IsNullOrWhiteSpace() && !CanResize(image.FormatInfo?.MimeType)) { - return Task.FromResult(new ImageResizeResult(bytes, ProcessState.Unsupported)); + return Task.FromResult(new ImageResizeResult(bytes, ImageProcessState.Unsupported)); } Resize(image, resizeArgs); - return Task.FromResult(new ImageResizeResult(image.ToByteArray(), ProcessState.Done)); + return Task.FromResult(new ImageResizeResult(image.ToByteArray(), ImageProcessState.Done)); } protected virtual bool CanResize(string mimeType) diff --git a/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageCompressor_Tests.cs b/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageCompressor_Tests.cs index ccba3fe7dd..b952aee119 100644 --- a/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageCompressor_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageCompressor_Tests.cs @@ -20,7 +20,7 @@ public class IImageCompressor_Tests : AbpImagingAbstractionsTestBase var compressedImage = await ImageCompressor.CompressAsync(jpegImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Unsupported); + compressedImage.State.ShouldBe(ImageProcessState.Unsupported); compressedImage.Result.ShouldBe(jpegImage); } @@ -32,7 +32,7 @@ public class IImageCompressor_Tests : AbpImagingAbstractionsTestBase var compressedImage = await ImageCompressor.CompressAsync(pngImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Unsupported); + compressedImage.State.ShouldBe(ImageProcessState.Unsupported); compressedImage.Result.ShouldBe(pngImage); } @@ -44,7 +44,7 @@ public class IImageCompressor_Tests : AbpImagingAbstractionsTestBase var compressedImage = await ImageCompressor.CompressAsync(webpImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Unsupported); + compressedImage.State.ShouldBe(ImageProcessState.Unsupported); compressedImage.Result.ShouldBe(webpImage); } diff --git a/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageResizer_Tests.cs b/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageResizer_Tests.cs index ff5b4c3082..23db1e7b3d 100644 --- a/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageResizer_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.Abstractions.Tests/Volo/Abp/Imaging/IImageResizer_Tests.cs @@ -19,7 +19,7 @@ public class IImageResizer_Tests : AbpImagingAbstractionsTestBase var resizedImage = await ImageResizer.ResizeAsync(jpegImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Unsupported); + resizedImage.State.ShouldBe(ImageProcessState.Unsupported); resizedImage.Result.ShouldBe(jpegImage); } @@ -31,7 +31,7 @@ public class IImageResizer_Tests : AbpImagingAbstractionsTestBase var resizedImage = await ImageResizer.ResizeAsync(pngImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Unsupported); + resizedImage.State.ShouldBe(ImageProcessState.Unsupported); resizedImage.Result.ShouldBe(pngImage); } @@ -43,7 +43,7 @@ public class IImageResizer_Tests : AbpImagingAbstractionsTestBase var resizedImage = await ImageResizer.ResizeAsync(webpImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Unsupported); + resizedImage.State.ShouldBe(ImageProcessState.Unsupported); resizedImage.Result.ShouldBe(webpImage); } diff --git a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs index 4df4cd2a61..6c7041ab2e 100644 --- a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs @@ -19,7 +19,7 @@ public class ImageSharpImageCompressor_Tests : AbpImagingImageSharpTestBase var compressedImage = await ImageCompressor.CompressAsync(jpegImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Done); + compressedImage.State.ShouldBe(ImageProcessState.Done); compressedImage.Result.Length.ShouldBeLessThan(jpegImage.Length); compressedImage.Result.Dispose(); } @@ -32,7 +32,7 @@ public class ImageSharpImageCompressor_Tests : AbpImagingImageSharpTestBase compressedImage.ShouldNotBeNull(); - if (compressedImage.State == ProcessState.Done) + if (compressedImage.State == ImageProcessState.Done) { compressedImage.Result.Length.ShouldBeLessThan(pngImage.Length); }else @@ -49,7 +49,7 @@ public class ImageSharpImageCompressor_Tests : AbpImagingImageSharpTestBase var compressedImage = await ImageCompressor.CompressAsync(webpImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Done); + compressedImage.State.ShouldBe(ImageProcessState.Done); compressedImage.Result.Length.ShouldBeLessThan(webpImage.Length); compressedImage.Result.Dispose(); } @@ -64,10 +64,10 @@ public class ImageSharpImageCompressor_Tests : AbpImagingImageSharpTestBase var compressedImage2 = await ImageCompressor.CompressAsync(byteArr); compressedImage1.ShouldNotBeNull(); - compressedImage1.State.ShouldBe(ProcessState.Done); + compressedImage1.State.ShouldBe(ImageProcessState.Done); compressedImage2.ShouldNotBeNull(); - compressedImage2.State.ShouldBe(ProcessState.Done); + compressedImage2.State.ShouldBe(ImageProcessState.Done); compressedImage1.Result.Length.ShouldBeLessThan(jpegImage.Length); compressedImage2.Result.LongLength.ShouldBeLessThan(jpegImage.Length); diff --git a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageResizer_Tests.cs b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageResizer_Tests.cs index 650c80ce3b..c436700589 100644 --- a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageResizer_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageResizer_Tests.cs @@ -21,7 +21,7 @@ public class ImageSharpImageResizer_Tests : AbpImagingImageSharpTestBase var resizedImage = await ImageResizer.ResizeAsync(jpegImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Done); + resizedImage.State.ShouldBe(ImageProcessState.Done); resizedImage.Result.Length.ShouldBeLessThan(jpegImage.Length); } @@ -32,7 +32,7 @@ public class ImageSharpImageResizer_Tests : AbpImagingImageSharpTestBase var resizedImage = await ImageResizer.ResizeAsync(pngImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Done); + resizedImage.State.ShouldBe(ImageProcessState.Done); resizedImage.Result.Length.ShouldBeLessThan(pngImage.Length); } @@ -43,7 +43,7 @@ public class ImageSharpImageResizer_Tests : AbpImagingImageSharpTestBase var resizedImage = await ImageResizer.ResizeAsync(webpImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Done); + resizedImage.State.ShouldBe(ImageProcessState.Done); resizedImage.Result.Length.ShouldBeLessThan(webpImage.Length); } @@ -57,10 +57,10 @@ public class ImageSharpImageResizer_Tests : AbpImagingImageSharpTestBase var resizedImage2 = await ImageResizer.ResizeAsync(byteArr, new ImageResizeArgs(100, 100)); resizedImage1.ShouldNotBeNull(); - resizedImage1.State.ShouldBe(ProcessState.Done); + resizedImage1.State.ShouldBe(ImageProcessState.Done); resizedImage2.ShouldNotBeNull(); - resizedImage2.State.ShouldBe(ProcessState.Done); + resizedImage2.State.ShouldBe(ImageProcessState.Done); resizedImage1.Result.Length.ShouldBeLessThan(jpegImage.Length); resizedImage2.Result.LongLength.ShouldBeLessThan(jpegImage.Length); diff --git a/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageCompressor_Tests.cs b/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageCompressor_Tests.cs index eab63b49f3..af442f62dc 100644 --- a/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageCompressor_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageCompressor_Tests.cs @@ -21,7 +21,7 @@ public class MagickNetImageCompressor_Tests : AbpImagingMagickNetTestBase var compressedImage = await ImageCompressor.CompressAsync(jpegImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Done); + compressedImage.State.ShouldBe(ImageProcessState.Done); compressedImage.Result.Length.ShouldBeLessThan(jpegImage.Length); compressedImage.Result.Dispose(); @@ -34,7 +34,7 @@ public class MagickNetImageCompressor_Tests : AbpImagingMagickNetTestBase var compressedImage = await ImageCompressor.CompressAsync(pngImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Done); + compressedImage.State.ShouldBe(ImageProcessState.Done); compressedImage.Result.Length.ShouldBeLessThan(pngImage.Length); compressedImage.Result.Dispose(); @@ -47,7 +47,7 @@ public class MagickNetImageCompressor_Tests : AbpImagingMagickNetTestBase var compressedImage = await ImageCompressor.CompressAsync(webpImage); compressedImage.ShouldNotBeNull(); - compressedImage.State.ShouldBe(ProcessState.Unsupported); + compressedImage.State.ShouldBe(ImageProcessState.Unsupported); compressedImage.Result.ShouldBe(webpImage); } @@ -59,11 +59,11 @@ public class MagickNetImageCompressor_Tests : AbpImagingMagickNetTestBase var compressedImage2 = await ImageCompressor.CompressAsync(await jpegImage.GetAllBytesAsync()); compressedImage1.ShouldNotBeNull(); - compressedImage1.State.ShouldBe(ProcessState.Done); + compressedImage1.State.ShouldBe(ImageProcessState.Done); compressedImage1.Result.Length.ShouldBeLessThan(jpegImage.Length); compressedImage2.ShouldNotBeNull(); - compressedImage2.State.ShouldBe(ProcessState.Done); + compressedImage2.State.ShouldBe(ImageProcessState.Done); compressedImage2.Result.LongLength.ShouldBeLessThan(jpegImage.Length); compressedImage1.Result.Length.ShouldBe(compressedImage2.Result.LongLength); diff --git a/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageResizer_Tests.cs b/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageResizer_Tests.cs index 870c61d0ab..36740eb3ea 100644 --- a/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageResizer_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.MagickNet.Tests/Volo/Abp/Imaging/MagickNetImageResizer_Tests.cs @@ -21,7 +21,7 @@ public class MagickNetImageResizer_Tests : AbpImagingMagickNetTestBase var resizedImage = await ImageResizer.ResizeAsync(jpegImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Done); + resizedImage.State.ShouldBe(ImageProcessState.Done); resizedImage.Result.Length.ShouldBeLessThan(jpegImage.Length); resizedImage.Result.Dispose(); @@ -34,7 +34,7 @@ public class MagickNetImageResizer_Tests : AbpImagingMagickNetTestBase var resizedImage = await ImageResizer.ResizeAsync(pngImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Done); + resizedImage.State.ShouldBe(ImageProcessState.Done); resizedImage.Result.Length.ShouldBeLessThan(pngImage.Length); resizedImage.Result.Dispose(); @@ -47,7 +47,7 @@ public class MagickNetImageResizer_Tests : AbpImagingMagickNetTestBase var resizedImage = await ImageResizer.ResizeAsync(webpImage, new ImageResizeArgs(100, 100)); resizedImage.ShouldNotBeNull(); - resizedImage.State.ShouldBe(ProcessState.Done); + resizedImage.State.ShouldBe(ImageProcessState.Done); resizedImage.Result.Length.ShouldBeLessThan(webpImage.Length); resizedImage.Result.Dispose(); @@ -61,11 +61,11 @@ public class MagickNetImageResizer_Tests : AbpImagingMagickNetTestBase var resizedImage2 = await ImageResizer.ResizeAsync(await jpegImage.GetAllBytesAsync(), new ImageResizeArgs(100, 100)); resizedImage1.ShouldNotBeNull(); - resizedImage1.State.ShouldBe(ProcessState.Done); + resizedImage1.State.ShouldBe(ImageProcessState.Done); resizedImage1.Result.Length.ShouldBeLessThan(jpegImage.Length); resizedImage2.ShouldNotBeNull(); - resizedImage2.State.ShouldBe(ProcessState.Done); + resizedImage2.State.ShouldBe(ImageProcessState.Done); resizedImage2.Result.LongLength.ShouldBeLessThan(jpegImage.Length); resizedImage1.Result.Length.ShouldBe(resizedImage2.Result.LongLength);