Fixed tests for quoteValue() methods in all Platform classes #7251
Conversation
| $this->assertEquals("E'value'", @$this->platform->quoteValue('value')); | ||
| $this->assertEquals("E'Foo O\\'Bar'", @$this->platform->quoteValue("Foo O'Bar")); | ||
| $this->assertEquals('E\'\\\'; DELETE FROM some_table; -- \'', @$this->platform->quoteValue('\'; DELETE FROM some_table; -- ')); | ||
| $this->assertEquals("E'\\\\\\'; DELETE FROM some_table; -- '", @$this->platform->quoteValue('\\\'; DELETE FROM some_table; -- ')); |
There was a problem hiding this comment.
Can you please check this against the changes introduced to fix ZF2015-02? I'm pretty sure we changed escaping to better match the recommendations made by PostgreSQL.
|
Yes, the PR is based on yesterday's snapshot of the develop branch, which contains the fix in afe4172. The improvement to quoteValue() and quoteTrustedValue() is the 'E' prefix. This had been added to testQuoteTrustedValue(), but forgotten in testQuoteValue(), where it made no difference for the reason mentioned in the initial post. This PR contains the updated assertions copied to testQuoteValue(), in addition to the structural changes to the test. |
|
@hschletz Can you please rebase against develop, so I can merge? I need that done by tomorrow, 19 March 2015; otherwise, we'll have to review after the 2.4 release. |
|
Rebased against latest HEAD, merged into single commit. |
Fixed tests for quoteValue() methods in all Platform classes
The tests for quoteValue() are incomplete. When quoteValue() raises an E_USER_NOTICE, PHPUnit converts it to an exception which is tested. The tests try to check the return value, but neither the return value generating code nor the assertion are executed. The tests pass, but only the error message is effectively tested.
I split the tests: One test checks the exception as usual, but the return value is discarded (It would be NULL anyway within a PHPUnit environment - in other context a value would be returned, but that is difficult to test). I also tightened the exception type check from PHPUnit_Framework_Error to PHPUnit_Framework_Error_Notice.
The other test executes quoteValue() with error suppression so that the return value can be checked. Since quoteValue() and quoteTrustedValue() are implemented separately, I added the full set of test values to the test.