Skip to content

Commit 2033dd4

Browse files
dgdg
committed
tests: expected .PNG changed to RAW .GD2
1 parent eed59a3 commit 2033dd4

32 files changed

+41
-20
lines changed

‎tests/Utils/Image.alpha1.phpt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ $image2->place(Image::fromBlank(50, 50, Image::rgb(80, 174, 0)), 75, 25);
2525

2626
Assert::same($image2->toString(Image::PNG, 0), $image->toString(Image::PNG, 0));
2727

28-
ob_start();
29-
3028
$image = Image::fromBlank(200, 100, Image::rgb(255, 128, 0, 60));
3129
$image->crop(0, 0, '60%', '60%');
32-
$image->send(Image::PNG, 0);
3330

34-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha1.png'), ob_get_clean());
31+
ob_start();
32+
imagegd2($image->getImageResource());
33+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha1.gd2'), ob_get_clean());

‎tests/Utils/Image.alpha2.phpt‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,44 @@ use Tester\Assert;
1414
require __DIR__ . '/../bootstrap.php';
1515

1616

17+
function toGd2($image)
18+
{
19+
ob_start();
20+
imagegd2($image->getImageResource());
21+
return ob_get_clean();
22+
}
23+
24+
1725
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
1826
$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 100);
19-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.100.png'), $image->toString(Image::PNG, 0));
27+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.100.gd2'), toGd2($image));
2028

2129

2230
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
2331
$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 99);
24-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.99.png'), $image->toString(Image::PNG, 0));
32+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.99.gd2'), toGd2($image));
2533

2634

2735
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
2836
$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 50);
29-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.50.png'), $image->toString(Image::PNG, 0));
37+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.50.gd2'), toGd2($image));
3038

3139

3240
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
3341
$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 1);
34-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.1.png'), $image->toString(Image::PNG, 0));
42+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.1.gd2'), toGd2($image));
3543

3644

3745
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
3846
$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha2.png'), 0, 0, 0);
39-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.0.png'), $image->toString(Image::PNG, 0));
47+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.0.gd2'), toGd2($image));
4048

4149

4250
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
4351
$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha3.gif'), 0, 0, 100);
44-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.100b.png'), $image->toString(Image::PNG, 0));
52+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.100b.gd2'), toGd2($image));
4553

4654

4755
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
4856
$image->place(Image::fromFile(__DIR__ . '/fixtures.images/alpha3.gif'), 0, 0, 50);
49-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.50b.png'), $image->toString(Image::PNG, 0));
57+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha2.50b.gd2'), toGd2($image));

‎tests/Utils/Image.drawing.phpt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ use Tester\Assert;
1414
require __DIR__ . '/../bootstrap.php';
1515

1616

17+
function toGd2($image)
18+
{
19+
ob_start();
20+
imagegd2($image->getImageResource());
21+
return ob_get_clean();
22+
}
23+
24+
1725
$size = 300;
1826
$image = Image::fromBlank($size, $size);
1927

@@ -28,11 +36,11 @@ $image->filledEllipse(187, 125, $radius, $radius, Image::rgb(0, 0, 255, 75));
2836

2937
$image->copyResampled($image, 200, 200, 0, 0, 80, 80, $size, $size);
3038

31-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.drawing.1.png'), $image->toString(Image::PNG, 0));
39+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.drawing.1.gd2'), toGd2($image));
3240

3341

3442
// palette-based image
3543
$image = Image::fromFile(__DIR__ . '/fixtures.images/logo.gif');
3644
$image->filledEllipse(100, 50, 50, 50, Image::rgb(255, 255, 0, 75));
3745
$image->filledEllipse(100, 150, 50, 50, Image::rgb(255, 255, 0, 75));
38-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.drawing.2.png'), $image->toString(Image::PNG, 0));
46+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.drawing.2.gd2'), toGd2($image));

‎tests/Utils/Image.place.phpt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,5 @@ $image = Image::fromBlank(100, 100, Image::rgb(0, 0, 0));
2020
$image->place($rectangle, '37.5%', '50%');
2121

2222
ob_start();
23-
24-
$image->send(Image::PNG, 0);
25-
26-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.place.png'), ob_get_clean());
23+
imagegd2($image->getImageResource());
24+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.place.gd2'), ob_get_clean());

‎tests/Utils/Image.resize.phpt‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ require __DIR__ . '/../bootstrap.php';
1717
$main = Image::fromFile(__DIR__ . '/fixtures.images/logo.gif');
1818

1919

20+
function toGd2($image)
21+
{
22+
ob_start();
23+
imagegd2($image->getImageResource());
24+
return ob_get_clean();
25+
}
26+
27+
2028
test(function () use ($main) { // cropping...
2129
$image = clone $main;
2230
Assert::same(176, $image->width);
@@ -135,19 +143,19 @@ test(function () use ($main) { // rotate
135143
test(function () use ($main) { // alpha resize
136144
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
137145
$image->resize(20, 20);
138-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.resize1.png'), $image->toString(Image::PNG, 0));
146+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.resize1.gd2'), toGd2($image));
139147
});
140148

141149

142150
test(function () use ($main) { // alpha flip
143151
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha1.png');
144152
$image->resize(-10, -10);
145-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.flip1.png'), $image->toString(Image::PNG, 0));
153+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.flip1.gd2'), toGd2($image));
146154
});
147155

148156

149157
test(function () use ($main) { // palette alpha resize
150158
$image = Image::fromFile(__DIR__ . '/fixtures.images/alpha3.gif');
151159
$image->resize(20, 20);
152-
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.resize2.png'), $image->toString(Image::PNG, 0));
160+
Assert::same(file_get_contents(__DIR__ . '/expected/Image.alpha.resize2.gd2'), toGd2($image));
153161
});

‎tests/Utils/expected/Image.alpha.flip1.gd2‎

423 Bytes
Binary file not shown.

‎tests/Utils/expected/Image.alpha.flip1.png‎

-478 Bytes
Binary file not shown.

‎tests/Utils/expected/Image.alpha.resize1.gd2‎

1.58 KB
Binary file not shown.

‎tests/Utils/expected/Image.alpha.resize1.png‎

-1.65 KB
Binary file not shown.

‎tests/Utils/expected/Image.alpha.resize2.gd2‎

1.58 KB
Binary file not shown.

0 commit comments

Comments
 (0)