Skip to content

Commit 2aa49dc

Browse files
author
Roman Syroeshko
committed
https://github.com/PHPOffice/PHPWord/issues/43
Unit test fix #2.
1 parent de96a66 commit 2aa49dc

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Tests/PHPWord/TemplateTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,36 +52,36 @@ final public function testTemplateCanBeSavedInTemporaryLocation()
5252

5353
$this->assertNotEquals($documentXml, $templateXml);
5454

55-
return $document;
55+
return $documentFqfn;
5656
}
5757

5858
/**
5959
* @covers ::applyXslStyleSheet
6060
* @depends testTemplateCanBeSavedInTemporaryLocation
6161
* @test
6262
*/
63-
final public function testXslStyleSheetCanBeApplied(PHPWord_Template $actualDocument)
63+
final public function testXslStyleSheetCanBeApplied($actualDocumentFqfn)
6464
{
65-
$expectedDocument = \join(
65+
$expectedDocumentFqfn = \join(
6666
\DIRECTORY_SEPARATOR,
6767
array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'documents', 'without_table_macros.docx')
6868
);
6969

70-
$actualZip = new \ZipArchive();
71-
$actualZip->open($actualDocument);
72-
$actualXml = $actualZip->getFromName('word/document.xml');
73-
if ($actualZip->close() === false) {
74-
throw new \Exception("Could not close zip file \"{$actualDocument}\".");
70+
$actualDocumentZip = new \ZipArchive();
71+
$actualDocumentZip->open($actualDocumentFqfn);
72+
$actualDocumentXml = $actualDocumentZip->getFromName('word/document.xml');
73+
if ($actualDocumentZip->close() === false) {
74+
throw new \Exception("Could not close zip file \"{$actualDocumentFqfn}\".");
7575
}
7676

77-
$expectedZip = new \ZipArchive();
78-
$expectedZip->open($expectedDocument);
79-
$expectedXml = $expectedZip->getFromName('word/document.xml');
80-
if ($expectedZip->close() === false) {
81-
throw new \Exception("Could not close zip file \"{$expectedDocument}\".");
77+
$expectedDocumentZip = new \ZipArchive();
78+
$expectedDocumentZip->open($expectedDocumentFqfn);
79+
$expectedDocumentXml = $expectedDocumentZip->getFromName('word/document.xml');
80+
if ($expectedDocumentZip->close() === false) {
81+
throw new \Exception("Could not close zip file \"{$expectedDocumentFqfn}\".");
8282
}
8383

84-
$this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
84+
$this->assertXmlStringEqualsXmlString($expectedDocumentXml, $actualDocumentXml);
8585
}
8686

8787
/**

0 commit comments

Comments
 (0)