Skip to content

Commit 04401df

Browse files
committed
Update to phpunit 8.5
1 parent 833b6f7 commit 04401df

File tree

3 files changed

+23
-47
lines changed

3 files changed

+23
-47
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"php": ">=7.2.0"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit": "^5.3"
23+
"phpunit/phpunit": "^8.5"
2424
},
2525
"autoload": {
2626
"psr-4": {

phpunit.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
processIsolation="false"
99
stopOnError="false"
1010
stopOnFailure="false"
11-
syntaxCheck="true"
1211
verbose="true"
1312
>
1413
<testsuites>

tests/BarcodeTest.php

Lines changed: 22 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,85 @@
11
<?php
22

3-
class BarcodeTest extends PHPUnit_Framework_TestCase
3+
use PHPUnit\Framework\TestCase;
4+
5+
class BarcodeTest extends TestCase
46
{
5-
/**
6-
* @test
7-
*/
8-
public function png_barcode_generator_can_generate_code_128_barcode()
7+
public function test_png_barcode_generator_can_generate_code_128_barcode()
98
{
109
$generator = new Picqer\Barcode\BarcodeGeneratorPNG();
1110
$generated = $generator->getBarcode('081231723897', $generator::TYPE_CODE_128);
1211

1312
$this->assertEquals('PNG', substr($generated, 1, 3));
1413
}
1514

16-
/**
17-
* @test
18-
*/
19-
public function svg_barcode_generator_can_generate_ean_13_barcode()
15+
public function test_svg_barcode_generator_can_generate_ean_13_barcode()
2016
{
2117
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
2218
$generated = $generator->getBarcode('081231723897', $generator::TYPE_EAN_13);
2319

2420
$this->assertStringEqualsFile('tests/verified-files/081231723897-ean13.svg', $generated);
2521
}
2622

27-
/**
28-
* @test
29-
*/
30-
public function html_barcode_generator_can_generate_code_128_barcode()
23+
public function test_html_barcode_generator_can_generate_code_128_barcode()
3124
{
3225
$generator = new Picqer\Barcode\BarcodeGeneratorHTML();
3326
$generated = $generator->getBarcode('081231723897', $generator::TYPE_CODE_128);
3427

3528
$this->assertStringEqualsFile('tests/verified-files/081231723897-code128.html', $generated);
3629
}
3730

38-
/**
39-
* @test
40-
*/
41-
public function jpg_barcode_generator_can_generate_code_128_barcode()
31+
public function test_jpg_barcode_generator_can_generate_code_128_barcode()
4232
{
4333
$generator = new Picqer\Barcode\BarcodeGeneratorJPG();
44-
$generator->getBarcode('081231723897', $generator::TYPE_CODE_128);
34+
$result = $generator->getBarcode('081231723897', $generator::TYPE_CODE_128);
35+
36+
$this->assertGreaterThan(1000, strlen($result));
4537
}
4638

47-
/**
48-
* @test
49-
* @expectedException \Picqer\Barcode\Exceptions\InvalidCharacterException
50-
*/
51-
public function ean13_generator_throws_exception_if_invalid_chars_are_used()
39+
public function test_ean13_generator_throws_exception_if_invalid_chars_are_used()
5240
{
41+
$this->expectException(Picqer\Barcode\Exceptions\InvalidCharacterException::class);
42+
5343
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
5444
$generator->getBarcode('A123', $generator::TYPE_EAN_13);
5545
}
5646

57-
/**
58-
* @test
59-
*/
60-
public function ean13_generator_accepting_13_chars()
47+
public function test_ean13_generator_accepting_13_chars()
6148
{
6249
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
6350
$generated = $generator->getBarcode('0049000004632', $generator::TYPE_EAN_13);
6451

6552
$this->assertStringEqualsFile('tests/verified-files/0049000004632-ean13.svg', $generated);
6653
}
6754

68-
/**
69-
* @test
70-
*/
71-
public function ean13_generator_accepting_12_chars_and_generates_13th_check_digit()
55+
public function test_ean13_generator_accepting_12_chars_and_generates_13th_check_digit()
7256
{
7357
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
7458
$generated = $generator->getBarcode('004900000463', $generator::TYPE_EAN_13);
7559

7660
$this->assertStringEqualsFile('tests/verified-files/0049000004632-ean13.svg', $generated);
7761
}
7862

79-
/**
80-
* @test
81-
*/
82-
public function ean13_generator_accepting_11_chars_and_generates_13th_check_digit_and_adds_leading_zero()
63+
public function test_ean13_generator_accepting_11_chars_and_generates_13th_check_digit_and_adds_leading_zero()
8364
{
8465
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
8566
$generated = $generator->getBarcode('04900000463', $generator::TYPE_EAN_13);
8667

8768
$this->assertStringEqualsFile('tests/verified-files/0049000004632-ean13.svg', $generated);
8869
}
8970

90-
/**
91-
* @test
92-
* @expectedException \Picqer\Barcode\Exceptions\InvalidCheckDigitException
93-
*/
94-
public function ean13_generator_throws_exception_when_wrong_check_digit_is_given()
71+
public function test_ean13_generator_throws_exception_when_wrong_check_digit_is_given()
9572
{
73+
$this->expectException(Picqer\Barcode\Exceptions\InvalidCheckDigitException::class);
74+
9675
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
9776
$generator->getBarcode('0049000004633', $generator::TYPE_EAN_13);
9877
}
9978

100-
/**
101-
* @test
102-
* @expectedException \Picqer\Barcode\Exceptions\UnknownTypeException
103-
*/
104-
public function generator_throws_unknown_type_exceptions()
79+
public function test_generator_throws_unknown_type_exceptions()
10580
{
81+
$this->expectException(Picqer\Barcode\Exceptions\UnknownTypeException::class);
82+
10683
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
10784
$generator->getBarcode('0049000004633', 'vladimir');
10885
}

0 commit comments

Comments
 (0)