Merge pull request #23863 from owncloud/fix_unit_tests

Fix unit tests warnings

2 files changed, 4 insertions, 16 deletions

diff --git a/apps/dav/tests/unit/comments/commentsplugin.php b/apps/dav/tests/unit/comments/commentsplugin.php
index c7d073d1491..c909f6a61ab 100644
--- a/apps/dav/tests/unit/comments/commentsplugin.php
+++ b/apps/dav/tests/unit/comments/commentsplugin.php
@@ -449,16 +449,6 @@ class CommentsPlugin extends \Test\TestCase {
 			->with('users', 'alice', 'files', '42')
 			->will($this->returnValue($comment));
 
-		$this->commentsManager->expects($this->any())
-			->method('setMessage')
-			->with('')
-			->will($this->throwException(new \InvalidArgumentException()));
-
-		$this->commentsManager->expects($this->any())
-			->method('setVerb')
-			->with('')
-			->will($this->throwException(new \InvalidArgumentException()));
-
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->will($this->returnValue($user));
diff --git a/apps/dav/tests/unit/connector/sabre/filesplugin.php b/apps/dav/tests/unit/connector/sabre/filesplugin.php
index e88066a12da..fb08ee170c4 100644
--- a/apps/dav/tests/unit/connector/sabre/filesplugin.php
+++ b/apps/dav/tests/unit/connector/sabre/filesplugin.php
@@ -84,6 +84,7 @@ class FilesPlugin extends \Test\TestCase {
 		$node = $this->getMockBuilder($class)
 			->disableOriginalConstructor()
 			->getMock();
+
 		$node->expects($this->any())
 			->method('getId')
 			->will($this->returnValue(123));
@@ -164,7 +165,9 @@ class FilesPlugin extends \Test\TestCase {
 	}
 
 	public function testGetPropertiesForFileHome() {
-		$node = $this->createTestNode('\OCA\DAV\Files\FilesHome');
+		$node = $this->getMockBuilder('\OCA\DAV\Files\FilesHome')
+			->disableOriginalConstructor()
+			->getMock();
 
 		$propFind = new \Sabre\DAV\PropFind(
 			'/dummyPath',
@@ -185,9 +188,6 @@ class FilesPlugin extends \Test\TestCase {
 			->disableOriginalConstructor()->getMock();
 		$user->expects($this->never())->method('getUID');
 		$user->expects($this->never())->method('getDisplayName');
-		$node->expects($this->never())->method('getDirectDownload');
-		$node->expects($this->never())->method('getOwner');
-		$node->expects($this->never())->method('getSize');
 
 		$this->plugin->handleGetProperties(
 			$propFind,
@@ -276,8 +276,6 @@ class FilesPlugin extends \Test\TestCase {
 			0
 		);
 
-		$node->expects($this->never())
-			->method('getDirectDownload');
 		$node->expects($this->once())
 			->method('getSize')
 			->will($this->returnValue(1025));