Merge pull request #162 from owncloud/stable10-fix-158

[Stable10] Fix background job

appinfo/info.xml

@@ -10,7 +10,7 @@ For this app to be effective, the ClamAV virus definitions should be kept up to
 	<repository type="git">http://github.com/owncloud/files_antivirus.git</repository>
 	<licence>AGPL</licence>
 	<author>Manuel Delgado, Bart Visscher, thinksilicon.de, Victor Dubiniuk</author>
-	<version>0.10.0.0</version>
+	<version>0.10.0.1</version>
 	<types>
 		<filesystem/>
 	</types>

lib/backgroundscanner.php

@@ -106,7 +106,7 @@ protected function getFilesForScan(){
 			);
 		} else {
 			$concatFunction = $qb->createFunction(
-				"'/' || " . $qb->getColumnName('mnt.user_id') . " || '/')"
+				"'/' || " . $qb->getColumnName('mnt.user_id') . " || '/'"
 			);
 		}
 
@@ -120,7 +120,7 @@ protected function getFilesForScan(){
 			);
 		}
 
-		$qb->select(['fc.fileid, mnt.user_id'])
+		$qb->select(['fc.fileid', 'mnt.user_id'])
 			->from('filecache', 'fc')
 			->leftJoin('fc', 'files_antivirus', 'fa', $qb->expr()->eq('fa.fileid', 'fc.fileid'))
 			->innerJoin(

tests/BackgroundScannerTest.php

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Copyright (c) 2017 Victor Dubiniuk <[email protected]>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OCA\Files_antivirus\Tests;
+
+use OCA\Files_Antivirus\BackgroundScanner;
+use OCA\Files_Antivirus\ScannerFactory;
+use Doctrine\DBAL\Driver\PDOStatement;
+
+class BackgroundScannerTest extends TestBase {
+
+	public function testGetFilesForScan(){
+
+		$scannerFactory = new Mock\ScannerFactory(
+			new Mock\Config($this->container->query('CoreConfig')),
+			$this->container->query('Logger')
+		);
+
+		$scannerMock = $this->getMockBuilder(BackgroundScanner::class)
+			->setConstructorArgs([
+				$scannerFactory,
+				$this->l10n,
+				$this->config,
+				\OC::$server->getRootFolder(),
+				\OC::$server->getUserSession()
+			])
+			->getMock();
+
+		$class = new \ReflectionClass($scannerMock);
+		$method = $class->getMethod('getFilesForScan');
+		$method->setAccessible(true);
+		$result = $method->invokeArgs($scannerMock, []);
+		$this->assertEquals(PDOStatement::class, get_class($result));
+	}
+
+}