Skip to content

Commit a715525

Browse files
committed
improvements for Model Test
1 parent 118323c commit a715525

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

src/Tests/PersistUnit/ModelTest.php

+9-14
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use PhpPlatform\Config\SettingsCache;
1515
use PhpPlatform\JSONCache\Cache;
1616
use PhpPlatform\Errors\ErrorHandler;
17-
use PhpPlatform\Persist\TransactionManager;
1817

1918
abstract class ModelTest extends DBUnitTestcase{
2019

@@ -91,13 +90,15 @@ public static function setUpBeforeClass(){
9190
$cacheObj->reset();
9291
}
9392

94-
MockSettings::setSettings('php-platform/persist', "dbHost", $host);
95-
MockSettings::setSettings('php-platform/persist', "dbPort", $port);
96-
MockSettings::setSettings('php-platform/persist', "dbName", self::$_databaseName);
97-
MockSettings::setSettings('php-platform/persist', "dbUsername", $username);
98-
MockSettings::setSettings('php-platform/persist', "dbPassword", $password);
99-
MockSettings::setSettings('php-platform/persist', "outputDateTimeFormat", "%Y-%m-%d %H:%i:%S");
100-
93+
MockSettings::setSettings('php-platform/persist', "mysql.host", $host);
94+
MockSettings::setSettings('php-platform/persist', "mysql.port", $port);
95+
MockSettings::setSettings('php-platform/persist', "mysql.dbname", self::$_databaseName);
96+
MockSettings::setSettings('php-platform/persist', "mysql.username", $username);
97+
MockSettings::setSettings('php-platform/persist', "mysql.password", $password);
98+
MockSettings::setSettings('php-platform/persist', "mysql.outputDateFormat", "%Y-%m-%d");
99+
MockSettings::setSettings('php-platform/persist', "mysql.outputTimeFormat", "%H:%i:%S");
100+
MockSettings::setSettings('php-platform/persist', "mysql.outputDateTimeFormat", "%Y-%m-%d %H:%i:%S");
101+
101102
$logFile = getenv('sqlLogFile');
102103
if($logFile){
103104
MockSettings::setSettings('php-platform/persist', "sqlLogFile", $logFile);
@@ -120,12 +121,6 @@ public static function setUpBeforeClass(){
120121

121122
public static function tearDownAfterClass(){
122123

123-
$transaction = TransactionManager::$transaction;
124-
while ($transaction != null){
125-
TransactionManager::abortTransaction();
126-
$transaction = TransactionManager::$transaction;
127-
}
128-
129124
// create pdo without database
130125
$_pdo = new PDO('mysql:host='.self::$_connectionParams['host'].';port='.self::$_connectionParams['port'], self::$_connectionParams['username'],self::$_connectionParams['password']);
131126

0 commit comments

Comments
 (0)