Skip to content

Commit 357b5f7

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

File tree

1 file changed

+77
-95
lines changed

1 file changed

+77
-95
lines changed

‎tests/Magick.NET.SystemWindowsMedia.Tests/IMagickImageExtentionsTests/TheToBitmapSourceMethod.cs

Lines changed: 77 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -16,169 +16,151 @@ public void ShouldReturnImageWithRgb24FormatForRgbImage()
1616
{
1717
var pixels = new byte[150];
1818

19-
using (var image = new MagickImage(MagickColors.Red, 5, 10))
20-
{
21-
var bitmapSource = image.ToBitmapSource();
22-
23-
Assert.Equal(PixelFormats.Rgb24, bitmapSource.Format);
24-
Assert.Equal(5, bitmapSource.Width);
25-
Assert.Equal(10, bitmapSource.Height);
26-
Assert.Equal(96, bitmapSource.DpiX);
27-
Assert.Equal(96, bitmapSource.DpiY);
28-
29-
bitmapSource.CopyPixels(pixels, 15, 0);
30-
31-
Assert.Equal(255, pixels[0]);
32-
Assert.Equal(0, pixels[1]);
33-
Assert.Equal(0, pixels[2]);
34-
}
19+
using var image = new MagickImage(MagickColors.Red, 5, 10);
20+
var bitmapSource = image.ToBitmapSource();
21+
22+
Assert.Equal(PixelFormats.Rgb24, bitmapSource.Format);
23+
Assert.Equal(5, bitmapSource.Width);
24+
Assert.Equal(10, bitmapSource.Height);
25+
Assert.Equal(96, bitmapSource.DpiX);
26+
Assert.Equal(96, bitmapSource.DpiY);
27+
28+
bitmapSource.CopyPixels(pixels, 15, 0);
29+
30+
Assert.Equal(255, pixels[0]);
31+
Assert.Equal(0, pixels[1]);
32+
Assert.Equal(0, pixels[2]);
3533
}
3634

3735
[Fact]
3836
public void ShouldReturnImageWithCmyk32FormatForCmykImage()
3937
{
4038
var pixels = new byte[200];
4139

42-
using (var image = new MagickImage(MagickColors.Red, 10, 5))
43-
{
44-
image.ColorSpace = ColorSpace.CMYK;
40+
using var image = new MagickImage(MagickColors.Red, 10, 5);
41+
image.ColorSpace = ColorSpace.CMYK;
4542

46-
var bitmapSource = image.ToBitmapSource();
43+
var bitmapSource = image.ToBitmapSource();
4744

48-
Assert.Equal(PixelFormats.Cmyk32, bitmapSource.Format);
49-
Assert.Equal(10, bitmapSource.Width);
50-
Assert.Equal(5, bitmapSource.Height);
51-
Assert.Equal(96, bitmapSource.DpiX);
52-
Assert.Equal(96, bitmapSource.DpiY);
45+
Assert.Equal(PixelFormats.Cmyk32, bitmapSource.Format);
46+
Assert.Equal(10, bitmapSource.Width);
47+
Assert.Equal(5, bitmapSource.Height);
48+
Assert.Equal(96, bitmapSource.DpiX);
49+
Assert.Equal(96, bitmapSource.DpiY);
5350

54-
bitmapSource.CopyPixels(pixels, 40, 0);
51+
bitmapSource.CopyPixels(pixels, 40, 0);
5552

56-
Assert.Equal(0, pixels[0]);
57-
Assert.Equal(255, pixels[1]);
58-
Assert.Equal(255, pixels[2]);
59-
Assert.Equal(0, pixels[3]);
60-
}
53+
Assert.Equal(0, pixels[0]);
54+
Assert.Equal(255, pixels[1]);
55+
Assert.Equal(255, pixels[2]);
56+
Assert.Equal(0, pixels[3]);
6157
}
6258

6359
[Fact]
6460
public void ShouldReturnImageWithBgra32FormatForRgbaImage()
6561
{
6662
var pixels = new byte[200];
6763

68-
using (var image = new MagickImage(MagickColors.Red, 5, 10))
69-
{
70-
image.HasAlpha = true;
64+
using var image = new MagickImage(MagickColors.Red, 5, 10);
65+
image.HasAlpha = true;
7166

72-
var bitmapSource = image.ToBitmapSource();
67+
var bitmapSource = image.ToBitmapSource();
7368

74-
Assert.Equal(PixelFormats.Bgra32, bitmapSource.Format);
75-
Assert.Equal(5, bitmapSource.Width);
76-
Assert.Equal(10, bitmapSource.Height);
77-
Assert.Equal(96, bitmapSource.DpiX);
78-
Assert.Equal(96, bitmapSource.DpiY);
69+
Assert.Equal(PixelFormats.Bgra32, bitmapSource.Format);
70+
Assert.Equal(5, bitmapSource.Width);
71+
Assert.Equal(10, bitmapSource.Height);
72+
Assert.Equal(96, bitmapSource.DpiX);
73+
Assert.Equal(96, bitmapSource.DpiY);
7974

80-
bitmapSource.CopyPixels(pixels, 20, 0);
75+
bitmapSource.CopyPixels(pixels, 20, 0);
8176

82-
Assert.Equal(0, pixels[0]);
83-
Assert.Equal(0, pixels[1]);
84-
Assert.Equal(255, pixels[2]);
85-
Assert.Equal(255, pixels[3]);
86-
}
77+
Assert.Equal(0, pixels[0]);
78+
Assert.Equal(0, pixels[1]);
79+
Assert.Equal(255, pixels[2]);
80+
Assert.Equal(255, pixels[3]);
8781
}
8882

8983
[Fact]
9084
public void ShouldReturnImageWithRgb24FormatForYCbCrImage()
9185
{
9286
var pixels = new byte[150];
9387

94-
using (var image = new MagickImage(MagickColors.Red, 5, 10))
95-
{
96-
image.ColorSpace = ColorSpace.YCbCr;
88+
using var image = new MagickImage(MagickColors.Red, 5, 10);
89+
image.ColorSpace = ColorSpace.YCbCr;
9790

98-
var bitmapSource = image.ToBitmapSource();
91+
var bitmapSource = image.ToBitmapSource();
9992

100-
Assert.Equal(PixelFormats.Rgb24, bitmapSource.Format);
101-
Assert.Equal(5, bitmapSource.Width);
102-
Assert.Equal(10, bitmapSource.Height);
103-
Assert.Equal(96, bitmapSource.DpiX);
104-
Assert.Equal(96, bitmapSource.DpiY);
93+
Assert.Equal(PixelFormats.Rgb24, bitmapSource.Format);
94+
Assert.Equal(5, bitmapSource.Width);
95+
Assert.Equal(10, bitmapSource.Height);
96+
Assert.Equal(96, bitmapSource.DpiX);
97+
Assert.Equal(96, bitmapSource.DpiY);
10598

106-
bitmapSource.CopyPixels(pixels, 15, 0);
99+
bitmapSource.CopyPixels(pixels, 15, 0);
107100

108-
Assert.Equal(255, pixels[0]);
109-
Assert.Equal(0, pixels[1]);
110-
Assert.Equal(0, pixels[2]);
111-
}
101+
Assert.Equal(255, pixels[0]);
102+
Assert.Equal(0, pixels[1]);
103+
Assert.Equal(0, pixels[2]);
112104
}
113105

114106
[Fact]
115107
public void ShouldNotConvertTheDpiWhenDensityIsUndefinedAndNotZero()
116108
{
117-
using (var image = new MagickImage(MagickColors.Red, 5, 10))
118-
{
119-
image.Density = new Density(1, 2, DensityUnit.Undefined);
109+
using var image = new MagickImage(MagickColors.Red, 5, 10);
110+
image.Density = new Density(1, 2, DensityUnit.Undefined);
120111

121-
var bitmapSource = image.ToBitmapSourceWithDensity();
112+
var bitmapSource = image.ToBitmapSourceWithDensity();
122113

123-
Assert.Equal(1, bitmapSource.DpiX);
124-
Assert.Equal(2, bitmapSource.DpiY);
125-
}
114+
Assert.Equal(1, bitmapSource.DpiX);
115+
Assert.Equal(2, bitmapSource.DpiY);
126116
}
127117

128118
[Fact]
129119
public void ShouldNotConvertTheDpiWhenDensityIsPixelsPerInch()
130120
{
131-
using (var image = new MagickImage(MagickColors.Red, 5, 10))
132-
{
133-
image.Density = new Density(1, 2, DensityUnit.PixelsPerInch);
121+
using var image = new MagickImage(MagickColors.Red, 5, 10);
122+
image.Density = new Density(1, 2, DensityUnit.PixelsPerInch);
134123

135-
var bitmapSource = image.ToBitmapSourceWithDensity();
124+
var bitmapSource = image.ToBitmapSourceWithDensity();
136125

137-
Assert.Equal(1, bitmapSource.DpiX);
138-
Assert.Equal(2, bitmapSource.DpiY);
139-
}
126+
Assert.Equal(1, bitmapSource.DpiX);
127+
Assert.Equal(2, bitmapSource.DpiY);
140128
}
141129

142130
[Fact]
143131
public void ShouldConvertTheDpiWhenDensityIsPixelsPerCentimeter()
144132
{
145-
using (var image = new MagickImage(MagickColors.Red, 5, 10))
146-
{
147-
image.Density = new Density(1, 2, DensityUnit.PixelsPerCentimeter);
133+
using var image = new MagickImage(MagickColors.Red, 5, 10);
134+
image.Density = new Density(1, 2, DensityUnit.PixelsPerCentimeter);
148135

149-
var bitmapSource = image.ToBitmapSourceWithDensity();
136+
var bitmapSource = image.ToBitmapSourceWithDensity();
150137

151-
Assert.InRange(bitmapSource.DpiX, 2.53, 2.55);
152-
Assert.InRange(bitmapSource.DpiY, 5.07, 5.09);
153-
}
138+
Assert.InRange(bitmapSource.DpiX, 2.53, 2.55);
139+
Assert.InRange(bitmapSource.DpiY, 5.07, 5.09);
154140
}
155141

156142
[Fact]
157143
public void ShouldIgnoreTheDensityOfTheImage()
158144
{
159-
using (var image = new MagickImage(MagickColors.Red, 200, 100))
160-
{
161-
image.Density = new Density(300);
145+
using var image = new MagickImage(MagickColors.Red, 200, 100);
146+
image.Density = new Density(300);
162147

163-
var bitmapSource = image.ToBitmapSource();
148+
var bitmapSource = image.ToBitmapSource();
164149

165-
Assert.Equal(200, (int)bitmapSource.Width);
166-
Assert.Equal(100, (int)bitmapSource.Height);
167-
}
150+
Assert.Equal(200, (int)bitmapSource.Width);
151+
Assert.Equal(100, (int)bitmapSource.Height);
168152
}
169153

170154
[Fact]
171155
public void ShouldUseTheDensityOfTheImageWhenBitmapDensityIsSetToUse()
172156
{
173-
using (var image = new MagickImage(MagickColors.Red, 200, 100))
174-
{
175-
image.Density = new Density(300, 200);
157+
using var image = new MagickImage(MagickColors.Red, 200, 100);
158+
image.Density = new Density(300, 200);
176159

177-
var bitmapSource = image.ToBitmapSourceWithDensity();
160+
var bitmapSource = image.ToBitmapSourceWithDensity();
178161

179-
Assert.Equal(64, (int)bitmapSource.Width);
180-
Assert.Equal(48, (int)bitmapSource.Height);
181-
}
162+
Assert.Equal(64, (int)bitmapSource.Width);
163+
Assert.Equal(48, (int)bitmapSource.Height);
182164
}
183165
}
184166
}

0 commit comments

Comments
 (0)