Fix exception-throwing tests

Author: ben221199

.travis.yml

@@ -35,7 +35,6 @@ before_install:
 install: composer update --prefer-dist --no-interaction
 
 before_script:
-  - XDEBUG_MODE=coverage
   - composer dump-autoload
   - cd tests
   - $TRAVIS_BUILD_DIR/tests/run.sh

tests/SphinxQL/ConnectionTest.php

@@ -80,11 +80,9 @@ public function testGetConnection()
         $this->assertNotNull($this->connection->getConnection());
     }
 
-    /**
-     * @expectedException Foolz\SphinxQL\Exception\ConnectionException
-     */
     public function testGetConnectionThrowsException()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\ConnectionException::class);
         $this->connection->getConnection();
     }
 
@@ -96,11 +94,9 @@ public function testConnect()
         $this->connection->connect();
     }
 
-    /**
-     * @expectedException Foolz\SphinxQL\Exception\ConnectionException
-     */
     public function testConnectThrowsException()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\ConnectionException::class);
         $this->connection->setParam('port', 9308);
         $this->connection->connect();
     }
@@ -111,11 +107,9 @@ public function testPing()
         $this->assertTrue($this->connection->ping());
     }
 
-    /**
-     * @expectedException Foolz\SphinxQL\Exception\ConnectionException
-     */
     public function testClose()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\ConnectionException::class);
         $encoding = mb_internal_encoding();
         $this->connection->connect();
 
@@ -150,29 +144,23 @@ public function testMultiQuery()
         ), $query->getNext()->fetchAllAssoc());
     }
 
-    /**
-     * @expectedException        Foolz\SphinxQL\Exception\SphinxQLException
-     * @expectedExceptionMessage The Queue is empty.
-     */
     public function testEmptyMultiQuery()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\SphinxQLException::class);
+        $this->expectExceptionMessage('The Queue is empty.');
         $this->connection->connect();
         $this->connection->multiQuery(array());
     }
 
-    /**
-     * @expectedException Foolz\SphinxQL\Exception\DatabaseException
-     */
     public function testMultiQueryThrowsException()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\DatabaseException::class);
         $this->connection->multiQuery(array('SHOW METAL'));
     }
 
-    /**
-     * @expectedException Foolz\SphinxQL\Exception\DatabaseException
-     */
     public function testQueryThrowsException()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\DatabaseException::class);
         $this->connection->query('SHOW METAL');
     }
 
@@ -182,11 +170,9 @@ public function testEscape()
         $this->assertEquals('\'\\\' \\"\\" \\\'\\\' \'', $result);
     }
 
-    /**
-     * @expectedException Foolz\SphinxQL\Exception\ConnectionException
-     */
     public function testEscapeThrowsException()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\ConnectionException::class);
         // or we get the wrong error popping up
         $this->connection->setParam('port', 9308);
         $this->connection->connect();

tests/SphinxQL/HelperTest.php

@@ -163,12 +163,10 @@ public function testCallKeywords()
         );
     }
 
-    /**
-     * @expectedException        Foolz\SphinxQL\Exception\DatabaseException
-     * @expectedExceptionMessage Sphinx expr: syntax error
-     */
     public function testUdfNotInstalled()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\DatabaseException::class);
+        $this->expectExceptionMessage('Sphinx expr: syntax error');
         $this->conn->query('SELECT MY_UDF()');
     }
 

tests/SphinxQL/MultiResultSetTest.php

@@ -119,11 +119,9 @@ public function testStore()
         $this->assertEquals(8, $all[0]['count(*)']);
     }
 
-    /**
-     * @expectedException Foolz\SphinxQL\Exception\DatabaseException
-     */
     public function testInvalidStore()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\DatabaseException::class);
         $this->refill();
 
         $res = self::$conn->multiQuery(array('SELECT COUNT(*) FROM rt', 'SHOW META'));

tests/SphinxQL/ResultSetTest.php

@@ -102,12 +102,10 @@ public function testToRow()
         $res->freeResult();
     }
 
-    /**
-     * @expectedException        Foolz\SphinxQL\Exception\ResultSetException
-     * @expectedExceptionMessage The row does not exist.
-     */
     public function testToRowThrows()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\ResultSetException::class);
+        $this->expectExceptionMessage("The row does not exist.");
         $this->refill();
         $res = self::$conn->query('SELECT * FROM rt');
         $res->toRow(8);
@@ -134,12 +132,10 @@ public function testToNextRow()
         $res->freeResult();
     }
 
-    /**
-     * @expectedException        Foolz\SphinxQL\Exception\ResultSetException
-     * @expectedExceptionMessage The row does not exist.
-     */
     public function testToNextRowThrows()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\ResultSetException::class);
+        $this->expectExceptionMessage("The row does not exist.");
         $this->refill();
         $res = self::$conn->query('SELECT * FROM rt WHERE id = 10');
         $res->toNextRow()->toNextRow();

tests/SphinxQL/SphinxQLTest.php

@@ -899,12 +899,10 @@ public function testQueue()
         $this->assertEquals('11', $result[2][0]['id']);
     }
 
-    /**
-     * @expectedException        Foolz\SphinxQL\Exception\SphinxQLException
-     * @expectedExceptionMessage There is no Queue present to execute.
-     */
     public function testEmptyQueue()
     {
+        $this->expectException(Foolz\SphinxQL\Exception\SphinxQLException::class);
+        $this->expectExceptionMessage("There is no Queue present to execute.");
         $this->createSphinxQL()
             ->executeBatch()
             ->getStored();