Fix tests and add some more tests if apps can be installed, updated and uninstalled

Author: DeepDiver1975

lib/MarketService.php

@@ -255,6 +255,10 @@ public function getInstalledAppInfo($appId) {
 	 * @throws AppNotInstalledException
 	 */
 	public function updateApp($appId) {
+		if (!$this->appManager->canInstall()) {
+			throw new \Exception("Installing apps is not supported because the app folder is not writable.");
+		}
+
 		try {
 			$info = $this->getInstalledAppInfo($appId);
 			if (is_null($info)) {
@@ -278,6 +282,10 @@ public function updateApp($appId) {
 	 * @throws AppManagerException
 	 */
 	public function uninstallApp($appId) {
+		if (!$this->appManager->canInstall()) {
+			throw new \Exception("Installing apps is not supported because the app folder is not writable.");
+		}
+
 		if ($this->appManager->isShipped($appId)) {
 			throw new AppManagerException($this->l10n->t('Shipped apps cannot be uninstalled'));
 		}

tests/unit/MarketServiceTest.php

@@ -9,19 +9,26 @@
 
 class MarketServiceTest extends TestCase {
 
+	/** @var MarketService */
 	private $marketService;
+	/** @var boolean */
 	private $hasInternetConnection;
+	/** @var IAppManager | PHPUnit_Framework_MockObject_MockObject */
+	private $appManager;
 
 	public function setUp(){
 		$this->hasInternetConnection = true;
-		$appManagerMock = $this->getMockBuilder(IAppManager::class)->getMock();
-		$appManagerMock->method('getAllApps')->will($this->returnValue([]));
-		
+		$this->appManager = $this->createMock(IAppManager::class);
+		$this->appManager->method('getAllApps')->willReturn([]);
+
+		/** @var IConfig | PHPUnit_Framework_MockObject_MockObject $configMock */
 		$configMock = $this->getConfigMock();
-		$cacheFactoryMock = $this->getMockBuilder(ICacheFactory::class)->getMock();
-		$l10nMock = $this->getMockBuilder(IL10N::class)->getMock();
+		/** @var ICacheFactory | PHPUnit_Framework_MockObject_MockObject $cacheFactoryMock */
+		$cacheFactoryMock = $this->createMock(ICacheFactory::class);
+		/** @var IL10N | PHPUnit_Framework_MockObject_MockObject $l10nMock */
+		$l10nMock = $this->createMock(IL10N::class);
 		$this->marketService = new MarketService(
-			$appManagerMock,
+			$this->appManager,
 			$configMock,
 			$cacheFactoryMock,
 			$l10nMock
@@ -33,6 +40,7 @@ public function setUp(){
 	*/
 	public function testInstallWithInternetConnectionDisabled(){
 		$this->hasInternetConnection = false;
+		$this->appManager->method('canInstall')->willReturn(true);
 		$this->marketService->installApp('fubar');
 	}
 
@@ -41,8 +49,28 @@ public function testInstallWithInternetConnectionDisabled(){
 	*/
 	public function testUpdateWithInternetConnectionDisabled(){
 		$this->hasInternetConnection = false;
+		$this->appManager->method('canInstall')->willReturn(true);
 		$this->marketService->updateApp('files');
 	}
+
+	/**
+	 * @dataProvider providesMarketMethods
+	 * @expectedException \Exception
+	 * @expectedExceptionMessage Installing apps is not supported because the app folder is not writable.
+	 */
+	public function testInstallNotPossible($method) {
+		$this->appManager->method('canInstall')->willReturn(false);
+
+		$this->marketService->$method('test');
+	}
+
+	public function providesMarketMethods() {
+		return [
+			['installApp'],
+			['uninstallApp'],
+			['updateApp']
+		];
+	}
 
 	public function getSystemValue($configKey, $default = null){
 		if ($configKey==='has_internet_connection'){
@@ -52,30 +80,7 @@ public function getSystemValue($configKey, $default = null){
 	}
 
 	private function getConfigMock(){
-		$config = $this->getMockBuilder(IConfig::class)
-			->setMethods([
-				'getSystemValue',
-				'setSystemValue',
-				'getSystemValues',
-				'setSystemValues',
-				'getFilteredSystemValue',
-				'deleteSystemValue',
-				'getAppKeys',
-				'setAppValue',
-				'getAppValue',
-				'deleteAppValue',
-				'deleteAppValues',
-				'setUserValue',
-				'getUserValue',
-				'getUserValueForUsers',
-				'getUserKeys',
-				'deleteUserValue',
-				'deleteAllUserValues',
-				'deleteAppFromAllUsers',
-				'getUsersForUserValue',
-			])
-			->getMock();
-
+		$config = $this->createMock(IConfig::class);
 		$config->method('getSystemValue')
 				->will($this->returnCallback([$this, 'getSystemValue']));
 		return $config;