Modified tests to reset locale
This commit is contained in:
parent
a1ef7ef042
commit
c416fa72c2
|
@ -452,6 +452,14 @@ function setUSAnsiLocale()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function resetLocaleToDefault()
|
||||||
|
{
|
||||||
|
// Like setUSAnsiLocale() above, this method is only needed in non-Windows environment
|
||||||
|
if (!isWindows()) {
|
||||||
|
setlocale(LC_ALL, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// non-UTF8 locale support in ODBC 17 and above only
|
// non-UTF8 locale support in ODBC 17 and above only
|
||||||
// if AE enabled, only supported in Windows (AE limitations)
|
// if AE enabled, only supported in Windows (AE limitations)
|
||||||
function isLocaleSupported()
|
function isLocaleSupported()
|
||||||
|
|
|
@ -107,6 +107,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
prepareAndExecute(5);
|
prepareAndExecute(5);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -85,6 +85,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
fetchFields();
|
fetchFields();
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -115,6 +115,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
fetchFields();
|
fetchFields();
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -170,6 +170,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
fetchRow(1, 4);
|
fetchRow(1, 4);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -145,6 +145,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
fetchRow(0, 2);
|
fetchRow(0, 2);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -103,6 +103,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
fetchFields();
|
fetchFields();
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -154,6 +154,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
fetchRow(10);
|
fetchRow(10);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -148,6 +148,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
streamRead(20, 1);
|
streamRead(20, 1);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -184,6 +184,7 @@ endTest($testName);
|
||||||
startTest($testName);
|
startTest($testName);
|
||||||
try {
|
try {
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
streamScroll(20, 1);
|
streamScroll(20, 1);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
|
|
|
@ -264,6 +264,7 @@ else {
|
||||||
|
|
||||||
// test utf8
|
// test utf8
|
||||||
setUTF8Data(true);
|
setUTF8Data(true);
|
||||||
|
resetLocaleToDefault();
|
||||||
runtest();
|
runtest();
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in a new issue