Merge pull request #20875 from owncloud/remove-changepropagator

remove old propagation logic

2 files changed, 0 insertions, 198 deletions

diff --git a/tests/lib/files/cache/changepropagator.php b/tests/lib/files/cache/changepropagator.php
deleted file mode 100644
index 6e9d9bfae75..00000000000
--- a/tests/lib/files/cache/changepropagator.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace Test\Files\Cache;
-
-use OC\Files\Filesystem;
-use OC\Files\Storage\Temporary;
-use OC\Files\View;
-
-/**
- * Class ChangePropagator
- *
- * @group DB
- *
- * @package Test\Files\Cache
- */
-class ChangePropagator extends \Test\TestCase {
-	/**
-	 * @var \OC\Files\Cache\ChangePropagator
-	 */
-	private $propagator;
-
-	/**
-	 * @var \OC\Files\View
-	 */
-	private $view;
-
-	/**
-	 * @var \OC\Files\Storage\Storage
-	 */
-	private $storage;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->storage = new Temporary(array());
-		$root = $this->getUniqueID('/');
-		Filesystem::mount($this->storage, array(), $root);
-		$this->view = new View($root);
-		$this->propagator = new \OC\Files\Cache\ChangePropagator($this->view);
-	}
-
-	public function testGetParentsSingle() {
-		$this->propagator->addChange('/foo/bar/asd');
-		$this->assertEquals(array('/', '/foo', '/foo/bar'), $this->propagator->getAllParents());
-	}
-
-	public function testGetParentsMultiple() {
-		$this->propagator->addChange('/foo/bar/asd');
-		$this->propagator->addChange('/foo/qwerty');
-		$this->propagator->addChange('/foo/asd/bar');
-		$this->assertEquals(array('/', '/foo', '/foo/bar', '/foo/asd'), $this->propagator->getAllParents());
-	}
-
-	public function testSinglePropagate() {
-		$this->view->mkdir('/foo');
-		$this->view->mkdir('/foo/bar');
-		$this->view->file_put_contents('/foo/bar/sad.txt', 'qwerty');
-
-		$oldInfo1 = $this->view->getFileInfo('/');
-		$oldInfo2 = $this->view->getFileInfo('/foo');
-		$oldInfo3 = $this->view->getFileInfo('/foo/bar');
-
-		$time = time() + 50;
-
-		$this->propagator->addChange('/foo/bar/sad.txt');
-		$this->propagator->propagateChanges($time);
-
-		$newInfo1 = $this->view->getFileInfo('/');
-		$newInfo2 = $this->view->getFileInfo('/foo');
-		$newInfo3 = $this->view->getFileInfo('/foo/bar');
-
-		$this->assertEquals($newInfo1->getMTime(), $time);
-		$this->assertEquals($newInfo2->getMTime(), $time);
-		$this->assertEquals($newInfo3->getMTime(), $time);
-
-		$this->assertNotSame($oldInfo1->getEtag(), $newInfo1->getEtag());
-		$this->assertNotSame($oldInfo2->getEtag(), $newInfo2->getEtag());
-		$this->assertNotSame($oldInfo3->getEtag(), $newInfo3->getEtag());
-	}
-
-	public function testDontLowerMtime() {
-		$time = time();
-		$this->view->mkdir('/foo');
-		$this->view->mkdir('/foo/bar');
-
-		$cache = $this->storage->getCache();
-		$cache->put('', ['mtime' => $time - 50]);
-		$cache->put('foo', ['mtime' => $time - 150]);
-		$cache->put('foo/bar', ['mtime' => $time - 250]);
-
-		$this->propagator->addChange('/foo/bar/foo');
-		$this->propagator->propagateChanges($time - 100);
-
-		$this->assertEquals(50, $time - $cache->get('')['mtime']);
-		$this->assertEquals(100, $time - $cache->get('foo')['mtime']);
-		$this->assertEquals(100, $time - $cache->get('foo/bar')['mtime']);
-	}
-
-	public function testPropagateCrossStorage() {
-		$storage = new Temporary();
-		$this->view->mkdir('/foo');
-		Filesystem::mount($storage, [], $this->view->getAbsolutePath('/foo/submount'));
-		$this->view->mkdir('/foo/submount/bar');
-		$this->view->file_put_contents('/foo/submount/bar/sad.txt', 'qwerty');
-
-		$oldInfo1 = $this->view->getFileInfo('/');
-		$oldInfo2 = $this->view->getFileInfo('/foo');
-		$oldInfo3 = $this->view->getFileInfo('/foo/submount');
-		$oldInfo4 = $this->view->getFileInfo('/foo/submount/bar');
-
-		$time = time() + 50;
-
-		$this->propagator->addChange('/foo/submount/bar/sad.txt');
-		$this->propagator->propagateChanges($time);
-
-		$newInfo1 = $this->view->getFileInfo('/');
-		$newInfo2 = $this->view->getFileInfo('/foo');
-		$newInfo3 = $this->view->getFileInfo('/foo/submount');
-		$newInfo4 = $this->view->getFileInfo('/foo/submount/bar');
-
-		$this->assertEquals($newInfo1->getMTime(), $time);
-		$this->assertEquals($newInfo2->getMTime(), $time);
-		$this->assertEquals($newInfo3->getMTime(), $time);
-		$this->assertEquals($newInfo4->getMTime(), $time);
-
-		$this->assertNotSame($oldInfo1->getEtag(), $newInfo1->getEtag());
-		$this->assertNotSame($oldInfo2->getEtag(), $newInfo2->getEtag());
-		$this->assertNotSame($oldInfo3->getEtag(), $newInfo3->getEtag());
-		$this->assertNotSame($oldInfo4->getEtag(), $newInfo3->getEtag());
-	}
-}
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 2a50c2a6222..7779e2778cb 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -30,14 +30,6 @@ class TestScanner extends \OC\Files\Utils\Scanner {
 	protected function getMounts($dir) {
 		return $this->mounts;
 	}
-
-	public function getPropagator() {
-		return $this->propagator;
-	}
-
-	public function setPropagator($propagator) {
-		$this->propagator = $propagator;
-	}
 }
 
 /**
@@ -144,59 +136,6 @@ class Scanner extends \Test\TestCase {
 		$this->assertTrue($cache->inCache('folder/bar.txt'));
 	}
 
-	public function testChangePropagator() {
-		/**
-		 * @var \OC\Files\Cache\ChangePropagator $propagator
-		 */
-		$propagator = $this->getMock('\OC\Files\Cache\ChangePropagator', array('propagateChanges'), array(), '', false);
-
-		$storage = new Temporary(array());
-		$mount = new MountPoint($storage, '/foo');
-		Filesystem::getMountManager()->addMount($mount);
-		$cache = $storage->getCache();
-
-		$storage->mkdir('folder');
-		$storage->file_put_contents('foo.txt', 'qwerty');
-		$storage->file_put_contents('folder/bar.txt', 'qwerty');
-
-		$scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
-		$originalPropagator = $scanner->getPropagator();
-		$scanner->setPropagator($propagator);
-		$scanner->addMount($mount);
-
-		$scanner->scan('');
-
-		$changes = $propagator->getChanges();
-		$parents = $propagator->getAllParents();
-		sort($changes);
-		sort($parents);
-		$this->assertEquals(array('/foo', '/foo/folder', '/foo/folder/bar.txt', '/foo/foo.txt'), $changes);
-		$this->assertEquals(array('/', '/foo', '/foo/folder'), $parents);
-
-		$cache->put('foo.txt', array('storage_mtime' => time() - 50));
-
-		$propagator = $this->getMock('\OC\Files\Cache\ChangePropagator', array('propagateChanges'), array(), '', false);
-		$scanner->setPropagator($propagator);
-		$storage->file_put_contents('foo.txt', 'asdasd');
-
-		$scanner->scan('');
-
-		$changes = $propagator->getChanges();
-		$parents = $propagator->getAllParents();
-		$this->assertEquals(array('/foo/foo.txt'), $changes);
-		$this->assertEquals(array('/', '/foo'), $parents);
-
-		$scanner->setPropagator($originalPropagator);
-
-		$oldInfo = $cache->get('');
-		$cache->put('foo.txt', array('storage_mtime' => time() - 70));
-		$storage->file_put_contents('foo.txt', 'asdasd');
-
-		$scanner->scan('');
-		$newInfo = $cache->get('');
-		$this->assertNotEquals($oldInfo['etag'], $newInfo['etag']);
-	}
-
 	/**
 	 * @return array
 	 */