[TEST] improve code quality of tests (#610)

* [TEST] add missing namespace declarations * [TEST] fixes * [TEST] add strict_types declaration * [TEST] fix invalid expectedException classes * [TEST] remove unused uses
elastic · Aug 10, 2017 · 9ea2156 · 9ea2156
1 parent 7f43b2e
commit 9ea2156
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 15 deletions.
diff --git a/tests/Elasticsearch/Tests/ClientTest.php b/tests/Elasticsearch/Tests/ClientTest.php
@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests;
 
 use Elasticsearch;
 use Elasticsearch\ClientBuilder;
-use Elasticsearch\Connections\Connection;
 use Mockery as m;
 
 /**

diff --git a/tests/Elasticsearch/Tests/ConnectionPool/Selectors/RoundRobinSelectorTest.php b/tests/Elasticsearch/Tests/ConnectionPool/Selectors/RoundRobinSelectorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests\ConnectionPool\Selectors;
 
 use Elasticsearch;
@@ -43,7 +45,7 @@ public function testTenConnections()
     }
 
     /**
-     * Add Ten connections, select five, remove thre, test another 10 to check
+     * Add Ten connections, select five, remove three, test another 10 to check
      * that the round-robining works after removing connections
      *
      * @covers \Elasticsearch\ConnectionPool\Selectors\RoundRobinSelector::select

diff --git a/tests/Elasticsearch/Tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php b/tests/Elasticsearch/Tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests\ConnectionPool\Selectors;
 
 use Elasticsearch;

diff --git a/tests/Elasticsearch/Tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php b/tests/Elasticsearch/Tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php
@@ -1,4 +1,9 @@
 <?php
+
+declare(strict_types = 1);
+
+namespace Elasticsearch\Tests\ConnectionPool;
+
 use Elasticsearch\ClientBuilder;
 
 /**

diff --git a/tests/Elasticsearch/Tests/ConnectionPool/SniffingConnectionPoolTest.php b/tests/Elasticsearch/Tests/ConnectionPool/SniffingConnectionPoolTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Elasticsearch\Common\Exceptions\NoNodesAvailableException;
+declare(strict_types = 1);
+
+namespace Elasticsearch\Tests\ConnectionPool;
+
 use Elasticsearch\ConnectionPool\SniffingConnectionPool;
 use Mockery as m;
 
@@ -185,7 +188,7 @@ public function testAddTenNodesTimeoutAllButLast()
     }
 
     /**
-     * @expectedException Elasticsearch\Common\Exceptions\NoNodesAvailableException
+     * @expectedException \Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
     public function testAddTenNodesAllTimeout()
     {
@@ -262,7 +265,7 @@ public function testAddOneHostSniffTwo()
     }
 
     /**
-     * @expectedException Elasticsearch\Common\Exceptions\NoNodesAvailableException
+     * @expectedException \Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
     public function testAddSeed_SniffTwo_TimeoutTwo()
     {
@@ -363,7 +366,7 @@ public function testTen_TimeoutNine_SniffTenth_AddTwoAlive()
     }
 
     /**
-     * @expectedException Elasticsearch\Common\Exceptions\NoNodesAvailableException
+     * @expectedException \Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
     public function testTen_TimeoutNine_SniffTenth_AddTwoDead_TimeoutEveryone()
     {

diff --git a/tests/Elasticsearch/Tests/ConnectionPool/StaticConnectionPoolTest.php b/tests/Elasticsearch/Tests/ConnectionPool/StaticConnectionPoolTest.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests\ConnectionPool;
 
 use Elasticsearch;
-use Elasticsearch\Common\Exceptions\NoNodesAvailableException;
 use Mockery as m;
 
 /**
@@ -84,7 +85,7 @@ public function testAddMultipleHostsThenGetFirst()
     }
 
     /**
-     * @expectedException Elasticsearch\Common\Exceptions\NoNodesAvailableException
+     * @expectedException \Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
     public function testAllHostsFailPing()
     {

diff --git a/tests/Elasticsearch/Tests/Endpoints/AbstractEndpointTest.php b/tests/Elasticsearch/Tests/Endpoints/AbstractEndpointTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests\Endpoints;
 
 use Elasticsearch\Endpoints\AbstractEndpoint;
@@ -18,7 +20,7 @@ public static function invalidParameters()
 
     /**
      * @dataProvider invalidParameters
-     * @expectedException Elasticsearch\Common\Exceptions\UnexpectedValueException
+     * @expectedException \Elasticsearch\Common\Exceptions\UnexpectedValueException
      */
     public function testInvalidParamsCauseErrorsWhenProvidedToSetParams(array $params)
     {

diff --git a/tests/Elasticsearch/Tests/Helper/Iterators/SearchResponseIteratorTest.php b/tests/Elasticsearch/Tests/Helper/Iterators/SearchResponseIteratorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests\Helper\Iterators;
 
 use Elasticsearch\Helper\Iterators\SearchResponseIterator;

diff --git a/tests/Elasticsearch/Tests/RegisteredNamespaceTest.php b/tests/Elasticsearch/Tests/RegisteredNamespaceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests;
 
 use Elasticsearch;
@@ -62,4 +64,4 @@ public function fooMethod()
     {
         return "123";
     }
-}
+}
diff --git a/tests/Elasticsearch/Tests/Serializers/ArrayToJSONSerializerTest.php b/tests/Elasticsearch/Tests/Serializers/ArrayToJSONSerializerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests\Serializers;
 
 use Elasticsearch\Serializers\ArrayToJSONSerializer;

diff --git a/tests/Elasticsearch/Tests/Serializers/EverythingToJSONSerializerTest.php b/tests/Elasticsearch/Tests/Serializers/EverythingToJSONSerializerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests\Serializers;
 
 use Elasticsearch\Serializers\EverythingToJSONSerializer;

diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Elasticsearch\Tests;
 
 use Doctrine\Common\Inflector\Inflector;
@@ -12,11 +14,9 @@
 use Elasticsearch\Common\Exceptions\ServerErrorResponseException;
 use Elasticsearch\Common\Exceptions\RoutingMissingException;
 use GuzzleHttp\Ring\Future\FutureArrayInterface;
-use stdClass;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Parser;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -31,7 +31,7 @@
  */
 class YamlRunnerTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var Parser Yaml parser for reading integrations tests */
+    /** @var \Symfony\Component\Yaml\Yaml Yaml parser for reading integrations tests */
     private $yaml;
 
     /** @var Elasticsearch\Client client used by elasticsearch */
@@ -1029,8 +1029,8 @@ private function waitForYellow()
             ++$counter;
 
             if ($counter > 10) {
-                $this->log("Aborting test due to failure in clearing cluster.\n");
-                $this->log(print_r($response, true));
+                echo "Aborting test due to failure in clearing cluster.\n";
+                echo print_r($response, true);
                 exit;
             }
         }

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 error_reporting(E_ALL | E_STRICT);
 
 // Set the default timezone. While this doesn't cause any tests to fail, PHP

diff --git a/util/EnsureClusterAlive.php b/util/EnsureClusterAlive.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 error_reporting(E_ALL | E_STRICT);
 
 // Set the default timezone. While this doesn't cause any tests to fail, PHP

diff --git a/util/RestSpecRunner.php b/util/RestSpecRunner.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 error_reporting(E_ALL | E_STRICT);
 
 // Set the default timezone. While this doesn't cause any tests to fail, PHP

diff --git a/util/SpecParser.php b/util/SpecParser.php
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+declare(strict_types = 1);
+
 require_once '../vendor/autoload.php';
 
 $loader = new Twig_Loader_Filesystem('templates');