diff options
Diffstat (limited to 'tests/simple_unit/ActiveRecord')
3 files changed, 3 insertions, 9 deletions
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php index 85f1c944..07e810aa 100644 --- a/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php +++ b/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php @@ -40,7 +40,7 @@ class ActiveRecordDynamicCallTestCase extends UnitTestCase $rs = $finder->findByNameAndActive('Marketing');
$this->fail();
}
- catch(TActiveRecordException $e)
+ catch(TDbException $e)
{
$this->pass();
}
diff --git a/tests/simple_unit/ActiveRecord/SqliteTestCase.php b/tests/simple_unit/ActiveRecord/SqliteTestCase.php index b2d21ef1..94af6200 100644 --- a/tests/simple_unit/ActiveRecord/SqliteTestCase.php +++ b/tests/simple_unit/ActiveRecord/SqliteTestCase.php @@ -16,12 +16,6 @@ class SqliteTestCase extends UnitTestCase $user = $finder->findByPk('test');
$this->assertNotNull($user);
}
-
- function test_get_pk()
- {
- $meta = TActiveRecordManager::getInstance()->getMetaData('SqliteUsers');
- $this->assertEqual(array('username'), $meta->PrimaryKeys);
- }
}
?>
\ No newline at end of file diff --git a/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php b/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php index 29fdee49..db23f01a 100644 --- a/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php +++ b/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php @@ -54,7 +54,7 @@ class ViewRecordTestCase extends UnitTestCase $user = SimpleUser::finder()->findByPk('admin');
$this->fail();
}
- catch(TActiveRecordException $e)
+ catch(TDbException $e)
{
$this->pass();
}
@@ -67,7 +67,7 @@ class ViewRecordTestCase extends UnitTestCase SimpleUser::finder()->deleteByPk('admin');
$this->fail();
}
- catch(TActiveRecordException $e)
+ catch(TDbException $e)
{
$this->pass();
}
|