diff options
Diffstat (limited to 'tests/UnitTests/framework')
| -rw-r--r-- | tests/UnitTests/framework/common.php | 20 | ||||
| -rw-r--r-- | tests/UnitTests/framework/utComponent.php | 3 |
2 files changed, 4 insertions, 19 deletions
diff --git a/tests/UnitTests/framework/common.php b/tests/UnitTests/framework/common.php index bcff7a89..80514875 100644 --- a/tests/UnitTests/framework/common.php +++ b/tests/UnitTests/framework/common.php @@ -40,23 +40,11 @@ class PradoUnitTestCase extends UnitTestCase { * @param string the type of exception that should be raised.
* @return boolean true
*/
- public function assertException(string $code, string $exception) {
- $pass = false;
- $code = "
-try {
- $code
-} catch ($exception \$e) {
- \$pass = true;
-}";
- eval($code);
- if ($pass) {
- $this->pass();
- } else {
- $this->fail("Code did not produce correct exception (wanted $exception, got something else");
- }
+ public function assertException(string $code, string $exceptionType) {
+ $ex = null;
+ eval("try { $code } catch ($exceptionType \$e) { \$ex = \$e; }");
+ $this->assertIsA($ex, $exceptionType);
}
}
-
-
?>
\ No newline at end of file diff --git a/tests/UnitTests/framework/utComponent.php b/tests/UnitTests/framework/utComponent.php index b47c3de9..bd13b8cb 100644 --- a/tests/UnitTests/framework/utComponent.php +++ b/tests/UnitTests/framework/utComponent.php @@ -293,9 +293,6 @@ class utComponent extends UnitTestCase public function testEnsureObject()
{
$this->assertEqual(TPropertyValue::ensureObject($this->component), $this->component);
- $this->assertNull(TPropertyValue::ensureObject(array(1,2,3)));
- $this->assertNull(TPropertyValue::ensureObject(1));
- $this->assertNull(TPropertyValue::ensureObject("foo"));
}
/**
|