From 2aa49dc17b87faef64fde7a482dc600b41ee7444 Mon Sep 17 00:00:00 2001 From: Roman Syroeshko Date: Wed, 12 Mar 2014 20:40:29 +0400 Subject: [PATCH] https://github.com/PHPOffice/PHPWord/issues/43 Unit test fix #2. --- Tests/PHPWord/TemplateTest.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Tests/PHPWord/TemplateTest.php b/Tests/PHPWord/TemplateTest.php index 77cebd1a..d7e99e55 100644 --- a/Tests/PHPWord/TemplateTest.php +++ b/Tests/PHPWord/TemplateTest.php @@ -52,7 +52,7 @@ final class TemplateTest extends \PHPUnit_Framework_TestCase $this->assertNotEquals($documentXml, $templateXml); - return $document; + return $documentFqfn; } /** @@ -60,28 +60,28 @@ final class TemplateTest extends \PHPUnit_Framework_TestCase * @depends testTemplateCanBeSavedInTemporaryLocation * @test */ - final public function testXslStyleSheetCanBeApplied(PHPWord_Template $actualDocument) + final public function testXslStyleSheetCanBeApplied($actualDocumentFqfn) { - $expectedDocument = \join( + $expectedDocumentFqfn = \join( \DIRECTORY_SEPARATOR, array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'documents', 'without_table_macros.docx') ); - $actualZip = new \ZipArchive(); - $actualZip->open($actualDocument); - $actualXml = $actualZip->getFromName('word/document.xml'); - if ($actualZip->close() === false) { - throw new \Exception("Could not close zip file \"{$actualDocument}\"."); + $actualDocumentZip = new \ZipArchive(); + $actualDocumentZip->open($actualDocumentFqfn); + $actualDocumentXml = $actualDocumentZip->getFromName('word/document.xml'); + if ($actualDocumentZip->close() === false) { + throw new \Exception("Could not close zip file \"{$actualDocumentFqfn}\"."); } - $expectedZip = new \ZipArchive(); - $expectedZip->open($expectedDocument); - $expectedXml = $expectedZip->getFromName('word/document.xml'); - if ($expectedZip->close() === false) { - throw new \Exception("Could not close zip file \"{$expectedDocument}\"."); + $expectedDocumentZip = new \ZipArchive(); + $expectedDocumentZip->open($expectedDocumentFqfn); + $expectedDocumentXml = $expectedDocumentZip->getFromName('word/document.xml'); + if ($expectedDocumentZip->close() === false) { + throw new \Exception("Could not close zip file \"{$expectedDocumentFqfn}\"."); } - $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); + $this->assertXmlStringEqualsXmlString($expectedDocumentXml, $actualDocumentXml); } /**