Skip to content

Commit 51c6467

Browse files
dlemstradlemstra
committed
Switch to the newer using statement.
1 parent 357b5f7 commit 51c6467

File tree

6 files changed

+169
-303
lines changed

6 files changed

+169
-303
lines changed

‎tests/Magick.NET.SystemDrawing.Tests/IMagickImageCollectionExtensionsTests/TheToBitmapMethod.cs

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,25 @@ public class TheToBitmapMethod
1414
[Fact]
1515
public void ShouldReturnBitmap()
1616
{
17-
using (var images = new MagickImageCollection(Files.RoseSparkleGIF))
18-
{
19-
Assert.Equal(3, images.Count);
17+
using var images = new MagickImageCollection(Files.RoseSparkleGIF);
18+
Assert.Equal(3, images.Count);
2019

21-
using (var bitmap = images.ToBitmap())
22-
{
23-
Assert.NotNull(bitmap);
24-
Assert.Equal(3, bitmap.GetFrameCount(FrameDimension.Page));
25-
}
26-
}
20+
using var bitmap = images.ToBitmap();
21+
Assert.NotNull(bitmap);
22+
Assert.Equal(3, bitmap.GetFrameCount(FrameDimension.Page));
2723
}
2824

2925
[Fact]
3026
public void ShouldUseOptimizationForSingleImage()
3127
{
32-
using (var images = new MagickImageCollection(Files.RoseSparkleGIF))
33-
{
34-
images.RemoveAt(0);
35-
images.RemoveAt(0);
28+
using var images = new MagickImageCollection(Files.RoseSparkleGIF);
29+
images.RemoveAt(0);
30+
images.RemoveAt(0);
3631

37-
Assert.Single(images);
32+
Assert.Single(images);
3833

39-
using (var bitmap = images.ToBitmap())
40-
{
41-
Assert.NotNull(bitmap);
42-
}
43-
}
34+
using var bitmap = images.ToBitmap();
35+
Assert.NotNull(bitmap);
4436
}
4537
}
4638
}

‎tests/Magick.NET.SystemDrawing.Tests/IMagickImageExtensionsTests/TheReadMethod.cs

Lines changed: 27 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,79 +17,54 @@ public partial class TheReadMethod
1717
[Fact]
1818
public void ShouldThrowExceptionWhenBitmapIsNull()
1919
{
20-
using (var image = new MagickImage())
21-
{
22-
Assert.Throws<ArgumentNullException>("bitmap", () => image.Read((Bitmap)null));
23-
}
20+
using var image = new MagickImage();
21+
22+
Assert.Throws<ArgumentNullException>("bitmap", () => image.Read((Bitmap)null));
2423
}
2524

2625
[Fact]
2726
public void ShouldUsePngFormatWhenBitmapIsPng()
2827
{
29-
using (var bitmap = new Bitmap(Files.SnakewarePNG))
30-
{
31-
using (var image = new MagickImage())
32-
{
33-
image.Read(bitmap);
28+
using var bitmap = new Bitmap(Files.SnakewarePNG);
29+
using var image = new MagickImage();
30+
image.Read(bitmap);
3431

35-
Assert.Equal(286, image.Width);
36-
Assert.Equal(67, image.Height);
37-
Assert.Equal(MagickFormat.Png, image.Format);
38-
}
39-
}
32+
Assert.Equal(286, image.Width);
33+
Assert.Equal(67, image.Height);
34+
Assert.Equal(MagickFormat.Png, image.Format);
4035
}
4136

4237
[Fact]
4338
public void ShouldUseBmpFormatWhenBitmapIsMemoryBmp()
4439
{
45-
using (var bitmap = new Bitmap(100, 50, PixelFormat.Format24bppRgb))
46-
{
47-
Assert.Equal(bitmap.RawFormat, ImageFormat.MemoryBmp);
40+
using var bitmap = new Bitmap(100, 50, PixelFormat.Format24bppRgb);
41+
Assert.Equal(bitmap.RawFormat, ImageFormat.MemoryBmp);
4842

49-
using (var image = new MagickImage())
50-
{
51-
image.Read(bitmap);
43+
using var image = new MagickImage();
44+
image.Read(bitmap);
5245

53-
Assert.Equal(100, image.Width);
54-
Assert.Equal(50, image.Height);
55-
Assert.Equal(MagickFormat.Bmp3, image.Format);
56-
}
57-
}
46+
Assert.Equal(100, image.Width);
47+
Assert.Equal(50, image.Height);
48+
Assert.Equal(MagickFormat.Bmp3, image.Format);
5849
}
5950

6051
[Fact]
6152
public void ShouldCreateCorrectImageWithByteArrayFromSystemDrawing()
6253
{
63-
using (var img = Image.FromFile(Files.Coders.PageTIF))
64-
{
65-
byte[] bytes = null;
66-
using (var memStream = new MemoryStream())
67-
{
68-
img.Save(memStream, ImageFormat.Tiff);
69-
bytes = memStream.GetBuffer();
70-
}
71-
72-
using (var image = new MagickImage())
73-
{
74-
image.Read(bytes);
54+
using var img = Image.FromFile(Files.Coders.PageTIF);
55+
using var memStream = new MemoryStream();
56+
img.Save(memStream, ImageFormat.Tiff);
57+
var bytes = memStream.GetBuffer();
7558

76-
image.Settings.Compression = CompressionMethod.Group4;
59+
using var image = new MagickImage();
60+
image.Read(bytes);
7761

78-
using (var memStream = new MemoryStream())
79-
{
80-
image.Write(memStream);
81-
memStream.Position = 0;
62+
image.Settings.Compression = CompressionMethod.Group4;
63+
bytes = image.ToByteArray();
8264

83-
using (var before = new MagickImage(Files.Coders.PageTIF))
84-
{
85-
using (var after = new MagickImage(memStream))
86-
{
87-
Assert.Equal(0.0, before.Compare(after, ErrorMetric.RootMeanSquared));
88-
}
89-
}
90-
}
91-
}
92-
}
65+
using var before = new MagickImage(Files.Coders.PageTIF);
66+
using var after = new MagickImage(bytes);
67+
Assert.Equal(0.0, before.Compare(after, ErrorMetric.RootMeanSquared));
9368
}
9469
}
9570
}

‎tests/Magick.NET.SystemDrawing.Tests/IMagickImageExtensionsTests/TheToBitmapMethod.cs

Lines changed: 54 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -15,165 +15,122 @@ public class TheToBitmapMethod
1515
{
1616
[Fact]
1717
public void ShouldThrowExceptionWhenImageFormatIsExif()
18-
{
19-
AssertUnsupportedImageFormat(ImageFormat.Exif);
20-
}
18+
=> AssertUnsupportedImageFormat(ImageFormat.Exif);
2119

2220
[Fact]
2321
public void ShouldThrowExceptionWhenImageFormatIsEmf()
24-
{
25-
AssertUnsupportedImageFormat(ImageFormat.Emf);
26-
}
22+
=> AssertUnsupportedImageFormat(ImageFormat.Emf);
2723

2824
[Fact]
2925
public void ShouldThrowExceptionWhenImageFormatIsWmf()
30-
{
31-
AssertUnsupportedImageFormat(ImageFormat.Wmf);
32-
}
26+
=> AssertUnsupportedImageFormat(ImageFormat.Wmf);
3327

3428
[Fact]
3529
public void ShouldReturnBitmapWhenFormatIsBmp()
36-
{
37-
AssertSupportedImageFormat(ImageFormat.Bmp);
38-
}
30+
=> AssertSupportedImageFormat(ImageFormat.Bmp);
3931

4032
[Fact]
4133
public void ShouldReturnBitmapWhenFormatIsGif()
42-
{
43-
AssertSupportedImageFormat(ImageFormat.Gif);
44-
}
34+
=> AssertSupportedImageFormat(ImageFormat.Gif);
4535

4636
[Fact]
4737
public void ShouldReturnBitmapWhenFormatIsIcon()
48-
{
49-
AssertSupportedImageFormat(ImageFormat.Icon);
50-
}
38+
=> AssertSupportedImageFormat(ImageFormat.Icon);
5139

5240
[Fact]
5341
public void ShouldReturnBitmapWhenFormatIsJpeg()
54-
{
55-
AssertSupportedImageFormat(ImageFormat.Jpeg);
56-
}
42+
=> AssertSupportedImageFormat(ImageFormat.Jpeg);
5743

5844
[Fact]
5945
public void ShouldReturnBitmapWhenFormatIsPng()
60-
{
61-
AssertSupportedImageFormat(ImageFormat.Png);
62-
}
46+
=> AssertSupportedImageFormat(ImageFormat.Png);
6347

6448
[Fact]
6549
public void ShouldReturnBitmapWhenFormatIsTiff()
66-
{
67-
AssertSupportedImageFormat(ImageFormat.Tiff);
68-
}
50+
=> AssertSupportedImageFormat(ImageFormat.Tiff);
6951

7052
[Fact]
7153
public void ShouldChangeTheColorSpaceToSrgb()
7254
{
73-
using (var image = new MagickImage(MagickColors.Red, 1, 1))
74-
{
75-
image.ColorSpace = ColorSpace.YCbCr;
55+
using var image = new MagickImage(MagickColors.Red, 1, 1);
56+
image.ColorSpace = ColorSpace.YCbCr;
7657

77-
using (var bitmap = image.ToBitmap())
78-
{
79-
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(0, 0)));
80-
}
58+
using var bitmap = image.ToBitmap();
59+
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(0, 0)));
8160

82-
Assert.Equal(ColorSpace.YCbCr, image.ColorSpace);
83-
}
61+
Assert.Equal(ColorSpace.YCbCr, image.ColorSpace);
8462
}
8563

8664
[Fact]
8765
public void ShouldBeAbleToConvertGrayImage()
8866
{
89-
using (var image = new MagickImage(MagickColors.Magenta, 5, 1))
90-
{
91-
image.Extent(5, 2, MagickColors.Honeydew);
67+
using var image = new MagickImage(MagickColors.Magenta, 5, 1);
68+
image.Extent(5, 2, MagickColors.Honeydew);
9269

93-
image.ColorType = ColorType.Bilevel;
94-
image.ClassType = ClassType.Direct;
70+
image.ColorType = ColorType.Bilevel;
71+
image.ClassType = ClassType.Direct;
9572

96-
Assert.Equal(ColorSpace.Gray, image.ColorSpace);
73+
Assert.Equal(ColorSpace.Gray, image.ColorSpace);
9774

98-
using (var bitmap = image.ToBitmap())
99-
{
100-
for (var i = 0; i < image.Width; i++)
101-
ColorAssert.Equal(MagickColors.Black, ToMagickColor(bitmap.GetPixel(i, 0)));
75+
using var bitmap = image.ToBitmap();
76+
for (var i = 0; i < image.Width; i++)
77+
ColorAssert.Equal(MagickColors.Black, ToMagickColor(bitmap.GetPixel(i, 0)));
10278

103-
for (var i = 0; i < image.Width; i++)
104-
ColorAssert.Equal(MagickColors.White, ToMagickColor(bitmap.GetPixel(i, 1)));
105-
}
106-
}
79+
for (var i = 0; i < image.Width; i++)
80+
ColorAssert.Equal(MagickColors.White, ToMagickColor(bitmap.GetPixel(i, 1)));
10781
}
10882

10983
[Fact]
11084
public void ShouldBeAbleToConvertRgbImage()
11185
{
112-
using (var image = new MagickImage(MagickColors.Magenta, 5, 1))
113-
{
114-
using (var bitmap = image.ToBitmap())
115-
{
116-
for (var i = 0; i < image.Width; i++)
117-
ColorAssert.Equal(MagickColors.Magenta, ToMagickColor(bitmap.GetPixel(i, 0)));
118-
}
119-
}
86+
using var image = new MagickImage(MagickColors.Magenta, 5, 1);
87+
using var bitmap = image.ToBitmap();
88+
for (var i = 0; i < image.Width; i++)
89+
ColorAssert.Equal(MagickColors.Magenta, ToMagickColor(bitmap.GetPixel(i, 0)));
12090
}
12191

12292
[Fact]
12393
public void ShouldBeAbleToConvertRgbaImage()
12494
{
125-
using (var image = new MagickImage(MagickColors.Magenta, 5, 1))
126-
{
127-
image.Alpha(AlphaOption.On);
128-
129-
using (var bitmap = image.ToBitmap())
130-
{
131-
var color = MagickColors.Magenta;
132-
color.A = Quantum.Max;
133-
134-
for (var i = 0; i < image.Width; i++)
135-
ColorAssert.Equal(color, ToMagickColor(bitmap.GetPixel(i, 0)));
136-
}
137-
}
95+
using var image = new MagickImage(MagickColors.Magenta, 5, 1);
96+
image.Alpha(AlphaOption.On);
97+
98+
var color = MagickColors.Magenta;
99+
color.A = Quantum.Max;
100+
101+
using var bitmap = image.ToBitmap();
102+
for (var i = 0; i < image.Width; i++)
103+
ColorAssert.Equal(color, ToMagickColor(bitmap.GetPixel(i, 0)));
138104
}
139105

140106
[Fact]
141107
public void ShouldThrowExceptionWhenImageFormatIsNull()
142108
{
143-
using (var image = new MagickImage(MagickColors.Red, 1, 1))
144-
{
145-
Assert.Throws<ArgumentNullException>("imageFormat", () => image.ToBitmapWithDensity(null));
146-
}
109+
using var image = new MagickImage(MagickColors.Red, 1, 1);
110+
111+
Assert.Throws<ArgumentNullException>("imageFormat", () => image.ToBitmapWithDensity(null));
147112
}
148113

149114
private void AssertUnsupportedImageFormat(ImageFormat imageFormat)
150115
{
151-
using (var image = new MagickImage(MagickColors.Red, 10, 10))
152-
{
153-
Assert.Throws<NotSupportedException>(() =>
154-
{
155-
image.ToBitmap(imageFormat);
156-
});
157-
}
116+
using var image = new MagickImage(MagickColors.Red, 10, 10);
117+
118+
Assert.Throws<NotSupportedException>(() => image.ToBitmap(imageFormat));
158119
}
159120

160121
private void AssertSupportedImageFormat(ImageFormat imageFormat)
161122
{
162-
using (var image = new MagickImage(MagickColors.Red, 10, 10))
163-
{
164-
using (var bitmap = image.ToBitmap(imageFormat))
165-
{
166-
Assert.Equal(imageFormat, bitmap.RawFormat);
167-
168-
// Cannot test JPEG due to rounding issues.
169-
if (imageFormat != ImageFormat.Jpeg)
170-
{
171-
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(0, 0)));
172-
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(5, 5)));
173-
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(9, 9)));
174-
}
175-
}
176-
}
123+
using var image = new MagickImage(MagickColors.Red, 10, 10);
124+
using var bitmap = image.ToBitmap(imageFormat);
125+
Assert.Equal(imageFormat, bitmap.RawFormat);
126+
127+
// Cannot test JPEG due to rounding issues.
128+
if (imageFormat == ImageFormat.Jpeg)
129+
return;
130+
131+
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(0, 0)));
132+
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(5, 5)));
133+
ColorAssert.Equal(MagickColors.Red, ToMagickColor(bitmap.GetPixel(9, 9)));
177134
}
178135

179136
private MagickColor ToMagickColor(Color color)

0 commit comments

Comments
 (0)