diff options
Diffstat (limited to 'tests/unit/SQLMap')
| -rw-r--r-- | tests/unit/SQLMap/CacheTest.php | 2 | ||||
| -rw-r--r-- | tests/unit/SQLMap/TAdodbConnectionTestCase.php | 7 | ||||
| -rw-r--r-- | tests/unit/SQLMap/resources/sqlmap.xml | 2 | ||||
| -rw-r--r-- | tests/unit/SQLMap/resources/test.db | bin | 5120 -> 5120 bytes | |||
| -rw-r--r-- | tests/unit/SQLMap/sqlite.xml | 2 | ||||
| -rw-r--r-- | tests/unit/SQLMap/sqlite/tests.db | bin | 32768 -> 32768 bytes |
6 files changed, 7 insertions, 6 deletions
diff --git a/tests/unit/SQLMap/CacheTest.php b/tests/unit/SQLMap/CacheTest.php index 11c250a8..4fd69916 100644 --- a/tests/unit/SQLMap/CacheTest.php +++ b/tests/unit/SQLMap/CacheTest.php @@ -96,7 +96,7 @@ class CacheTest extends BaseTest protected function getCacheModel()
{
$cache = new TSqlMapCacheModel();
- $cache->setFlushInterval(5*60);
+ // $cache->setFlushInterval(5*60);
$cache->setImplementation('LRU');
$cache->initialize($this->sqlmap);
return $cache;
diff --git a/tests/unit/SQLMap/TAdodbConnectionTestCase.php b/tests/unit/SQLMap/TAdodbConnectionTestCase.php index c0d99867..1ba0ec04 100644 --- a/tests/unit/SQLMap/TAdodbConnectionTestCase.php +++ b/tests/unit/SQLMap/TAdodbConnectionTestCase.php @@ -1,11 +1,13 @@ <?php
-require_once(SQLMAP_DIR.'/TMapper.php');
+require_once dirname(__FILE__).'/../phpunit2.php';
+
+require_once(dirname(__FILE__).'/common.php');
/**
* @package System.DataAccess
*/
-class TAdodbConnectionTestCase extends UnitTestCase
+class TAdodbConnectionTestCase extends PHPUnit2_Framework_TestCase
{
protected $db_file;
@@ -15,7 +17,6 @@ class TAdodbConnectionTestCase extends UnitTestCase $this->db_file = dirname(__FILE__).'/resources/test.db';
copy($file,$this->db_file);
$provider = new TAdodb();
- $provider->importAdodbLibrary();
}
function getDsn()
diff --git a/tests/unit/SQLMap/resources/sqlmap.xml b/tests/unit/SQLMap/resources/sqlmap.xml index b15e9862..3d20321d 100644 --- a/tests/unit/SQLMap/resources/sqlmap.xml +++ b/tests/unit/SQLMap/resources/sqlmap.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?>
<sqlMapConfig>
- <provider class="TAdodbProvider">
+ <provider class="TAdodb">
<datasource driver="sqlite" host="resources/test.db" />
</provider>
diff --git a/tests/unit/SQLMap/resources/test.db b/tests/unit/SQLMap/resources/test.db Binary files differindex f939682e..b8c158cc 100644 --- a/tests/unit/SQLMap/resources/test.db +++ b/tests/unit/SQLMap/resources/test.db diff --git a/tests/unit/SQLMap/sqlite.xml b/tests/unit/SQLMap/sqlite.xml index 62ab2aa3..27febdcb 100644 --- a/tests/unit/SQLMap/sqlite.xml +++ b/tests/unit/SQLMap/sqlite.xml @@ -9,7 +9,7 @@ </settings>
<!-- ==== Database configuration ========= -->
- <provider class="TAdodbProvider" >
+ <provider class="TAdodb" >
<datasource driver="sqlite" database="sqlite/tests.db" />
</provider>
diff --git a/tests/unit/SQLMap/sqlite/tests.db b/tests/unit/SQLMap/sqlite/tests.db Binary files differindex 380ef8fa..fa66b2cc 100644 --- a/tests/unit/SQLMap/sqlite/tests.db +++ b/tests/unit/SQLMap/sqlite/tests.db |