diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-08-04 16:17:11 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-09-05 11:53:23 +0200 |
| commit | 3d92f963f4851900e284fdac59a0806c09b20579 (patch) | |
| tree | 2802c3a31bd3dc096a666268fd20a7bb9d048799 /tests | |
| parent | 65d24c3cd5b9fa706626938bb75dec86720bde75 (diff) | |
| download | nextcloud-server-3d92f963f4851900e284fdac59a0806c09b20579.tar.gz nextcloud-server-3d92f963f4851900e284fdac59a0806c09b20579.zip | |
Fix unit test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/connector/sabre/file.php | 12 | ||||
| -rw-r--r-- | tests/lib/files/cache/updaterlegacy.php | 1 | ||||
| -rw-r--r-- | tests/lib/files/view.php | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php index ba4e775813b..f9f485a5400 100644 --- a/tests/lib/connector/sabre/file.php +++ b/tests/lib/connector/sabre/file.php @@ -13,7 +13,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { */ public function testSimplePutFails() { // setup - $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array(), '', false); + $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array()); $view->expects($this->any()) ->method('file_put_contents') ->will($this->returnValue(false)); @@ -38,8 +38,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { public function testSimplePutFailsOnRename() { // setup $view = $this->getMock('\OC\Files\View', - array('file_put_contents', 'rename', 'getRelativePath', 'filesize'), - array(), '', false); + array('file_put_contents', 'rename', 'getRelativePath', 'filesize')); $view->expects($this->any()) ->method('file_put_contents') ->withAnyParameters() @@ -72,7 +71,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { */ public function testSimplePutInvalidChars() { // setup - $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array(), '', false); + $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath')); $view->expects($this->any()) ->method('file_put_contents') ->will($this->returnValue(false)); @@ -96,7 +95,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { */ public function testSetNameInvalidChars() { // setup - $view = $this->getMock('\OC\Files\View', array('getRelativePath'), array(), '', false); + $view = $this->getMock('\OC\Files\View', array('getRelativePath')); $view->expects($this->any()) ->method('getRelativePath') @@ -115,8 +114,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { public function testUploadAbort() { // setup $view = $this->getMock('\OC\Files\View', - array('file_put_contents', 'rename', 'getRelativePath', 'filesize'), - array(), '', false); + array('file_put_contents', 'rename', 'getRelativePath', 'filesize')); $view->expects($this->any()) ->method('file_put_contents') ->withAnyParameters() diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php index a6697c76353..deb4cb0b438 100644 --- a/tests/lib/files/cache/updaterlegacy.php +++ b/tests/lib/files/cache/updaterlegacy.php @@ -132,7 +132,6 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase { $this->assertInternalType('string', $substorageCachedData['etag']); $this->assertInternalType('string', $cachedData['etag']); $this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']); - $this->assertEquals($mtime, $cachedData['mtime']); $cachedData = $this->cache->get('folder'); $this->assertInternalType('string', $folderCachedData['etag']); diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index a0f4d97d5b4..522535946a5 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -382,7 +382,7 @@ class View extends \PHPUnit_Framework_TestCase { $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->assertGreaterThanOrEqual($oldCachedData['mtime'], $cachedData['mtime']); $this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']); } |