codemasher 4 лет назад
Родитель
Сommit
857dd519ff

+ 1 - 1
tests/Output/QRFpdfTest.php

@@ -78,7 +78,7 @@ class QRFpdfTest extends QROutputTestAbstract{
 		$this->options->imageBase64 = false;
 		$this->options->imageBase64 = false;
 
 
 		// substr() to avoid CreationDate
 		// 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);
 		$actual   = substr((new QRCode($this->options))->render('test'), 0, 2500);
 
 
 		$this::assertSame($expected, $actual);
 		$this::assertSame($expected, $actual);

+ 1 - 1
tests/Output/QROutputTestAbstract.php

@@ -128,7 +128,7 @@ abstract class QROutputTestAbstract extends TestCase{
 		$this->options->outputType = $type;
 		$this->options->outputType = $type;
 
 
 		$this::assertSame(
 		$this::assertSame(
-			trim(file_get_contents(__DIR__.'/samples/'.$type)),
+			trim(file_get_contents(__DIR__.'/../samples/'.$type)),
 			trim((new QRCode($this->options))->render('test'))
 			trim((new QRCode($this->options))->render('test'))
 		);
 		);
 	}
 	}

+ 1 - 1
tests/Output/QRStringTest.php

@@ -68,7 +68,7 @@ class QRStringTest extends QROutputTestAbstract{
 		$this->options->outputInterface = MyCustomOutput::class;
 		$this->options->outputInterface = MyCustomOutput::class;
 
 
 		$this::assertSame(
 		$this::assertSame(
-			file_get_contents(__DIR__.'/samples/custom'),
+			file_get_contents(__DIR__.'/../samples/custom'),
 			(new QRCode($this->options))->render('test')
 			(new QRCode($this->options))->render('test')
 		);
 		);
 	}
 	}

+ 2 - 2
tests/QRCodeReaderTest.php

@@ -76,7 +76,7 @@ class QRCodeReaderTest extends TestCase{
 		}
 		}
 
 
 		$this::assertSame($expected, (string)(new QRCode)
 		$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)
 		$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{
 	public function testReaderMultiSegment():void{

+ 0 - 0
tests/qrcodes/alphanum.png → tests/samples/alphanum.png


+ 0 - 0
tests/qrcodes/byte.png → tests/samples/byte.png


+ 0 - 0
tests/Output/samples/custom → tests/samples/custom


+ 0 - 0
tests/qrcodes/damaged.png → tests/samples/damaged.png


+ 0 - 0
tests/qrcodes/example_svg.png → tests/samples/example_svg.png


+ 0 - 0
tests/qrcodes/example_svg_dots.png → tests/samples/example_svg_dots.png


+ 0 - 0
tests/Output/samples/fpdf → tests/samples/fpdf


+ 0 - 0
tests/Output/samples/gif → tests/samples/gif


+ 0 - 0
tests/qrcodes/hello_world.png → tests/samples/hello_world.png


+ 0 - 0
tests/qrcodes/hello_world_mirrored.png → tests/samples/hello_world_mirrored.png


+ 0 - 0
tests/Output/samples/html → tests/samples/html


+ 0 - 0
tests/Output/samples/imagick → tests/samples/imagick


+ 0 - 0
tests/Output/samples/jpg → tests/samples/jpg


+ 0 - 0
tests/Output/samples/json → tests/samples/json


+ 0 - 0
tests/qrcodes/kanji.png → tests/samples/kanji.png


+ 0 - 0
tests/qrcodes/numeric.png → tests/samples/numeric.png


+ 0 - 0
tests/Output/samples/png → tests/samples/png


+ 0 - 0
tests/qrcodes/rotated.png → tests/samples/rotated.png


+ 0 - 0
tests/qrcodes/smol.png → tests/samples/smol.png


+ 0 - 0
tests/Output/samples/svg → tests/samples/svg


+ 0 - 0
tests/Output/samples/text → tests/samples/text


+ 0 - 0
tests/qrcodes/tilted.png → tests/samples/tilted.png