This commit is contained in:
codemasher
2018-12-17 07:12:57 +01:00
parent 3c8af1916d
commit 0abf25fef3
5 changed files with 13 additions and 25 deletions
+4 -4
View File
@@ -28,10 +28,10 @@ class BitBufferTest extends QRTestAbstract{
public function bitProvider(){
return [
[QRCode::DATA_NUMBER, 16],
[QRCode::DATA_ALPHANUM, 32],
[QRCode::DATA_BYTE, 64],
[QRCode::DATA_KANJI, 128],
'number' => [QRCode::DATA_NUMBER, 16],
'alphanum' => [QRCode::DATA_ALPHANUM, 32],
'byte' => [QRCode::DATA_BYTE, 64],
'kanji' => [QRCode::DATA_KANJI, 128],
];
}
+2 -2
View File
@@ -20,8 +20,8 @@ class QRMarkupTest extends QROutputTestAbstract{
public function types(){
return [
[QRCode::OUTPUT_MARKUP_HTML],
[QRCode::OUTPUT_MARKUP_SVG],
'html' => [QRCode::OUTPUT_MARKUP_HTML],
'svg' => [QRCode::OUTPUT_MARKUP_SVG],
];
}
+2 -2
View File
@@ -20,8 +20,8 @@ class QRStringTest extends QROutputTestAbstract{
public function types(){
return [
[QRCode::OUTPUT_STRING_JSON],
[QRCode::OUTPUT_STRING_TEXT],
'json' => [QRCode::OUTPUT_STRING_JSON],
'text' => [QRCode::OUTPUT_STRING_TEXT],
];
}
-8
View File
@@ -70,14 +70,6 @@ class QRCodeTest extends QRTestAbstract{
$this->assertContains($expected, $this->qrcode->render('test'));
}
/**
* @expectedException \chillerlan\QRCode\QRCodeException
* @expectedExceptionMessage Invalid error correct level: 42
*/
public function testSetOptionsException(){
new QROptions(['eccLevel' => 42]);
}
/**
* @expectedException \chillerlan\QRCode\Output\QRCodeOutputException
* @expectedExceptionMessage invalid output type
+5 -9
View File
@@ -26,7 +26,7 @@ class QROptionsTest extends TestCase{
$this->assertSame(40, (new QROptions(['version' => 42]))->version);
$this->assertSame(1, (new QROptions(['version' => -42]))->version);
$this->assertSame(21, (new QROptions(['version' => 21]))->version);
$this->assertSame(QRCode::VERSION_AUTO, (new QROptions(['version' => QRCode::VERSION_AUTO]))->version); // -1
$this->assertSame(QRCode::VERSION_AUTO, (new QROptions)->version); // QRCode::VERSION_AUTO = -1, default
}
public function testVersionMinMaxClamp(){
@@ -34,6 +34,7 @@ class QROptionsTest extends TestCase{
$o = new QROptions(['versionMin' => 5, 'versionMax' => 10]);
$this->assertSame(5, $o->versionMin);
$this->assertSame(10, $o->versionMax);
// exceeding values
$o = new QROptions(['versionMin' => -42, 'versionMax' => 42]);
$this->assertSame(1, $o->versionMin);
@@ -50,14 +51,9 @@ class QROptionsTest extends TestCase{
}
public function testMaskPatternClamp(){
$o = new QROptions(['maskPattern' => 42]);
$this->assertSame(7, $o->maskPattern);
$o = new QROptions(['maskPattern' => -42]);
$this->assertSame(0, $o->maskPattern);
$o = new QROptions(['maskPattern' => QRCode::MASK_PATTERN_AUTO]); // -1
$this->assertSame(QRCode::MASK_PATTERN_AUTO, $o->maskPattern);
$this->assertSame(7, (new QROptions(['maskPattern' => 42]))->maskPattern);
$this->assertSame(0, (new QROptions(['maskPattern' => -42]))->maskPattern);
$this->assertSame(QRCode::MASK_PATTERN_AUTO, (new QROptions)->maskPattern); // QRCode::MASK_PATTERN_AUTO = -1, default
}
/**