diff options
author | Simon Holywell <[email protected]> | 2013-01-23 14:36:22 +0000 |
---|---|---|
committer | Simon Holywell <[email protected]> | 2013-01-23 14:36:22 +0000 |
commit | 8fae01b172b5c6006e6f96383f538147d73601b6 (patch) | |
tree | d1710b9c426a5e6f8ff79d2a09e4a38ee2342061 /test/IdiormResultSetTest.php | |
parent | b10aff0001e61565831cc0578d4a939619f59643 (diff) | |
parent | f5e4e1d6e8b8c5b4bccc5033524c26a628465d47 (diff) |
Merge branch 'develop' into multiple-connections
Conflicts:
test/test_classes.php
test/test_queries.php
Diffstat (limited to 'test/IdiormResultSetTest.php')
-rw-r--r-- | test/IdiormResultSetTest.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/IdiormResultSetTest.php b/test/IdiormResultSetTest.php index 34d42a0..f41205a 100644 --- a/test/IdiormResultSetTest.php +++ b/test/IdiormResultSetTest.php @@ -2,6 +2,20 @@ class IdiormResultSetTest extends PHPUnit_Framework_TestCase { + public function setUp() { + // Enable logging + ORM::configure('logging', true); + + // Set up the dummy database connection + $db = new MockPDO('sqlite::memory:'); + ORM::set_db($db); + } + + public function tearDown() { + ORM::configure('logging', false); + ORM::set_db(null); + } + public function testGet() { $IdiormResultSet = new IdiormResultSet(); $this->assertInternalType('array', $IdiormResultSet->get_results()); |