From 01ad5af2c5f302e60731739ca9be1d6994be2e93 Mon Sep 17 00:00:00 2001 From: madflow Date: Fri, 23 Mar 2018 18:29:58 +0100 Subject: [PATCH] fix risky tests and assert true for silent tests --- .../Spout/Common/Entity/Style/BorderTest.php | 1 + tests/Spout/Reader/Wrapper/XMLReaderTest.php | 2 ++ tests/Spout/Writer/CSV/WriterTest.php | 1 + .../Spout/Writer/Common/Entity/SheetTest.php | 2 ++ tests/Spout/Writer/ODS/WriterTest.php | 25 +++++++------- tests/Spout/Writer/XLSX/WriterTest.php | 33 ++++++++++--------- 6 files changed, 36 insertions(+), 28 deletions(-) diff --git a/tests/Spout/Common/Entity/Style/BorderTest.php b/tests/Spout/Common/Entity/Style/BorderTest.php index d61f500..ef8b5b8 100644 --- a/tests/Spout/Common/Entity/Style/BorderTest.php +++ b/tests/Spout/Common/Entity/Style/BorderTest.php @@ -22,6 +22,7 @@ class BorderTest extends TestCase $withConstructorParams = new Border([ new BorderPart(Border::LEFT), ]); + $this->assertTrue(true); } /** diff --git a/tests/Spout/Reader/Wrapper/XMLReaderTest.php b/tests/Spout/Reader/Wrapper/XMLReaderTest.php index f10f3b0..61aa7e7 100644 --- a/tests/Spout/Reader/Wrapper/XMLReaderTest.php +++ b/tests/Spout/Reader/Wrapper/XMLReaderTest.php @@ -51,6 +51,8 @@ class XMLReaderTest extends TestCase $this->assertFalse(libxml_get_last_error()); libxml_use_internal_errors($initialUseInternalErrorsSetting); + } else { + $this->markTestSkipped(); } } diff --git a/tests/Spout/Writer/CSV/WriterTest.php b/tests/Spout/Writer/CSV/WriterTest.php index a13d545..55de1cd 100644 --- a/tests/Spout/Writer/CSV/WriterTest.php +++ b/tests/Spout/Writer/CSV/WriterTest.php @@ -89,6 +89,7 @@ class WriterTest extends TestCase $writer->openToFile($resourcePath); $writer->close(); $writer->close(); // This call should not cause any error + $this->assertTrue(true); } /** diff --git a/tests/Spout/Writer/Common/Entity/SheetTest.php b/tests/Spout/Writer/Common/Entity/SheetTest.php index 85299f0..8c23675 100644 --- a/tests/Spout/Writer/Common/Entity/SheetTest.php +++ b/tests/Spout/Writer/Common/Entity/SheetTest.php @@ -101,6 +101,7 @@ class SheetTest extends TestCase $sheet = $this->createSheet(0, 'workbookId1'); $sheet->setName($customSheetName); $sheet->setName($customSheetName); + $this->assertTrue(true); } /** @@ -134,5 +135,6 @@ class SheetTest extends TestCase $sheet = $this->createSheet(1, 'workbookId3'); $sheet->setName($customSheetName); + $this->assertTrue(true); } } diff --git a/tests/Spout/Writer/ODS/WriterTest.php b/tests/Spout/Writer/ODS/WriterTest.php index 1f86994..fb307b6 100644 --- a/tests/Spout/Writer/ODS/WriterTest.php +++ b/tests/Spout/Writer/ODS/WriterTest.php @@ -202,6 +202,7 @@ class WriterTest extends TestCase $writer->openToFile($resourcePath); $writer->close(); $writer->close(); // This call should not cause any error + $this->assertTrue(true); } /** @@ -218,8 +219,8 @@ class WriterTest extends TestCase $this->writeToODSFile($dataRows, $fileName); foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertValueWasWritten($fileName, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertValueWasWritten($fileName, $cell->getValue()); } } } @@ -240,8 +241,8 @@ class WriterTest extends TestCase for ($i = 1; $i <= $numSheets; $i++) { foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertValueWasWritten($fileName, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertValueWasWritten($fileName, $cell->getValue()); } } } @@ -260,8 +261,8 @@ class WriterTest extends TestCase $this->writeToODSFile($dataRows, $fileName); foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertValueWasWritten($fileName, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertValueWasWritten($fileName, $cell->getValue()); } } } @@ -366,18 +367,18 @@ class WriterTest extends TestCase $writer->close(); foreach ($dataRowsSheet1 as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertValueWasWrittenToSheet($fileName, 1, $cellValue, 'Data should have been written in Sheet 1'); + foreach ($dataRow->getCells() as $cell) { + $this->assertValueWasWrittenToSheet($fileName, 1, $cell->getValue(), 'Data should have been written in Sheet 1'); } } foreach ($dataRowsSheet2 as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertValueWasWrittenToSheet($fileName, 2, $cellValue, 'Data should have been written in Sheet 2'); + foreach ($dataRow->getCells() as $cell) { + $this->assertValueWasWrittenToSheet($fileName, 2, $cell->getValue(), 'Data should have been written in Sheet 2'); } } foreach ($dataRowsSheet1Again as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertValueWasWrittenToSheet($fileName, 1, $cellValue, 'Data should have been written in Sheet 1'); + foreach ($dataRow->getCells() as $cell) { + $this->assertValueWasWrittenToSheet($fileName, 1, $cell->getValue(), 'Data should have been written in Sheet 1'); } } } diff --git a/tests/Spout/Writer/XLSX/WriterTest.php b/tests/Spout/Writer/XLSX/WriterTest.php index 6addc3e..9ab66bf 100644 --- a/tests/Spout/Writer/XLSX/WriterTest.php +++ b/tests/Spout/Writer/XLSX/WriterTest.php @@ -233,6 +233,7 @@ class WriterTest extends TestCase $writer->openToFile($resourcePath); $writer->close(); $writer->close(); // This call should not cause any error + $this->assertTrue(true); } /** @@ -249,8 +250,8 @@ class WriterTest extends TestCase $this->writeToXLSXFile($dataRows, $fileName, $shouldUseInlineStrings = true); foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cell->getValue()); } } } @@ -271,8 +272,8 @@ class WriterTest extends TestCase for ($i = 1; $i <= $numSheets; $i++) { foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertInlineDataWasWrittenToSheet($fileName, $numSheets, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertInlineDataWasWrittenToSheet($fileName, $numSheets, $cell->getValue()); } } } @@ -292,8 +293,8 @@ class WriterTest extends TestCase $this->writeToXLSXFile($dataRows, $fileName, $shouldUseInlineStrings = false); foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertSharedStringWasWritten($fileName, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertSharedStringWasWritten($fileName, $cell->getValue()); } } } @@ -314,8 +315,8 @@ class WriterTest extends TestCase for ($i = 1; $i <= $numSheets; $i++) { foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertSharedStringWasWritten($fileName, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertSharedStringWasWritten($fileName, $cell->getValue()); } } } @@ -334,8 +335,8 @@ class WriterTest extends TestCase $this->writeToXLSXFile($dataRows, $fileName); foreach ($dataRows as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cellValue); + foreach ($dataRow->getCells() as $cell) { + $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cell->getValue()); } } } @@ -422,18 +423,18 @@ class WriterTest extends TestCase $writer->close(); foreach ($dataRowsSheet1 as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cellValue, 'Data should have been written in Sheet 1'); + foreach ($dataRow->getCells() as $cell) { + $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cell->getValue(), 'Data should have been written in Sheet 1'); } } foreach ($dataRowsSheet2 as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertInlineDataWasWrittenToSheet($fileName, 2, $cellValue, 'Data should have been written in Sheet 2'); + foreach ($dataRow->getCells() as $cell) { + $this->assertInlineDataWasWrittenToSheet($fileName, 2, $cell->getValue(), 'Data should have been written in Sheet 2'); } } foreach ($dataRowsSheet1Again as $dataRow) { - foreach ($dataRow as $cellValue) { - $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cellValue, 'Data should have been written in Sheet 1'); + foreach ($dataRow->getCells() as $cell) { + $this->assertInlineDataWasWrittenToSheet($fileName, 1, $cell->getValue(), 'Data should have been written in Sheet 1'); } } }