ZendTest\Filter: assertRegExp bugfixes for windows

see here: http://www.php.net/manual/de/function.preg-match.php#101575
zendframework · Oct 28, 2013 · efad143 · efad143
1 parent 121ec9a
commit efad143
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/test/File/RenameTest.php b/test/File/RenameTest.php
@@ -491,7 +491,7 @@ public function testGetRandomizedFile()
             $filter->getFile()
         );
         $fileNoExt = $this->_filesPath . 'newfile';
-        $this->assertRegExp('#' . $fileNoExt . '_.{13}\.xml#', $filter->getNewName($this->_oldFile));
+        $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.xml#', $filter->getNewName($this->_oldFile));
     }
 
     /**
@@ -515,7 +515,7 @@ public function testGetRandomizedFileWithoutExtension()
             )),
             $filter->getFile()
         );
-        $this->assertRegExp('#' . $fileNoExt . '_.{13}#', $filter->getNewName($this->_oldFile));
+        $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}#', $filter->getNewName($this->_oldFile));
     }
 
     /**

diff --git a/test/File/RenameUploadTest.php b/test/File/RenameUploadTest.php
@@ -245,18 +245,18 @@ public function testCannotOverwriteExistingFile()
      */
     public function testGetRandomizedFile()
     {
-        $fileNoExt = $this->_filesPath . '/newfile';
+        $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
         $filter = new RenameUploadMock(array(
             'target'          => $this->_newFile,
             'randomize'       => true,
         ));
 
-        $this->assertRegExp('#' . $fileNoExt . '_.{13}\.xml#', $filter($this->_oldFile));
+        $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.xml#', $filter($this->_oldFile));
     }
 
     public function testGetFileWithOriginalExtension()
     {
-        $fileNoExt = $this->_filesPath . '/newfile';
+        $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
         $filter = new RenameUploadMock(array(
             'target'          => $this->_newFile,
             'use_upload_extension' => true,
@@ -266,14 +266,14 @@ public function testGetFileWithOriginalExtension()
         $oldFilePathInfo = pathinfo($this->_oldFile);
 
         $this->assertRegExp(
-            '#' . $fileNoExt . '.'.$oldFilePathInfo['extension'].'#',
+            '#' . str_replace('\\', '\\\\', $fileNoExt) . '.'.$oldFilePathInfo['extension'].'#',
             $filter($this->_oldFile)
         );
     }
 
     public function testGetRandomizedFileWithOriginalExtension()
     {
-        $fileNoExt = $this->_filesPath . '/newfile';
+        $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
         $filter = new RenameUploadMock(array(
             'target'          => $this->_newFile,
             'use_upload_extension' => true,
@@ -283,7 +283,7 @@ public function testGetRandomizedFileWithOriginalExtension()
         $oldFilePathInfo = pathinfo($this->_oldFile);
 
         $this->assertRegExp(
-            '#' . $fileNoExt . '_.{13}\.'.$oldFilePathInfo['extension'].'#',
+            '#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.'.$oldFilePathInfo['extension'].'#',
             $filter($this->_oldFile)
         );
     }
@@ -293,13 +293,13 @@ public function testGetRandomizedFileWithOriginalExtension()
      */
     public function testGetRandomizedFileWithoutExtension()
     {
-        $fileNoExt = $this->_filesPath . '/newfile';
+        $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile';
         $filter = new RenameUploadMock(array(
             'target'          => $fileNoExt,
             'randomize'       => true,
         ));
 
-        $this->assertRegExp('#' . $fileNoExt . '_.{13}#', $filter($this->_oldFile));
+        $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}#', $filter($this->_oldFile));
     }
 
     /**