Skip to content

Commit e2b4349

Browse files
tintnaingwintintnaingwin
committed
chore:improve tests
1 parent d6017ea commit e2b4349

10 files changed

+98
-122
lines changed

‎phpunit.xml.dist

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,26 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
55
backupGlobals="false"
6-
backupStaticAttributes="false"
76
bootstrap="vendor/autoload.php"
87
colors="true"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
128
processIsolation="false"
139
stopOnFailure="false"
1410
executionOrder="random"
1511
failOnWarning="true"
1612
failOnRisky="true"
1713
failOnEmptyTestSuite="true"
1814
beStrictAboutOutputDuringTests="true"
19-
verbose="true"
2015
>
2116
<testsuites>
2217
<testsuite name="Genie Fintech Test Suite">
2318
<directory>./tests/</directory>
2419
</testsuite>
2520
</testsuites>
26-
<coverage>
21+
<source>
2722
<include>
2823
<directory suffix=".php">./src</directory>
2924
</include>
30-
<report>
31-
<html outputDirectory="build/coverage"/>
32-
<text outputFile="build/coverage.txt"/>
33-
<clover outputFile="build/logs/clover.xml"/>
34-
</report>
35-
</coverage>
25+
</source>
3626
<logging>
3727
<junit outputFile="build/report.junit.xml"/>
3828
</logging>

‎tests/BarcodeDynamicHtmlTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
->type(Type::TYPE_CODE_128)
1010
->generate('081231723897');
1111

12-
$this->assertStringEqualsFile('tests/verified-files/081231723897-dynamic-code128.html', $generated);
12+
expect($generated)->toBe(file_get_contents('tests/verified-files/081231723897-dynamic-code128.html'));
1313
});
1414

1515
it('can generate imb barcode to test heights', function () {
@@ -18,5 +18,5 @@
1818
->type(Type::TYPE_IMB)
1919
->generate('12345678903');
2020

21-
$this->assertStringEqualsFile('tests/verified-files/12345678903-dynamic-imb.html', $generated);
21+
expect($generated)->toBe(file_get_contents('tests/verified-files/12345678903-dynamic-imb.html'));
2222
});

‎tests/BarcodeHtmlTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
use AgeekDev\Barcode\Enums\Type;
44
use AgeekDev\Barcode\Facades\Barcode;
55

6-
it('html_barcode_generator_can_generate_code_128_barcode', function () {
6+
it('html barcode generator can generate code 128 barcode', function () {
77
$generated = Barcode::imageType('html')
88
->foregroundColor('black')
99
->widthFactor(2)
1010
->height(30)
1111
->type(Type::TYPE_CODE_128)
1212
->generate('081231723897');
1313

14-
$this->assertStringEqualsFile('tests/verified-files/081231723897-code128.html', $generated);
14+
expect($generated)->toBe(file_get_contents('tests/verified-files/081231723897-code128.html'));
1515
});
1616

17-
it('html_barcode_generator_can_generate_imb_barcode_to_test_heights', function () {
17+
it('html barcode generator can generate imb barcode to test heights', function () {
1818
$generated = Barcode::imageType('html')
1919
->foregroundColor('black')
2020
->widthFactor(2)
2121
->height(30)
2222
->type(Type::TYPE_IMB)
2323
->generate('12345678903');
2424

25-
$this->assertStringEqualsFile('tests/verified-files/12345678903-imb.html', $generated);
25+
expect($generated)->toBe(file_get_contents('tests/verified-files/12345678903-imb.html'));
2626
});

‎tests/BarcodeJpgTest.php

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
$imageInfo = getimagesizefromstring($result);
1616

17-
$this->assertGreaterThan(100, strlen($result));
18-
$this->assertEquals(202, $imageInfo[0]); // Image width
19-
$this->assertEquals(30, $imageInfo[1]); // Image height
20-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
17+
expect(strlen($result))->toBeGreaterThan(100)
18+
->and($imageInfo[0])->toEqual(202)
19+
->and($imageInfo[1])->toEqual(30)
20+
->and($imageInfo['mime'])->toEqual('image/jpeg');
2121
});
2222

2323
it('can generate code 39 barcode', function () {
@@ -30,10 +30,10 @@
3030

3131
$imageInfo = getimagesizefromstring($result);
3232

33-
$this->assertGreaterThan(100, strlen($result));
34-
$this->assertEquals(224, $imageInfo[0]); // Image width
35-
$this->assertEquals(30, $imageInfo[1]); // Image height
36-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
33+
expect(strlen($result))->toBeGreaterThan(100)
34+
->and($imageInfo[0])->toEqual(224)
35+
->and($imageInfo[1])->toEqual(30)
36+
->and($imageInfo['mime'])->toEqual('image/jpeg');
3737
});
3838

3939
it('can use different height', function () {
@@ -47,10 +47,10 @@
4747

4848
$imageInfo = getimagesizefromstring($result);
4949

50-
$this->assertGreaterThan(100, strlen($result));
51-
$this->assertEquals(202, $imageInfo[0]); // Image width
52-
$this->assertEquals(45, $imageInfo[1]); // Image height
53-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
50+
expect(strlen($result))->toBeGreaterThan(100)
51+
->and($imageInfo[0])->toEqual(202)
52+
->and($imageInfo[1])->toEqual(45)
53+
->and($imageInfo['mime'])->toEqual('image/jpeg');
5454
});
5555

5656
it('can use different width factor', function () {
@@ -63,13 +63,11 @@
6363

6464
$imageInfo = getimagesizefromstring($result);
6565

66-
$this->assertGreaterThan(100, strlen($result));
67-
$this->assertEquals(505, $imageInfo[0]); // Image width
68-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
66+
expect(strlen($result))->toBeGreaterThan(100)
67+
->and($imageInfo[0])->toEqual(505)
68+
->and($imageInfo['mime'])->toEqual('image/jpeg');
6969
});
7070

71-
// Copied as Imagick
72-
7371
it('can generate code 128 barcode imagick', function () {
7472
if (! extension_loaded('imagick')) {
7573
$this->markTestSkipped();
@@ -83,10 +81,10 @@
8381

8482
$imageInfo = getimagesizefromstring($result);
8583

86-
$this->assertGreaterThan(100, strlen($result));
87-
$this->assertEquals(202, $imageInfo[0]); // Image width
88-
$this->assertEquals(30, $imageInfo[1]); // Image height
89-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
84+
expect(strlen($result))->toBeGreaterThan(100)
85+
->and($imageInfo[0])->toEqual(202)
86+
->and($imageInfo[1])->toEqual(30)
87+
->and($imageInfo['mime'])->toEqual('image/jpeg');
9088
});
9189

9290
it('can generate code 39 barcode imagick', function () {
@@ -103,10 +101,10 @@
103101

104102
$imageInfo = getimagesizefromstring($result);
105103

106-
$this->assertGreaterThan(100, strlen($result));
107-
$this->assertEquals(224, $imageInfo[0]); // Image width
108-
$this->assertEquals(30, $imageInfo[1]); // Image height
109-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
104+
expect(strlen($result))->toBeGreaterThan(100)
105+
->and($imageInfo[0])->toEqual(224)
106+
->and($imageInfo[1])->toEqual(30)
107+
->and($imageInfo['mime'])->toEqual('image/jpeg');
110108
});
111109

112110
it('can use different height imagick', function () {
@@ -124,10 +122,10 @@
124122

125123
$imageInfo = getimagesizefromstring($result);
126124

127-
$this->assertGreaterThan(100, strlen($result));
128-
$this->assertEquals(202, $imageInfo[0]); // Image width
129-
$this->assertEquals(45, $imageInfo[1]); // Image height
130-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
125+
expect(strlen($result))->toBeGreaterThan(100)
126+
->and($imageInfo[0])->toEqual(202)
127+
->and($imageInfo[1])->toEqual(45)
128+
->and($imageInfo['mime'])->toEqual('image/jpeg');
131129
});
132130

133131
it('can use different width factor imagick', function () {
@@ -144,7 +142,7 @@
144142

145143
$imageInfo = getimagesizefromstring($result);
146144

147-
$this->assertGreaterThan(100, strlen($result));
148-
$this->assertEquals(505, $imageInfo[0]); // Image width
149-
$this->assertEquals('image/jpeg', $imageInfo['mime']);
145+
expect(strlen($result))->toBeGreaterThan(100)
146+
->and($imageInfo[0])->toEqual(505)
147+
->and($imageInfo['mime'])->toEqual('image/jpeg');
150148
});

‎tests/BarcodePngTest.php

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
->type(Type::TYPE_CODE_128)
1212
->generate('081231723897');
1313

14-
$this->assertEquals('PNG', substr($generated, 1, 3));
14+
expect(substr($generated, 1, 3))->toBe('PNG');
1515
});
1616

1717
it('can generate code 39 barcode', function () {
@@ -21,10 +21,10 @@
2121

2222
$imageInfo = getimagesizefromstring($result);
2323

24-
$this->assertGreaterThan(100, strlen($result));
25-
$this->assertEquals(224, $imageInfo[0]); // Image width
26-
$this->assertEquals(30, $imageInfo[1]); // Image height
27-
$this->assertEquals('image/png', $imageInfo['mime']);
24+
expect(strlen($result))->toBeGreaterThan(100)
25+
->and($imageInfo[0])->toEqual(224)
26+
->and($imageInfo[1])->toEqual(30)
27+
->and($imageInfo['mime'])->toEqual('image/png');
2828
});
2929

3030
it('can use different height', function () {
@@ -34,10 +34,10 @@
3434

3535
$imageInfo = getimagesizefromstring($result);
3636

37-
$this->assertGreaterThan(100, strlen($result));
38-
$this->assertEquals(202, $imageInfo[0]); // Image width
39-
$this->assertEquals(45, $imageInfo[1]); // Image height
40-
$this->assertEquals('image/png', $imageInfo['mime']);
37+
expect(strlen($result))->toBeGreaterThan(100)
38+
->and($imageInfo[0])->toEqual(202)
39+
->and($imageInfo[1])->toEqual(45)
40+
->and($imageInfo['mime'])->toEqual('image/png');
4141
});
4242

4343
it('can use different width factor', function () {
@@ -48,9 +48,10 @@
4848

4949
$imageInfo = getimagesizefromstring($result);
5050

51-
$this->assertGreaterThan(100, strlen($result));
52-
$this->assertEquals(505, $imageInfo[0]); // Image width
53-
$this->assertEquals('image/png', $imageInfo['mime']);
51+
expect(strlen($result))->toBeGreaterThan(100)
52+
->and($imageInfo[0])->toEqual(505)
53+
->and($imageInfo['mime'])->toEqual('image/png');
54+
5455
});
5556

5657
it('can generate code 128 barcode imagick', function () {
@@ -63,7 +64,7 @@
6364
->useImagick()
6465
->generate('081231723897');
6566

66-
$this->assertEquals('PNG', substr($generated, 1, 3));
67+
expect(substr($generated, 1, 3))->toBe('PNG');
6768
});
6869

6970
it('can generate code 39 barcode imagick', function () {
@@ -80,10 +81,10 @@
8081

8182
$imageInfo = getimagesizefromstring($result);
8283

83-
$this->assertGreaterThan(100, strlen($result));
84-
$this->assertEquals(224, $imageInfo[0]); // Image width
85-
$this->assertEquals(30, $imageInfo[1]); // Image height
86-
$this->assertEquals('image/png', $imageInfo['mime']);
84+
expect(strlen($result))->toBeGreaterThan(100)
85+
->and($imageInfo[0])->toEqual(224)
86+
->and($imageInfo[1])->toEqual(30)
87+
->and($imageInfo['mime'])->toEqual('image/png');
8788
});
8889

8990
it('can use different height imagick', function () {
@@ -101,10 +102,10 @@
101102

102103
$imageInfo = getimagesizefromstring($result);
103104

104-
$this->assertGreaterThan(100, strlen($result));
105-
$this->assertEquals(202, $imageInfo[0]); // Image width
106-
$this->assertEquals(45, $imageInfo[1]); // Image height
107-
$this->assertEquals('image/png', $imageInfo['mime']);
105+
expect(strlen($result))->toBeGreaterThan(100)
106+
->and($imageInfo[0])->toEqual(202)
107+
->and($imageInfo[1])->toEqual(45)
108+
->and($imageInfo['mime'])->toEqual('image/png');
108109
});
109110

110111
it('can use different width factor imagick', function () {
@@ -121,7 +122,7 @@
121122

122123
$imageInfo = getimagesizefromstring($result);
123124

124-
$this->assertGreaterThan(100, strlen($result));
125-
$this->assertEquals(505, $imageInfo[0]); // Image width
126-
$this->assertEquals('image/png', $imageInfo['mime']);
125+
expect(strlen($result))->toBeGreaterThan(100)
126+
->and($imageInfo[0])->toEqual(505)
127+
->and($imageInfo['mime'])->toEqual('image/png');
127128
});

‎tests/BarcodeSvgTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
->type(Type::TYPE_EAN_13)
1212
->generate('081231723897');
1313

14-
$this->assertStringEqualsFile('tests/verified-files/081231723897-ean13.svg', $generated);
14+
expect($generated)->toBe(file_get_contents('tests/verified-files/081231723897-ean13.svg'));
1515
});

‎tests/GeneratorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
->type(Type::TYPE_EAN_13)
4242
->generate('0049000004632');
4343

44-
$this->assertStringEqualsFile('tests/verified-files/0049000004632-ean13.svg', $generated);
44+
expect($generated)->toBe(file_get_contents('tests/verified-files/0049000004632-ean13.svg'));
4545
});
4646

4747
it('ean 13 generator accepting 12 chars and generates 13 th check digit', function () {
@@ -52,7 +52,7 @@
5252
->type(Type::TYPE_EAN_13)
5353
->generate('004900000463');
5454

55-
$this->assertStringEqualsFile('tests/verified-files/0049000004632-ean13.svg', $generated);
55+
expect($generated)->toBe(file_get_contents('tests/verified-files/0049000004632-ean13.svg'));
5656
});
5757

5858
it('ean 13 generator accepting 11 chars and generates 13 th check digit and adds leading zero', function () {
@@ -63,7 +63,7 @@
6363
->type(Type::TYPE_EAN_13)
6464
->generate('04900000463');
6565

66-
$this->assertStringEqualsFile('tests/verified-files/0049000004632-ean13.svg', $generated);
66+
expect($generated)->toBe(file_get_contents('tests/verified-files/0049000004632-ean13.svg'));
6767
});
6868

6969
it('ean 13 generator throws exception when wrong check digit is given', function () {

‎tests/PharmacodeTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@
22

33
it('validation triggered when generating zero code', function () {
44
$pharmacode = new AgeekDev\Barcode\Types\TypePharmacodeTwoCode();
5-
6-
$this->expectException(AgeekDev\Barcode\Exceptions\InvalidLengthException::class);
7-
85
$pharmacode->getBarcodeData('0');
9-
});
6+
})->throws(AgeekDev\Barcode\Exceptions\InvalidLengthException::class);

‎tests/TestCase.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,10 @@
77

88
class TestCase extends Orchestra
99
{
10-
protected function setUp(): void
11-
{
12-
parent::setUp();
13-
}
14-
15-
protected function getPackageProviders($app)
10+
protected function getPackageProviders($app): array
1611
{
1712
return [
1813
BarcodeServiceProvider::class,
1914
];
2015
}
21-
22-
public function getEnvironmentSetUp($app)
23-
{
24-
config()->set('database.default', 'testing');
25-
}
2616
}

0 commit comments

Comments
 (0)