mcndave/spout
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring tests

Browse Source
This commit is contained in:
Gabriel Caruso authored and Adrien Loison committed 2017-12-15 10:09:18 +01:00
1 parent 9f4e28b3fd
commit 4c7adbb33f
16 files changed
+52 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Spout/Reader/ODS/ReaderTest.php
+4 -4
View File
@@ -64,9 +64,9 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile($resourceName);
$this->assertEquals($expectedNumOfRows, count($allRows), "There should be $expectedNumOfRows rows");
$this->assertCount($expectedNumOfRows, $allRows, "There should be $expectedNumOfRows rows");
foreach ($allRows as $row) {
$this->assertEquals($expectedNumOfCellsPerRow, count($row), "There should be $expectedNumOfCellsPerRow cells for every row");
$this->assertCount($expectedNumOfCellsPerRow, $row, "There should be $expectedNumOfCellsPerRow cells for every row");
}
}
@@ -228,7 +228,7 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile('sheet_with_empty_rows.ods');
$this->assertEquals(3, count($allRows), 'There should be only 3 rows, because the empty rows are skipped');
$this->assertCount(3, $allRows, 'There should be only 3 rows, because the empty rows are skipped');
$expectedRows = [
// skipped row here
@@ -248,7 +248,7 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile('sheet_with_empty_rows.ods', false, true);
$this->assertEquals(6, count($allRows), 'There should be 6 rows');
$this->assertCount(6, $allRows, 'There should be 6 rows');
$expectedRows = [
[''],
tests/Spout/Reader/Wrapper/XMLReaderTest.php
+3 -3
View File
@@ -25,7 +25,7 @@ class XMLReaderTest extends TestCase
// using "@" to prevent errors/warning to be displayed
$wasOpenSuccessful = @$xmlReader->openFileInZip($resourcePath, 'path/to/fake/file.xml');
$this->assertTrue($wasOpenSuccessful === false);
$this->assertFalse($wasOpenSuccessful);
}
/**
@@ -47,8 +47,8 @@ class XMLReaderTest extends TestCase
// using the built-in XMLReader
$xmlReader = new \XMLReader();
$this->assertTrue($xmlReader->open($nonExistingXMLFilePath) !== false);
$this->assertTrue(libxml_get_last_error() === false);
$this->assertNotFalse($xmlReader->open($nonExistingXMLFilePath));
$this->assertFalse(libxml_get_last_error());
libxml_use_internal_errors($initialUseInternalErrorsSetting);
}
tests/Spout/Reader/XLSX/ReaderTest.php
+12 -12
View File
@@ -67,9 +67,9 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile($resourceName);
$this->assertEquals($expectedNumOfRows, count($allRows), "There should be $expectedNumOfRows rows");
$this->assertCount($expectedNumOfRows, $allRows, "There should be $expectedNumOfRows rows");
foreach ($allRows as $row) {
$this->assertEquals($expectedNumOfCellsPerRow, count($row), "There should be $expectedNumOfCellsPerRow cells for every row");
$this->assertCount($expectedNumOfCellsPerRow, $row, "There should be $expectedNumOfCellsPerRow cells for every row");
}
}
@@ -373,9 +373,9 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile('sheet_without_dimensions_but_spans_and_empty_cells.xlsx');
$this->assertEquals(2, count($allRows), 'There should be 2 rows');
$this->assertCount(2, $allRows, 'There should be 2 rows');
foreach ($allRows as $row) {
$this->assertEquals(5, count($row), 'There should be 5 cells for every row, because empty rows should be preserved');
$this->assertCount(5, $row, 'There should be 5 cells for every row, because empty rows should be preserved');
}
$expectedRows = [
@@ -392,9 +392,9 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile('sheet_without_dimensions_and_empty_cells.xlsx');
$this->assertEquals(2, count($allRows), 'There should be 2 rows');
$this->assertEquals(5, count($allRows[0]), 'There should be 5 cells in the first row');
$this->assertEquals(3, count($allRows[1]), 'There should be only 3 cells in the second row, because empty rows at the end should be skip');
$this->assertCount(2, $allRows, 'There should be 2 rows');
$this->assertCount(5, $allRows[0], 'There should be 5 cells in the first row');
$this->assertCount(3, $allRows[1], 'There should be only 3 cells in the second row, because empty rows at the end should be skip');
$expectedRows = [
['s1--A1', 's1--B1', 's1--C1', 's1--D1', 's1--E1'],
@@ -410,9 +410,9 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile('sheet_without_dimensions_and_empty_cells.xlsx');
$this->assertEquals(2, count($allRows), 'There should be 2 rows');
$this->assertEquals(5, count($allRows[0]), 'There should be 5 cells in the first row');
$this->assertEquals(3, count($allRows[1]), 'There should be only 3 cells in the second row, because empty rows at the end should be skip');
$this->assertCount(2, $allRows, 'There should be 2 rows');
$this->assertCount(5, $allRows[0], 'There should be 5 cells in the first row');
$this->assertCount(3, $allRows[1], 'There should be only 3 cells in the second row, because empty rows at the end should be skip');
$expectedRows = [
['s1--A1', 's1--B1', 's1--C1', 's1--D1', 's1--E1'],
@@ -428,7 +428,7 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile('sheet_with_empty_rows_and_missing_row_index.xlsx');
$this->assertEquals(3, count($allRows), 'There should be only 3 rows, because the empty rows are skipped');
$this->assertCount(3, $allRows, 'There should be only 3 rows, because the empty rows are skipped');
$expectedRows = [
// skipped row here
@@ -448,7 +448,7 @@ class ReaderTest extends TestCase
{
$allRows = $this->getAllRowsForFile('sheet_with_empty_rows_and_missing_row_index.xlsx', false, true);
$this->assertEquals(6, count($allRows), 'There should be 6 rows');
$this->assertCount(6, $allRows, 'There should be 6 rows');
$expectedRows = [
[],