diff options
| -rwxr-xr-x | tests/PHPUnit/IntegrationTestCase.php | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index bf6c897702..19b4a92ca6 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -795,19 +795,16 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase $response = preg_replace($regex, 'idSubtable=', $response); } - // is there a better way to test for the current DB type in use? - if (Zend_Registry::get('db') instanceof Mysqli) { - // Do not test for TRUNCATE(SUM()) returning .00 on mysqli since this is not working - // http://bugs.php.net/bug.php?id=54508 - $expected = str_replace('.000000</l', '</l', $expected); //lat/long - $response = str_replace('.000000</l', '</l', $response); //lat/long - $expected = str_replace('.00</revenue>', '</revenue>', $expected); - $response = str_replace('.00</revenue>', '</revenue>', $response); - $response = str_replace('.1</revenue>', '</revenue>', $response); - $expected = str_replace('.1</revenue>', '</revenue>', $expected); - $expected = str_replace('.11</revenue>', '</revenue>', $expected); - $response = str_replace('.11</revenue>', '</revenue>', $response); - } + // Do not test for TRUNCATE(SUM()) returning .00 on mysqli since this is not working + // http://bugs.php.net/bug.php?id=54508 + $expected = str_replace('.000000</l', '</l', $expected); //lat/long + $response = str_replace('.000000</l', '</l', $response); //lat/long + $expected = str_replace('.00</revenue>', '</revenue>', $expected); + $response = str_replace('.00</revenue>', '</revenue>', $response); + $response = str_replace('.1</revenue>', '</revenue>', $response); + $expected = str_replace('.1</revenue>', '</revenue>', $expected); + $expected = str_replace('.11</revenue>', '</revenue>', $expected); + $response = str_replace('.11</revenue>', '</revenue>', $response); try { if (strpos($requestUrl, 'format=xml') !== false) { |