svn: /pear2/Pyrus/trunk/tests/ AtomicFileTransaction/begin/begin.fail2.phpt AtomicFileTransaction/rmrf/rmrf.phpt ChannelRegistry/AllRegistries/__construct/errors.phpt ChannelRegistry/AllRegistries/coverage.phpt ChannelRegistry/AllRegistries/get/defaultchannels.phpt Config/__get__set__unset__isset/setup.php.inc Config/loadConfigFile/setup.php.inc Registry/Sqlite3/install/setup.php.inc

saltybeagle                              Tue, 27 Jul 2010 18:25:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=301618

Log:
Fix some slashes in paths to make tests work on Windows.

Changed paths:
    U   pear2/Pyrus/trunk/tests/AtomicFileTransaction/begin/begin.fail2.phpt
    U   pear2/Pyrus/trunk/tests/AtomicFileTransaction/rmrf/rmrf.phpt
    U   pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/__construct/errors.phpt
    U   pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/coverage.phpt
    U   pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/get/defaultchannels.phpt
    U   pear2/Pyrus/trunk/tests/Config/__get__set__unset__isset/setup.php.inc
    U   pear2/Pyrus/trunk/tests/Config/loadConfigFile/setup.php.inc
    _U  pear2/Pyrus/trunk/tests/Config/setCascadingRegistries/
    U   pear2/Pyrus/trunk/tests/Registry/Sqlite3/install/setup.php.inc

Modified: pear2/Pyrus/trunk/tests/AtomicFileTransaction/begin/begin.fail2.phpt
===================================================================
--- pear2/Pyrus/trunk/tests/AtomicFileTransaction/begin/begin.fail2.phpt	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/AtomicFileTransaction/begin/begin.fail2.phpt	2010-07-27 18:25:55 UTC (rev 301618)
@@ -13,7 +13,7 @@
 try {
     $atomic = \PEAR2\Pyrus\AtomicFileTransaction::getTransactionObject(__DIR__ . '/testit/src');
 } catch (\PEAR2\Pyrus\AtomicFileTransaction\Exception $e) {
-    $test->assertEquals('Unable to begin transaction for ' . __DIR__ . '/testit/src', $e->getMessage(), 'main message');
+    $test->assertEquals('Unable to begin transaction for ' . __DIR__ . DIRECTORY_SEPARATOR . 'testit' . DIRECTORY_SEPARATOR . 'src', $e->getMessage(), 'main message');
     $causes = array();
     $e->getCauseMessage($causes);
     $test->assertEquals('unrecoverable transaction error: journal path ' .

Modified: pear2/Pyrus/trunk/tests/AtomicFileTransaction/rmrf/rmrf.phpt
===================================================================
--- pear2/Pyrus/trunk/tests/AtomicFileTransaction/rmrf/rmrf.phpt	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/AtomicFileTransaction/rmrf/rmrf.phpt	2010-07-27 18:25:55 UTC (rev 301618)
@@ -23,7 +23,7 @@
     $atomic->rmrf(__DIR__ . '/testit', true);
     throw new Exception('did not fail and should');
 } catch (\PEAR2\Pyrus\AtomicFileTransaction\Exception $e) {
-    $test->assertEquals('Unable to fully remove ' . __DIR__ . '/testit, directory is not empty',
+    $test->assertEquals('Unable to fully remove ' . __DIR__ . DIRECTORY_SEPARATOR . 'testit, directory is not empty',
                         $e->getMessage(), 'removal message');
 }


Modified: pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/__construct/errors.phpt
===================================================================
--- pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/__construct/errors.phpt	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/__construct/errors.phpt	2010-07-27 18:25:55 UTC (rev 301618)
@@ -28,7 +28,7 @@
     throw new Exception('worked and should not');
 } catch (\PEAR2\Pyrus\ChannelRegistry\Exception $e) {
     $test->assertEquals('Unable to initialize registry for path "' . __DIR__ .
-                        '/testit"', $e->getMessage(), 'message');
+                        DIRECTORY_SEPARATOR . 'testit"', $e->getMessage(), 'message');
     $causes = array();
     $e->getCauseMessage($causes);
     $test->assertEquals('Database initialization failed',

Modified: pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/coverage.phpt
===================================================================
--- pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/coverage.phpt	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/coverage.phpt	2010-07-27 18:25:55 UTC (rev 301618)
@@ -6,7 +6,7 @@
 @mkdir(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
 $creg = new \PEAR2\Pyrus\ChannelRegistry\Sqlite3(__DIR__ . '/testit');

-$test->assertEquals(__DIR__ . '/testit', $creg->getPath(), 'getPath');
+$test->assertEquals(__DIR__ . DIRECTORY_SEPARATOR . 'testit', $creg->getPath(), 'getPath');

 $inf = array();
 foreach ($creg as $chan => $obj) {

Modified: pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/get/defaultchannels.phpt
===================================================================
--- pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/get/defaultchannels.phpt	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/ChannelRegistry/AllRegistries/get/defaultchannels.phpt	2010-07-27 18:25:55 UTC (rev 301618)
@@ -21,7 +21,7 @@
 try {
     $chan = new PEAR2\Pyrus\ChannelRegistry(__DIR__ . '/testit', array('Foo'));
 } catch (PEAR2\Pyrus\ChannelRegistry\Exception $e) {
-    $test->assertEquals('Unable to initialize registry for path "' . __DIR__ . '/testit' . '"',
+    $test->assertEquals('Unable to initialize registry for path "' . __DIR__ . DIRECTORY_SEPARATOR . 'testit' . '"',
                         $e->getMessage(), 'message');
 }
 ?>

Modified: pear2/Pyrus/trunk/tests/Config/__get__set__unset__isset/setup.php.inc
===================================================================
--- pear2/Pyrus/trunk/tests/Config/__get__set__unset__isset/setup.php.inc	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/Config/__get__set__unset__isset/setup.php.inc	2010-07-27 18:25:55 UTC (rev 301618)
@@ -1,5 +1,5 @@
 <?php
 require __DIR__ . '/../setup.php.inc';
-$testpath = __DIR__ . '/testit';
+$testpath = __DIR__ . DIRECTORY_SEPARATOR . 'testit';
 mkdir($testpath);
 $cdir = $testpath . '/.configsnapshots/';

Modified: pear2/Pyrus/trunk/tests/Config/loadConfigFile/setup.php.inc
===================================================================
--- pear2/Pyrus/trunk/tests/Config/loadConfigFile/setup.php.inc	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/Config/loadConfigFile/setup.php.inc	2010-07-27 18:25:55 UTC (rev 301618)
@@ -1,6 +1,6 @@
 <?php
 require __DIR__ . '/../setup.php.inc';
-$testpath = __DIR__ . '/testit';
+$testpath = __DIR__ . DIRECTORY_SEPARATOR . 'testit';
 mkdir($testpath);
 class tc extends \PEAR2\Pyrus\Config
 {


Property changes on: pear2/Pyrus/trunk/tests/Config/setCascadingRegistries
___________________________________________________________________
Modified: svn:ignore
   - *.php
*.out
*.exp
*.log
*.xdebug

   + *.php
*.out
*.exp
*.log
*.xdebug
*.diff


Modified: pear2/Pyrus/trunk/tests/Registry/Sqlite3/install/setup.php.inc
===================================================================
--- pear2/Pyrus/trunk/tests/Registry/Sqlite3/install/setup.php.inc	2010-07-27 17:35:08 UTC (rev 301617)
+++ pear2/Pyrus/trunk/tests/Registry/Sqlite3/install/setup.php.inc	2010-07-27 18:25:55 UTC (rev 301618)
@@ -2,9 +2,9 @@
 require dirname(__FILE__) . '/../../setup.php.inc';
 @mkdir(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
 set_include_path(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
-$c = \PEAR2\Pyrus\Config::singleton(__DIR__.'/testit', __DIR__ . '/testit/plugins/pearconfig.xml');
-$c->bin_dir = __DIR__ . '/testit/bin';
+$c = \PEAR2\Pyrus\Config::singleton(__DIR__.DIRECTORY_SEPARATOR.'testit', __DIR__ . DIRECTORY_SEPARATOR . 'testit'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'pearconfig.xml');
+$c->bin_dir = __DIR__ . DIRECTORY_SEPARATOR . 'testit' . DIRECTORY_SEPARATOR . 'bin';
 restore_include_path();
 $c->saveConfig();
 include __DIR__ . '/../../AllRegistries/setupPackageFile.php.inc';
-$reg = new \PEAR2\Pyrus\Registry\Sqlite3(__DIR__.'/testit');
\ No newline at end of file
+$reg = new \PEAR2\Pyrus\Registry\Sqlite3(__DIR__.DIRECTORY_SEPARATOR.'testit');
\ No newline at end of file