fixup! Update tests

Signed-off-by: Roeland Jago Douma <[email protected]>

Author: rullzer

lib/private/Preview/BackgroundCleanupJob.php

@@ -66,15 +66,11 @@ public function __construct(IDBConnection $connection,
 	public function run($argument) {
 		foreach ($this->getDeletedFiles() as $fileId) {
 			try {
-				var_dump("CLEANING UP: " . $fileId);
 				$preview = $this->previewFolder->getFolder((string)$fileId);
 				$preview->delete();
-				var_dump("CLEANED UP: " . $fileId);
 			} catch (NotFoundException $e) {
-				var_dump("!!!!!!NOT FOUND: " . $fileId);
 				// continue
 			} catch (NotPermittedException $e) {
-				var_dump("!!!! NOT PERMITTED: " . $fileId);
 				// continue
 			}
 		}

lib/private/Preview/Watcher.php

@@ -63,7 +63,7 @@ protected function deleteNode(Node $node) {
 
 		try {
 			$folder = $this->appData->getFolder((string)$node->getId());
-			//$folder->delete();
+			$folder->delete();
 		} catch (NotFoundException $e) {
 			//Nothing to do
 		}

tests/lib/Preview/BackgroundCleanupJobTest.php

@@ -126,7 +126,6 @@ private function countPreviews(Root $previewRoot, array $fileIds): int {
 		foreach ($fileIds as $fileId) {
 			try {
 				$previewRoot->getFolder((string)$fileId);
-				var_dump('Found: ' . $fileId);
 			} catch (NotFoundException $e) {
 				continue;
 			}
@@ -161,30 +160,49 @@ public function testCleanupSystemCron() {
 		$this->assertSame(0, $this->countPreviews($root, $fileIds));
 	}
 
-	public function XtestCleanupAjax() {
+	public function testCleanupAjax() {
 		$files = $this->setup11Previews();
+		$fileIds = array_map(function (File $f) {
+			return $f->getId();
+		}, $files);
 
-		$preview = $this->appDataFactory->get('preview');
-
-		$previews = $preview->getDirectoryListing();
-		$this->assertCount(11, $previews);
+		$root = $this->getRoot();
 
-		$job = new BackgroundCleanupJob($this->connection, $this->appDataFactory, $this->mimeTypeLoader, false);
+		$this->assertSame(11, $this->countPreviews($root, $fileIds));
+		$job = new BackgroundCleanupJob($this->connection, $root, $this->mimeTypeLoader, false);
 		$job->run([]);
 
 		foreach ($files as $file) {
 			$file->delete();
 		}
 
-		$this->assertCount(11, $previews);
+		$root = $this->getRoot();
+		$this->assertSame(11, $this->countPreviews($root, $fileIds));
 		$job->run([]);
 
-		$previews = $preview->getDirectoryListing();
-		$this->assertCount(1, $previews);
+		$root = $this->getRoot();
+		$this->assertSame(1, $this->countPreviews($root, $fileIds));
+		$job->run([]);
+
+		$root = $this->getRoot();
+		$this->assertSame(0, $this->countPreviews($root, $fileIds));
+	}
+
+	public function testOldPreviews() {
+		$appdata = \OC::$server->getAppDataDir('preview');
+
+		$f1 = $appdata->newFolder('123456781');
+		$f1->newFile('foo.jpg', 'foo');
+		$f2 = $appdata->newFolder('123456782');
+		$f2->newFile('foo.jpg', 'foo');
+
+		$appdata = \OC::$server->getAppDataDir('preview');
+		$this->assertSame(2, count($appdata->getDirectoryListing()));
 
+		$job = new BackgroundCleanupJob($this->connection, $this->getRoot(), $this->mimeTypeLoader, true);
 		$job->run([]);
 
-		$previews = $preview->getDirectoryListing();
-		$this->assertCount(0, $previews);
+		$appdata = \OC::$server->getAppDataDir('preview');
+		$this->assertSame(0, count($appdata->getDirectoryListing()));
 	}
 }