From 5062b8f1f050d8cc338b4de6baec74ebaea15d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 3 Jul 2012 10:51:00 +0200 Subject: [PATCH 1/2] loadCss no longer accepts parameter --- test/classes/PMA_Theme_test.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php index f8ee9e5579..6d48747d5b 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/PMA_Theme_test.php @@ -213,16 +213,9 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase $this->assertEquals('/new/path', $this->object->getImgPath()); } - public function testLoadCssWrongType() + public function testLoadCss() { - $type = 'middle'; - $this->assertFalse($this->object->loadCss($type)); - } - - public function testLoadCssNotExisted() - { - $type = 'print'; - $this->assertFalse($this->object->loadCss($type)); + $this->assertTrue($this->object->loadCss()); } /** From 096e50d66c338bf7110cfdf34f2f771066b1e547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 3 Jul 2012 10:54:34 +0200 Subject: [PATCH 2/2] Expect at least some output --- test/classes/PMA_Theme_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php index 6d48747d5b..72be8dd8b9 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/PMA_Theme_test.php @@ -215,6 +215,7 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase public function testLoadCss() { + $this->expectOutputRegex('/.*FILE: codemirror.css.php.*/'); $this->assertTrue($this->object->loadCss()); }