From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 tests/phpunit/includes/LocalFileTest.php | 33 ++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'tests/phpunit/includes/LocalFileTest.php')

diff --git a/tests/phpunit/includes/LocalFileTest.php b/tests/phpunit/includes/LocalFileTest.php
index e08d4d7e..5b26b89c 100644
--- a/tests/phpunit/includes/LocalFileTest.php
+++ b/tests/phpunit/includes/LocalFileTest.php
@@ -10,12 +10,21 @@ class LocalFileTest extends MediaWikiTestCase {
 		global $wgCapitalLinks;
 
 		$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 );
@@ -44,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() {
-- 
cgit v1.2.3-54-g00ecf