Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2171 from oleibman/xlsxtest2 

Move Reader Xlsx Tests from Reader to Reader/Xlsx Try 2
This commit is contained in:
oleibman 2021-06-18 07:42:47 -07:00 committed by GitHub
parent 16d0075640 83c0f02c95
commit 33ef03d1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpstan-baseline.neon
View File

@ -7205,16 +7205,6 @@ parameters:
count: 1 count: 1
path: tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php path: tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
-
message: "#^Function PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\getTitleText\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/PhpSpreadsheetTests/Reader/Xlsx/ChartsTitleTest.php
-
message: "#^Function PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\getTitleText\\(\\) has parameter \\$title with no typehint specified\\.$#"
count: 1
path: tests/PhpSpreadsheetTests/Reader/Xlsx/ChartsTitleTest.php
- -
message: "#^Cannot call method setMinimumConditionalFormatValueObject\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#" message: "#^Cannot call method setMinimumConditionalFormatValueObject\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#"
count: 1 count: 1
@ -7245,11 +7235,6 @@ parameters:
count: 1 count: 1
path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\XlsxTest\\:\\:testStripsWhiteSpaceFromStyleString\\(\\) has parameter \\$string with no typehint specified\\.$#"
count: 1
path: tests/PhpSpreadsheetTests/Reader/XlsxTest.php
- -
message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Xml\\\\XmlTest\\:\\:testInvalidSimpleXML\\(\\) has parameter \\$filename with no typehint specified\\.$#" message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Xml\\\\XmlTest\\:\\:testInvalidSimpleXML\\(\\) has parameter \\$filename with no typehint specified\\.$#"
count: 1 count: 1

43
tests/PhpSpreadsheetTests/Reader/Xlsx/ChartsTitleTest.php
View File

@ -1,23 +1,24 @@
<?php <?php
namespace PhpOffice\PhpSpreadsheetTests\Reader; namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\Chart\Title;
use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\IOFactory;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
function getTitleText($title) class ChartsTitleTest extends TestCase
{ {
if (null === $title || null === $title->getCaption()) { private static function getTitleText(?Title $title): ?string
{
if (null === $title || empty($title->getCaption())) {
return null; return null;
} }
return implode("\n", array_map(function ($rt) { return implode("\n", array_map(function ($rt) {
return $rt->getPlainText(); return $rt->getPlainText();
}, $title->getCaption())); }, $title->getCaption())); // @phpstan-ignore-line
} }
class ChartsTitleTest extends TestCase
{
public function testChartTitles(): void public function testChartTitles(): void
{ {
$filename = 'tests/data/Reader/XLSX/excelChartsTest.xlsx'; $filename = 'tests/data/Reader/XLSX/excelChartsTest.xlsx';
@ -31,34 +32,34 @@ class ChartsTitleTest extends TestCase
// No title or axis labels // No title or axis labels
$chart1 = $charts[0]; $chart1 = $charts[0];
$title = getTitleText($chart1->getTitle()); $title = self::getTitleText($chart1->getTitle());
self::assertEmpty($title); self::assertEmpty($title);
self::assertEmpty(getTitleText($chart1->getXAxisLabel())); self::assertEmpty(self::getTitleText($chart1->getXAxisLabel()));
self::assertEmpty(getTitleText($chart1->getYAxisLabel())); self::assertEmpty(self::getTitleText($chart1->getYAxisLabel()));
// Title, no axis labels // Title, no axis labels
$chart2 = $charts[1]; $chart2 = $charts[1];
self::assertEquals('Chart with Title and no Axis Labels', getTitleText($chart2->getTitle())); self::assertEquals('Chart with Title and no Axis Labels', self::getTitleText($chart2->getTitle()));
self::assertEmpty(getTitleText($chart2->getXAxisLabel())); self::assertEmpty(self::getTitleText($chart2->getXAxisLabel()));
self::assertEmpty(getTitleText($chart2->getYAxisLabel())); self::assertEmpty(self::getTitleText($chart2->getYAxisLabel()));
// No title, only horizontal axis label // No title, only horizontal axis label
$chart3 = $charts[2]; $chart3 = $charts[2];
self::assertEmpty(getTitleText($chart3->getTitle())); self::assertEmpty(self::getTitleText($chart3->getTitle()));
self::assertEquals('Horizontal Axis Title Only', getTitleText($chart3->getXAxisLabel())); self::assertEquals('Horizontal Axis Title Only', self::getTitleText($chart3->getXAxisLabel()));
self::assertEmpty(getTitleText($chart3->getYAxisLabel())); self::assertEmpty(self::getTitleText($chart3->getYAxisLabel()));
// No title, only vertical axis label // No title, only vertical axis label
$chart4 = $charts[3]; $chart4 = $charts[3];
self::assertEmpty(getTitleText($chart4->getTitle())); self::assertEmpty(self::getTitleText($chart4->getTitle()));
self::assertEquals('Vertical Axis Title Only', getTitleText($chart4->getYAxisLabel())); self::assertEquals('Vertical Axis Title Only', self::getTitleText($chart4->getYAxisLabel()));
self::assertEmpty(getTitleText($chart4->getXAxisLabel())); self::assertEmpty(self::getTitleText($chart4->getXAxisLabel()));
// Title and both axis labels // Title and both axis labels
$chart5 = $charts[4]; $chart5 = $charts[4];
self::assertEquals('Complete Annotations', getTitleText($chart5->getTitle())); self::assertEquals('Complete Annotations', self::getTitleText($chart5->getTitle()));
self::assertEquals('Horizontal Axis Title', getTitleText($chart5->getXAxisLabel())); self::assertEquals('Horizontal Axis Title', self::getTitleText($chart5->getXAxisLabel()));
self::assertEquals('Vertical Axis Title', getTitleText($chart5->getYAxisLabel())); self::assertEquals('Vertical Axis Title', self::getTitleText($chart5->getYAxisLabel()));
} }
} }

2
tests/PhpSpreadsheetTests/Reader/CondNumFmtTest.php → tests/PhpSpreadsheetTests/Reader/Xlsx/CondNumFmtTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpOffice\PhpSpreadsheetTests\Reader; namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx; use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\Style\Conditional; use PhpOffice\PhpSpreadsheet\Style\Conditional;

2
tests/PhpSpreadsheetTests/Reader/OddColumnReadFilter.php → tests/PhpSpreadsheetTests/Reader/Xlsx/OddColumnReadFilter.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpOffice\PhpSpreadsheetTests\Reader; namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\Reader\IReadFilter; use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;

2
tests/PhpSpreadsheetTests/Reader/SheetsXlsxChartTest.php → tests/PhpSpreadsheetTests/Reader/Xlsx/SheetsXlsxChartTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpOffice\PhpSpreadsheetTests\Reader; namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\Chart\DataSeries; use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\IOFactory;

2
tests/PhpSpreadsheetTests/Reader/Xlsx2Test.php → tests/PhpSpreadsheetTests/Reader/Xlsx/Xlsx2Test.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpOffice\PhpSpreadsheetTests\Reader; namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\IOFactory;
use PhpOffice\PhpSpreadsheet\Shared\File; use PhpOffice\PhpSpreadsheet\Shared\File;

4
tests/PhpSpreadsheetTests/Reader/XlsxTest.php → tests/PhpSpreadsheetTests/Reader/Xlsx/XlsxTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace PhpOffice\PhpSpreadsheetTests\Reader; namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use PhpOffice\PhpSpreadsheet\Cell\DataValidation; use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
@ -237,7 +237,7 @@ class XlsxTest extends TestCase
* *
* @dataProvider providerStripsWhiteSpaceFromStyleString * @dataProvider providerStripsWhiteSpaceFromStyleString
*/ */
public function testStripsWhiteSpaceFromStyleString($string): void public function testStripsWhiteSpaceFromStyleString(string $string): void
{ {
$string = Xlsx::stripWhiteSpaceFromStyleString($string); $string = Xlsx::stripWhiteSpaceFromStyleString($string);
self::assertEquals(preg_match('/\s/', $string), 0); self::assertEquals(preg_match('/\s/', $string), 0);