[BUGFIX] Failing unit tests due to wrong path handling 58/36458/2
authorNicole Cordes <typo3@cordes.co>
Fri, 30 Jan 2015 17:07:21 +0000 (18:07 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Fri, 30 Jan 2015 17:43:25 +0000 (18:43 +0100)
In some tests of the StandaloneViewTest case the configured expections
aren't met which results in failing tests on Windows systems. The mock
is configured to return values when calling with giving parameter. The
parameter contains the path to a layout root. During runtime the used
paths are converted to unix like paths but the tests are configured to
expect Windows paths (forward slashes vs. backward slashes). This patch
converts paths to unix like paths before the expectations are configured
to not fail on Windows systems.

Releases: master, 6.2
Resolves: #64656
Change-Id: Ie362cc4e2efa41b6cee068e60313c1bfb22340b2
Reviewed-on: http://review.typo3.org/36458
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php

index 2d87c2a..aa773c2 100644 (file)
@@ -255,7 +255,7 @@ class StandaloneViewTest extends UnitTestCase {
         * @test
         */
        public function renderLoadsSpecifiedTemplateFileAndPassesSourceToTemplateParser() {
-               $templatePathAndFilename = __DIR__ . '/Fixtures/StandaloneViewFixture.html';
+               $templatePathAndFilename = GeneralUtility::fixWindowsFilePath(__DIR__) . '/Fixtures/StandaloneViewFixture.html';
                $expectedResult = file_get_contents($templatePathAndFilename);
                $this->view->setTemplatePathAndFilename($templatePathAndFilename);
                $this->mockTemplateParser->expects($this->once())->method('parse')->with($expectedResult);
@@ -375,7 +375,7 @@ class StandaloneViewTest extends UnitTestCase {
         * @test
         */
        public function getLayoutSourceReturnsContentOfLayoutFileForTheDefaultFormat() {
-               $layoutRootPath = __DIR__ . '/Fixtures';
+               $layoutRootPath = GeneralUtility::fixWindowsFilePath(__DIR__) . '/Fixtures';
                $this->view->setLayoutRootPath($layoutRootPath);
                $this->mockRequest->expects($this->once())->method('getFormat')->will($this->returnValue('html'));
                $this->view->expects($this->once())->method('testFileExistence')->with($layoutRootPath . '/LayoutFixture.html')->will($this->returnValue(TRUE));
@@ -388,7 +388,7 @@ class StandaloneViewTest extends UnitTestCase {
         * @test
         */
        public function getLayoutSourceReturnsContentOfLayoutFileForTheSpecifiedFormat() {
-               $layoutRootPath = __DIR__ . '/Fixtures';
+               $layoutRootPath = GeneralUtility::fixWindowsFilePath(__DIR__) . '/Fixtures';
                $this->view->setLayoutRootPath($layoutRootPath);
                $this->mockRequest->expects($this->once())->method('getFormat')->will($this->returnValue('xml'));
                $this->view->expects($this->once())->method('testFileExistence')->with($layoutRootPath . '/LayoutFixture.xml')->will($this->returnValue(TRUE));
@@ -401,7 +401,7 @@ class StandaloneViewTest extends UnitTestCase {
         * @test
         */
        public function getLayoutSourceReturnsContentOfDefaultLayoutFileIfNoLayoutExistsForTheSpecifiedFormat() {
-               $layoutRootPath = __DIR__ . '/Fixtures';
+               $layoutRootPath = GeneralUtility::fixWindowsFilePath(__DIR__) . '/Fixtures';
                $this->view->setLayoutRootPath($layoutRootPath);
                $this->mockRequest->expects($this->once())->method('getFormat')->will($this->returnValue('foo'));
                $this->view->expects($this->at(0))->method('testFileExistence')->with($layoutRootPath . '/LayoutFixture.foo')->will($this->returnValue(FALSE));