|
6 | 6 |
|
7 | 7 | use PhpOffice\PhpSpreadsheet\Exception;
|
8 | 8 | use PhpOffice\PhpSpreadsheet\Helper\Dimension;
|
| 9 | +use PhpOffice\PhpSpreadsheet\Helper\Size; |
| 10 | +use PHPUnit\Framework\Attributes\DataProvider; |
9 | 11 | use PHPUnit\Framework\TestCase;
|
10 | 12 |
|
11 | 13 | class DimensionTest extends TestCase
|
12 | 14 | {
|
13 |
| - #[\PHPUnit\Framework\Attributes\DataProvider('providerCellWidth')] |
| 15 | + #[DataProvider('providerCellWidth')] |
14 | 16 | public function testCreateDimension(float $expectedResult, string $dimension): void
|
15 | 17 | {
|
16 | 18 | $result = (new Dimension($dimension))->width();
|
17 | 19 | self::assertSame($expectedResult, $result);
|
18 | 20 | }
|
19 | 21 |
|
20 |
| - #[\PHPUnit\Framework\Attributes\DataProvider('providerConvertUoM')] |
| 22 | + #[DataProvider('providerConvertUoM')] |
21 | 23 | public function testConvertDimension(float $expectedResult, string $dimension, string $unitOfMeasure): void
|
22 | 24 | {
|
23 | 25 | $result = (new Dimension($dimension))->toUnit($unitOfMeasure);
|
24 | 26 | self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
|
25 | 27 | }
|
26 | 28 |
|
| 29 | + public function testSizeAndUnit(): void |
| 30 | + { |
| 31 | + $size = new Size('10px'); |
| 32 | + self::assertTrue($size->valid()); |
| 33 | + self::assertSame('10', $size->size()); |
| 34 | + self::assertSame('px', $size->unit()); |
| 35 | + $size = new Size('9.3'); |
| 36 | + self::assertTrue($size->valid()); |
| 37 | + self::assertSame('9.3', $size->size()); |
| 38 | + self::assertSame('pt', $size->unit()); |
| 39 | + $size = new Size('8whatever'); |
| 40 | + self::assertFalse($size->valid()); |
| 41 | + } |
| 42 | + |
27 | 43 | public function testConvertDimensionInvalidUoM(): void
|
28 | 44 | {
|
29 | 45 | $this->expectException(Exception::class);
|
|
0 commit comments