Skip to content
Permalink
Browse files

make sure locale is restored correct in tests

  • Loading branch information...
ceeram committed Mar 3, 2012
1 parent 169c99c commit 2a7bee0a5cc1144084c133c0b0e3f2f320b45021
@@ -146,7 +146,7 @@ public function testQuoting() {
public function testLocalizedFloats() {
$this->skipIf(DS === '\\', 'The locale is not supported in Windows and affect the others tests.');
$restore = setlocale(LC_ALL, null);
$restore = setlocale(LC_ALL, 0);
setlocale(LC_ALL, 'de_DE');
$result = $this->Dbo->value(3.141593);
@@ -3505,7 +3505,7 @@ public function testUpdateStatements() {
->with("UPDATE `$db`.`articles` SET `field1` = 'value1' WHERE 1 = 1");
$this->Dbo->expects($this->at(1))->method('execute')
->with("UPDATE `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` ON " .
->with("UPDATE `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` ON " .
"(`Article`.`user_id` = `User`.`id`)" .
" SET `Article`.`field1` = 2 WHERE 2=2");
@@ -3538,7 +3538,7 @@ public function testDeleteStatements() {
->with("DELETE FROM `$db`.`articles` WHERE 1 = 1");
$this->Dbo->expects($this->at(1))->method('execute')
->with("DELETE `Article` FROM `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` " .
->with("DELETE `Article` FROM `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` " .
"ON (`Article`.`user_id` = `User`.`id`)" .
" WHERE 1 = 1");
@@ -344,7 +344,7 @@ public function testValueQuoting() {
* @return void
*/
public function testLocalizedFloats() {
$restore = setlocale(LC_ALL, null);
$restore = setlocale(LC_ALL, 0);
setlocale(LC_ALL, 'de_DE');
$result = $this->db->value(3.141593, 'float');
@@ -6253,7 +6253,7 @@ public function testUpdateAllWithoutForeignKey() {
* @return void
*/
public function testWriteFloatAsGerman() {
$restore = setlocale(LC_ALL, null);
$restore = setlocale(LC_ALL, 0);
setlocale(LC_ALL, 'de_DE');
$model = new DataTest();

0 comments on commit 2a7bee0

Please sign in to comment.
You can’t perform that action at this time.