Unverified Commit 426f811a authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2960981 by jtriguero, benjifisher: Change getConnectionID to getConnectionId in kernel tests

(cherry picked from commit 927e9f07)
parent 5db6ae16
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ protected function addConnection() {
   *
   * @return int
   */
  protected function getConnectionID() {
  protected function getConnectionId() {
    return (int) Database::getConnection($this->target, $this->key)->query('SELECT CONNECTION_ID()')->fetchField();
  }

@@ -92,7 +92,7 @@ protected function assertNoConnection($id) {
  /**
   * Tests Database::closeConnection() without query.
   *
   * @todo getConnectionID() executes a query.
   * @todo getConnectionId() executes a query.
   */
  public function testOpenClose() {
    if ($this->skipTest) {
@@ -100,7 +100,7 @@ public function testOpenClose() {
    }
    // Add and open a new connection.
    $this->addConnection();
    $id = $this->getConnectionID();
    $id = $this->getConnectionId();
    Database::getConnection($this->target, $this->key);

    // Verify that there is a new connection.
@@ -124,7 +124,7 @@ public function testOpenQueryClose() {
    }
    // Add and open a new connection.
    $this->addConnection();
    $id = $this->getConnectionID();
    $id = $this->getConnectionId();
    Database::getConnection($this->target, $this->key);

    // Verify that there is a new connection.
@@ -151,7 +151,7 @@ public function testOpenQueryPrefetchClose() {
    }
    // Add and open a new connection.
    $this->addConnection();
    $id = $this->getConnectionID();
    $id = $this->getConnectionId();
    Database::getConnection($this->target, $this->key);

    // Verify that there is a new connection.
@@ -178,7 +178,7 @@ public function testOpenSelectQueryClose() {
    }
    // Add and open a new connection.
    $this->addConnection();
    $id = $this->getConnectionID();
    $id = $this->getConnectionId();
    Database::getConnection($this->target, $this->key);

    // Verify that there is a new connection.