Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Connection is not lazy anymore, since platform detection was introduced - exposing the issue via broken test #784

Merged
merged 3 commits into from
Jan 10, 2016
Merged

Connection is not lazy anymore, since platform detection was introduced - exposing the issue via broken test #784

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d9c7c2
"Breaking" a test temporarily to show that it's not doing what is exp…
weaverryan Jan 23, 2015
d766fb4
Re-working test to use reflection and simply check that the _conn pro…
weaverryan Mar 20, 2015
9d8be7b
Updating test to verify that the wrapped connection is set to null on…
weaverryan May 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions tests/Doctrine/Tests/DBAL/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,27 @@ public function testFetchColumn()
$this->assertSame($result, $conn->fetchColumn($statement, $params, $column, $types));
}

public function testConnectionIsClosed()
public function testConnectionIsClosedButNotUnset()
{
$this->_conn->close();
// mock Connection, and make connect() purposefully do nothing
$connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
->disableOriginalConstructor()
->setMethods(array('connect'))
->getMock();

// artificially set the wrapped connection to non-null
$reflection = new \ReflectionObject($connection);
$connProperty = $reflection->getProperty('_conn');
$connProperty->setAccessible(true);
$connProperty->setValue($connection, new \stdClass);

$this->setExpectedException('Doctrine\\DBAL\\Exception\\DriverException');
// close the connection (should nullify the wrapped connection)
$connection->close();

$this->_conn->quoteIdentifier('Bug');
// the wrapped connection should be null
// (and since connect() does nothing, this will not reconnect)
// this will also fail if this _conn property was unset instead of set to null
$this->assertNull($connection->getWrappedConnection());
}

public function testFetchAll()
Expand Down