diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-02 00:15:42 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-02 00:15:42 +0200 |
| commit | e789e056759aedb93d9eba3a8598acea67c842c6 (patch) | |
| tree | 584c24d7f31292ec054a3769353e450e58eb4681 | |
| parent | bb07dde9881368f5727133b73f6017deae4ff18d (diff) | |
| download | nextcloud-server-e789e056759aedb93d9eba3a8598acea67c842c6.tar.gz nextcloud-server-e789e056759aedb93d9eba3a8598acea67c842c6.zip | |
on unit test use @expectedException
some phpdoc added
| -rw-r--r-- | lib/legacy/config.php | 3 | ||||
| -rw-r--r-- | tests/lib/config.php | 15 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/legacy/config.php b/lib/legacy/config.php index f68d7c31b25..5294a48ea44 100644 --- a/lib/legacy/config.php +++ b/lib/legacy/config.php @@ -41,6 +41,9 @@ OC_Config::$object = new \OC\Config(OC::$SERVERROOT.'/config/'); class OC_Config { + /** + * @var \OC\Config + */ public static $object; /** diff --git a/tests/lib/config.php b/tests/lib/config.php index 8f52cf4ae76..c17d2ae7eff 100644 --- a/tests/lib/config.php +++ b/tests/lib/config.php @@ -11,6 +11,11 @@ class Test_Config extends PHPUnit_Framework_TestCase { const CONFIG_DIR = 'static://'; const TESTCONTENT = '<?php $CONFIG=array("foo"=>"bar");'; + /** + * @var \OC\Config + */ + private $config; + function setUp() { file_put_contents(self::CONFIG_FILE, self::TESTCONTENT); $this->config = new OC\Config(self::CONFIG_DIR); @@ -94,14 +99,12 @@ EOL , $content); } + /** + * @expectedException \OC\HintException + */ public function testWriteData() { $config = new OC\Config('/non-writable'); - try { - $config->setValue('foo', 'bar'); - } catch (\OC\HintException $e) { - return; - } - $this->fail(); + $config->setValue('foo', 'bar'); } } |