diff --git a/tests/Output/QRFpdfTest.php b/tests/Output/QRFpdfTest.php index d7e7e8962..3159454fd 100644 --- a/tests/Output/QRFpdfTest.php +++ b/tests/Output/QRFpdfTest.php @@ -78,7 +78,7 @@ class QRFpdfTest extends QROutputTestAbstract{ $this->options->imageBase64 = false; // substr() to avoid CreationDate - $expected = substr(file_get_contents(__DIR__.'/samples/'.$type), 0, 2500); + $expected = substr(file_get_contents(__DIR__.'/../samples/'.$type), 0, 2500); $actual = substr((new QRCode($this->options))->render('test'), 0, 2500); $this::assertSame($expected, $actual); diff --git a/tests/Output/QROutputTestAbstract.php b/tests/Output/QROutputTestAbstract.php index e25bc2f73..f27c95261 100644 --- a/tests/Output/QROutputTestAbstract.php +++ b/tests/Output/QROutputTestAbstract.php @@ -128,7 +128,7 @@ abstract class QROutputTestAbstract extends TestCase{ $this->options->outputType = $type; $this::assertSame( - trim(file_get_contents(__DIR__.'/samples/'.$type)), + trim(file_get_contents(__DIR__.'/../samples/'.$type)), trim((new QRCode($this->options))->render('test')) ); } diff --git a/tests/Output/QRStringTest.php b/tests/Output/QRStringTest.php index 91bf11c83..d088ab27d 100644 --- a/tests/Output/QRStringTest.php +++ b/tests/Output/QRStringTest.php @@ -68,7 +68,7 @@ class QRStringTest extends QROutputTestAbstract{ $this->options->outputInterface = MyCustomOutput::class; $this::assertSame( - file_get_contents(__DIR__.'/samples/custom'), + file_get_contents(__DIR__.'/../samples/custom'), (new QRCode($this->options))->render('test') ); } diff --git a/tests/QRCodeReaderTest.php b/tests/QRCodeReaderTest.php index d83f1c753..cab043436 100644 --- a/tests/QRCodeReaderTest.php +++ b/tests/QRCodeReaderTest.php @@ -76,7 +76,7 @@ class QRCodeReaderTest extends TestCase{ } $this::assertSame($expected, (string)(new QRCode) - ->readFromSource(GDLuminanceSource::fromFile(__DIR__.'/qrcodes/'.$img, $this->options))); + ->readFromSource(GDLuminanceSource::fromFile(__DIR__.'/samples/'.$img, $this->options))); } /** @@ -94,7 +94,7 @@ class QRCodeReaderTest extends TestCase{ } $this::assertSame($expected, (string)(new QRCode) - ->readFromSource(IMagickLuminanceSource::fromFile(__DIR__.'/qrcodes/'.$img, $this->options))); + ->readFromSource(IMagickLuminanceSource::fromFile(__DIR__.'/samples/'.$img, $this->options))); } public function testReaderMultiSegment():void{ diff --git a/tests/qrcodes/alphanum.png b/tests/samples/alphanum.png similarity index 100% rename from tests/qrcodes/alphanum.png rename to tests/samples/alphanum.png diff --git a/tests/qrcodes/byte.png b/tests/samples/byte.png similarity index 100% rename from tests/qrcodes/byte.png rename to tests/samples/byte.png diff --git a/tests/Output/samples/custom b/tests/samples/custom similarity index 100% rename from tests/Output/samples/custom rename to tests/samples/custom diff --git a/tests/qrcodes/damaged.png b/tests/samples/damaged.png similarity index 100% rename from tests/qrcodes/damaged.png rename to tests/samples/damaged.png diff --git a/tests/qrcodes/example_svg.png b/tests/samples/example_svg.png similarity index 100% rename from tests/qrcodes/example_svg.png rename to tests/samples/example_svg.png diff --git a/tests/qrcodes/example_svg_dots.png b/tests/samples/example_svg_dots.png similarity index 100% rename from tests/qrcodes/example_svg_dots.png rename to tests/samples/example_svg_dots.png diff --git a/tests/Output/samples/fpdf b/tests/samples/fpdf similarity index 100% rename from tests/Output/samples/fpdf rename to tests/samples/fpdf diff --git a/tests/Output/samples/gif b/tests/samples/gif similarity index 100% rename from tests/Output/samples/gif rename to tests/samples/gif diff --git a/tests/qrcodes/hello_world.png b/tests/samples/hello_world.png similarity index 100% rename from tests/qrcodes/hello_world.png rename to tests/samples/hello_world.png diff --git a/tests/qrcodes/hello_world_mirrored.png b/tests/samples/hello_world_mirrored.png similarity index 100% rename from tests/qrcodes/hello_world_mirrored.png rename to tests/samples/hello_world_mirrored.png diff --git a/tests/Output/samples/html b/tests/samples/html similarity index 100% rename from tests/Output/samples/html rename to tests/samples/html diff --git a/tests/Output/samples/imagick b/tests/samples/imagick similarity index 100% rename from tests/Output/samples/imagick rename to tests/samples/imagick diff --git a/tests/Output/samples/jpg b/tests/samples/jpg similarity index 100% rename from tests/Output/samples/jpg rename to tests/samples/jpg diff --git a/tests/Output/samples/json b/tests/samples/json similarity index 100% rename from tests/Output/samples/json rename to tests/samples/json diff --git a/tests/qrcodes/kanji.png b/tests/samples/kanji.png similarity index 100% rename from tests/qrcodes/kanji.png rename to tests/samples/kanji.png diff --git a/tests/qrcodes/numeric.png b/tests/samples/numeric.png similarity index 100% rename from tests/qrcodes/numeric.png rename to tests/samples/numeric.png diff --git a/tests/Output/samples/png b/tests/samples/png similarity index 100% rename from tests/Output/samples/png rename to tests/samples/png diff --git a/tests/qrcodes/rotated.png b/tests/samples/rotated.png similarity index 100% rename from tests/qrcodes/rotated.png rename to tests/samples/rotated.png diff --git a/tests/qrcodes/smol.png b/tests/samples/smol.png similarity index 100% rename from tests/qrcodes/smol.png rename to tests/samples/smol.png diff --git a/tests/Output/samples/svg b/tests/samples/svg similarity index 100% rename from tests/Output/samples/svg rename to tests/samples/svg diff --git a/tests/Output/samples/text b/tests/samples/text similarity index 100% rename from tests/Output/samples/text rename to tests/samples/text diff --git a/tests/qrcodes/tilted.png b/tests/samples/tilted.png similarity index 100% rename from tests/qrcodes/tilted.png rename to tests/samples/tilted.png