Fix test in respect of expected exceptions

facile-it · Oct 30, 2020 · 07326c1 · 07326c1
1 parent 44f41ba
commit 07326c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/tests/functional/FunctionalTest.php b/tests/functional/FunctionalTest.php
@@ -61,12 +61,13 @@ private function setConnectionTimeout(\Doctrine\DBAL\Connection $connection, int
 
     public function testExecuteQueryShouldNotReconnect(): void
     {
-        $this->expectException(DBALException::class);
-
         $connection = $this->createConnection(0);
         $this->assertSame(1, $connection->connectCount);
         $this->setConnectionTimeout($connection, 2);
         sleep(3);
+
+        $this->expectException(DBALException::class);
+
         $connection->executeQuery('SELECT 1');
     }
 

diff --git a/tests/unit/ConnectionTest.php b/tests/unit/ConnectionTest.php
@@ -70,8 +70,6 @@ public function testConstructor(): void
 
     public function testConstructorWithInvalidDriver(): void
     {
-        $this->expectException(InvalidArgumentException::class);
-
         $driver = $this->prophesize(Driver::class);
         $configuration = $this->prophesize(Configuration::class);
         $eventManager = $this->prophesize(EventManager::class);
@@ -84,14 +82,14 @@ public function testConstructorWithInvalidDriver(): void
             'platform' => $platform->reveal()
         ];
 
-        $connection = new Connection(
+        $this->expectException(InvalidArgumentException::class);
+
+        new Connection(
             $params,
             $driver->reveal(),
             $configuration->reveal(),
             $eventManager->reveal()
         );
-
-        static::assertInstanceOf(Connection::class, $connection);
     }
 
     /**