From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 23 May 2013 14:25:12 +0000 (-0400)
Subject: Merge branch 'master' into move-storages
X-Git-Tag: v6.0.0alpha2~745^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=30330b4343b5bca82b95d9df4a13651c8e91063d;p=nextcloud-server.git

Merge branch 'master' into move-storages

Conflicts:
	tests/lib/files/view.php
---

30330b4343b5bca82b95d9df4a13651c8e91063d
diff --cc tests/lib/files/view.php
index a51d99e793d,af97761bbb7..01f9a9cca11
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@@ -228,43 -234,27 +234,64 @@@ class View extends \PHPUnit_Framework_T
  		$this->assertEquals(3, $cachedData['size']);
  	}
  
 +	function testCopyBetweenStorages() {
 +		$storage1 = $this->getTestStorage();
 +		$storage2 = $this->getTestStorage();
 +		\OC\Files\Filesystem::mount($storage1, array(), '/');
 +		\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
 +
 +		$rootView = new \OC\Files\View('');
 +		$rootView->mkdir('substorage/emptyfolder');
 +		$rootView->copy('substorage', 'anotherfolder');
 +		$this->assertTrue($rootView->is_dir('/anotherfolder'));
 +		$this->assertTrue($rootView->is_dir('/substorage'));
 +		$this->assertTrue($rootView->is_dir('/anotherfolder/emptyfolder'));
 +		$this->assertTrue($rootView->is_dir('/substorage/emptyfolder'));
 +		$this->assertTrue($rootView->file_exists('/anotherfolder/foo.txt'));
 +		$this->assertTrue($rootView->file_exists('/anotherfolder/foo.png'));
 +		$this->assertTrue($rootView->file_exists('/anotherfolder/folder/bar.txt'));
 +		$this->assertTrue($rootView->file_exists('/substorage/foo.txt'));
 +		$this->assertTrue($rootView->file_exists('/substorage/foo.png'));
 +		$this->assertTrue($rootView->file_exists('/substorage/folder/bar.txt'));
 +	}
 +
 +	function testMoveBetweenStorages() {
 +		$storage1 = $this->getTestStorage();
 +		$storage2 = $this->getTestStorage();
 +		\OC\Files\Filesystem::mount($storage1, array(), '/');
 +		\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
 +
 +		$rootView = new \OC\Files\View('');
 +		$rootView->rename('foo.txt', 'substorage/folder/foo.txt');
 +		$this->assertFalse($rootView->file_exists('foo.txt'));
 +		$this->assertTrue($rootView->file_exists('substorage/folder/foo.txt'));
 +		$rootView->rename('substorage/folder', 'anotherfolder');
 +		$this->assertFalse($rootView->is_dir('substorage/folder'));
 +		$this->assertTrue($rootView->file_exists('anotherfolder/foo.txt'));
 +		$this->assertTrue($rootView->file_exists('anotherfolder/bar.txt'));
 +	}
 +
+ 	function testTouch() {
+ 		$storage = $this->getTestStorage(true, '\Test\Files\TemporaryNoTouch');
+ 
+ 		\OC\Files\Filesystem::mount($storage, array(), '/');
+ 
+ 		$rootView = new \OC\Files\View('');
+ 		$oldCachedData = $rootView->getFileInfo('foo.txt');
+ 
+ 		$rootView->touch('foo.txt', 500);
+ 
+ 		$cachedData = $rootView->getFileInfo('foo.txt');
+ 		$this->assertEquals(500, $cachedData['mtime']);
+ 		$this->assertEquals($oldCachedData['storage_mtime'], $cachedData['storage_mtime']);
+ 
+ 		$rootView->putFileInfo('foo.txt', array('storage_mtime' => 1000)); //make sure the watcher detects the change
+ 		$rootView->file_put_contents('foo.txt', 'asd');
+ 		$cachedData = $rootView->getFileInfo('foo.txt');
+ 		$this->assertGreaterThanOrEqual($cachedData['mtime'], $oldCachedData['mtime']);
+ 		$this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']);
+ 	}
+ 
  	/**
  	 * @param bool $scan
  	 * @return \OC\Files\Storage\Storage