Allow aliased field names with separated syntax

[lhc/web/wiklou.git] / tests / phpunit / includes / LocalFileTest.php

diff --git a/tests/phpunit/includes/LocalFileTest.php b/tests/phpunit/includes/LocalFileTest.php
index 98c0de5..5b26b89 100644 (file)
--- a/tests/phpunit/includes/LocalFileTest.php
+++ b/tests/phpunit/includes/LocalFileTest.php
@@ -7,16 +7,24 @@
 
 class LocalFileTest extends MediaWikiTestCase {
        function setUp() {
-               global $wgContLang, $wgCapitalLinks;
+               global $wgCapitalLinks;
 
-               $wgContLang = new Language;
                $wgCapitalLinks = true;
+
                $info = array(
-                       'name' => 'test',
-                       'directory' => '/testdir',
-                       'url' => '/testurl',
-                       'hashLevels' => 2,
+                       'name'            => 'test',
+                       'directory'       => '/testdir',
+                       'url'             => '/testurl',
+                       'hashLevels'      => 2,
                        'transformVia404' => false,
+                       'backend'         => new FSFileBackend( array(
+                               'name'        => 'local-backend',
+                               'lockManager' => 'fsLockManager',
+                               'containerPaths' => array(
+                                       'cont1' => "/testdir/local-backend/tempimages/cont1",
+                                       'cont2' => "/testdir/local-backend/tempimages/cont2"
+                               )
+                       ) )
                );
                $this->repo_hl0 = new LocalRepo( array( 'hashLevels' => 0 ) + $info );
                $this->repo_hl2 = new LocalRepo( array( 'hashLevels' => 2 ) + $info );
@@ -45,17 +53,17 @@ class LocalFileTest extends MediaWikiTestCase {
        }
 
        function testGetArchivePath() {
-               $this->assertEquals( '/testdir/archive', $this->file_hl0->getArchivePath() );
-               $this->assertEquals( '/testdir/archive/a/a2', $this->file_hl2->getArchivePath() );
-               $this->assertEquals( '/testdir/archive/!', $this->file_hl0->getArchivePath( '!' ) );
-               $this->assertEquals( '/testdir/archive/a/a2/!', $this->file_hl2->getArchivePath( '!' ) );
+               $this->assertEquals( 'mwstore://local-backend/test-public/archive', $this->file_hl0->getArchivePath() );
+               $this->assertEquals( 'mwstore://local-backend/test-public/archive/a/a2', $this->file_hl2->getArchivePath() );
+               $this->assertEquals( 'mwstore://local-backend/test-public/archive/!', $this->file_hl0->getArchivePath( '!' ) );
+               $this->assertEquals( 'mwstore://local-backend/test-public/archive/a/a2/!', $this->file_hl2->getArchivePath( '!' ) );
        }
 
        function testGetThumbPath() {
-               $this->assertEquals( '/testdir/thumb/Test!', $this->file_hl0->getThumbPath() );
-               $this->assertEquals( '/testdir/thumb/a/a2/Test!', $this->file_hl2->getThumbPath() );
-               $this->assertEquals( '/testdir/thumb/Test!/x', $this->file_hl0->getThumbPath( 'x' ) );
-               $this->assertEquals( '/testdir/thumb/a/a2/Test!/x', $this->file_hl2->getThumbPath( 'x' ) );
+               $this->assertEquals( 'mwstore://local-backend/test-thumb/Test!', $this->file_hl0->getThumbPath() );
+               $this->assertEquals( 'mwstore://local-backend/test-thumb/a/a2/Test!', $this->file_hl2->getThumbPath() );
+               $this->assertEquals( 'mwstore://local-backend/test-thumb/Test!/x', $this->file_hl0->getThumbPath( 'x' ) );
+               $this->assertEquals( 'mwstore://local-backend/test-thumb/a/a2/Test!/x', $this->file_hl2->getThumbPath( 'x' ) );
        }
 
        function testGetArchiveUrl() {