Browse Source

Minor fixes

* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
remotes/origin/fix-10825
Morris Jobke 11 years ago
parent
commit
676fa459d7
  1. 2
      apps/files_encryption/tests/util.php
  2. 6
      apps/files_sharing/tests/api.php
  3. 1
      lib/private/appframework/utility/controllermethodreflector.php
  4. 3
      tests/lib/preferences-singleton.php
  5. 1
      tests/lib/preferences.php

2
apps/files_encryption/tests/util.php

@ -249,7 +249,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
}
/**
< * Test that data that is read by the crypto stream wrapper
* Test that data that is read by the crypto stream wrapper
*/
function testGetFileSize() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);

6
apps/files_sharing/tests/api.php

@ -52,8 +52,10 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
function tearDown() {
$this->view->unlink($this->filename);
$this->view->deleteAll($this->folder);
if($this->view instanceof \OC\Files\View) {
$this->view->unlink($this->filename);
$this->view->deleteAll($this->folder);
}
self::$tempStorage = null;

1
lib/private/appframework/utility/controllermethodreflector.php

@ -62,6 +62,7 @@ class ControllerMethodReflector {
} else {
$this->types = array_combine($matches['var'], $matches['type']);
}
// get method parameters
foreach ($reflection->getParameters() as $param) {
if($param->isOptional()) {

3
tests/lib/preferences-singleton.php

@ -61,7 +61,8 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
sort($expected);
$apps = \OC_Preferences::getApps('Someuser');
sort($apps);
$this->assertEquals($expected, $apps); }
$this->assertEquals($expected, $apps);
}
public function testGetKeys() {
$query = \OC_DB::prepare('SELECT DISTINCT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?');

1
tests/lib/preferences.php

@ -6,6 +6,7 @@
* later.
* See the COPYING-README file.
*/
class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
public function testGetUsers()
{

Loading…
Cancel
Save