From 8c281a456d413d758c813b12eaeaadd2c89c7302 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 12 Oct 2012 19:28:24 +0200
Subject: [PATCH] PHPUnit 3.6 does not support @expectedException with the
generic exception class
---
tests/lib/share/share.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 48d0270cc5..7f6784f8df 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -61,11 +61,13 @@ class Test_Share extends UnitTestCase {
$query->execute(array('test'));
}
- /**
- * @expectedException Exception
- */
public function testShareInvalidShareType() {
- OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
+ $message = 'Share type foobar is not valid for test.txt';
+ try {
+ OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
+ } catch (Exception $exception) {
+ $this->assertEqual($exception->getMessage(), $message);
+ }
}
public function testInvalidItemType() {
--
GitLab