Inject server root - allows proper testing and separation of concerns

3 files changed, 13 insertions, 14 deletions

diff --git a/tests/lib/l10n/factorytest.php b/tests/lib/l10n/factorytest.php
index 228ec482fc9..e4c0eab2e6a 100644
--- a/tests/lib/l10n/factorytest.php
+++ b/tests/lib/l10n/factorytest.php
@@ -28,6 +28,9 @@ class FactoryTest extends TestCase {
 	/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	protected $userSession;
 
+	/** @var string */
+	protected $serverRoot;
+
 	public function setUp() {
 		parent::setUp();
 
@@ -42,6 +45,8 @@ class FactoryTest extends TestCase {
 			->getMock();
 
 		$this->userSession = $this->getMock('\OCP\IUserSession');
+
+		$this->serverRoot = \OC::$SERVERROOT;
 	}
 
 	/**
@@ -54,12 +59,13 @@ class FactoryTest extends TestCase {
 				->setConstructorArgs([
 					$this->config,
 					$this->request,
-					$this->userSession
+					$this->userSession,
+					$this->serverRoot,
 				])
 				->setMethods($methods)
 				->getMock();
 		} else {
-			return new Factory($this->config, $this->request, $this->userSession);
+			return new Factory($this->config, $this->request, $this->userSession, $this->serverRoot);
 		}
 	}
 
@@ -288,28 +294,21 @@ class FactoryTest extends TestCase {
 	}
 
 	public function testFindAvailableLanguagesWithThemes() {
-		$serverRoot = \OC::$SERVERROOT;
-		\OC::$SERVERROOT = \OC::$SERVERROOT . '/tests/data';
+		$this->serverRoot .= '/tests/data';
 		$app = 'files';
 
 		$factory = $this->getFactory(['findL10nDir']);
 		$factory->expects($this->once())
 			->method('findL10nDir')
 			->with($app)
-			->willReturn(\OC::$SERVERROOT . '/apps/files/l10n/');
+			->willReturn($this->serverRoot . '/apps/files/l10n/');
 		$this->config
 			->expects($this->once())
 			->method('getSystemValue')
 			->with('theme')
 			->willReturn('abc');
 
-		try {
-			$this->assertEquals(['en', 'zz'], $factory->findAvailableLanguages($app), '', 0.0, 10, true);
-		} catch (\Exception $e) {
-			\OC::$SERVERROOT = $serverRoot;
-			throw $e;
-		}
-		\OC::$SERVERROOT = $serverRoot;
+		$this->assertEquals(['en', 'zz'], $factory->findAvailableLanguages($app), '', 0.0, 10, true);
 	}
 
 	/**
diff --git a/tests/lib/l10n/l10nlegacytest.php b/tests/lib/l10n/l10nlegacytest.php
index 025f761fe5c..1df22ba36bd 100644
--- a/tests/lib/l10n/l10nlegacytest.php
+++ b/tests/lib/l10n/l10nlegacytest.php
@@ -124,7 +124,7 @@ class L10nLegacyTest extends \Test\TestCase {
 	}
 
 	public function testFactoryGetLanguageCode() {
-		$factory = new \OC\L10N\Factory($this->getMock('OCP\IConfig'), $this->getMock('OCP\IRequest'), $this->getMock('OCP\IUserSession'));
+		$factory = new \OC\L10N\Factory($this->getMock('OCP\IConfig'), $this->getMock('OCP\IRequest'), $this->getMock('OCP\IUserSession'), \OC::$SERVERROOT);
 		$l = $factory->get('lib', 'de');
 		$this->assertEquals('de', $l->getLanguageCode());
 	}
diff --git a/tests/lib/l10n/l10ntest.php b/tests/lib/l10n/l10ntest.php
index 0d175954bc1..227e07056a8 100644
--- a/tests/lib/l10n/l10ntest.php
+++ b/tests/lib/l10n/l10ntest.php
@@ -31,7 +31,7 @@ class L10nTest extends TestCase {
 		$request = $this->getMock('OCP\IRequest');
 		/** @var IUserSession $userSession */
 		$userSession = $this->getMock('OCP\IUserSession');
-		return new Factory($config, $request, $userSession);
+		return new Factory($config, $request, $userSession, \OC::$SERVERROOT);
 	}
 
 	public function testGermanPluralTranslations() {