Update unit tests to be 1.0 compatible

elastic · Jan 24, 2014 · c386538 · c386538
1 parent 08cabbe
commit c386538
Show file tree

Hide file tree

Showing 29 changed files with 221 additions and 405 deletions.
diff --git a/tests/Elasticsearch/Tests/ClientTest.php b/tests/Elasticsearch/Tests/ClientTest.php
@@ -64,7 +64,7 @@ public function testBadHost()
             '127.0.0.1:8200',
         ));
         $client = new Elasticsearch\Client($params);
-        $client->exists(array("index" => 'test', 'id' => 'test'));
+        $client->exists(array("index" => 'test', 'type' => 'test', 'id' => 'test'));
 
     }
 
@@ -91,7 +91,7 @@ public function testZeroRetries()
             'hosts' => array('localhost:8000')
         );
         $client = new Elasticsearch\Client($params);
-        $client->exists(array("index" => 'test', 'id' => 'test'));
+        $client->exists(array("index" => 'test', 'type' => 'test', 'id' => 'test'));
 
     }
 

diff --git a/...Endpoints/Cluster/Node/HotThreadsTest.php → ...ndpoints/Cluster/Nodes/HotThreadsTest.php b/...Endpoints/Cluster/Node/HotThreadsTest.php → ...ndpoints/Cluster/Nodes/HotThreadsTest.php
@@ -5,10 +5,10 @@
  * Time: 1:02 PM
  */
 
-namespace Elasticsearch\Tests\Endpoints\Cluster\Node;
+namespace Elasticsearch\Tests\Endpoints\Cluster\Nodes;
 
 use Elasticsearch\Common\Exceptions\InvalidArgumentException;
-use Elasticsearch\Endpoints\Cluster\Node\HotThreads;
+use Elasticsearch\Endpoints\Cluster\Nodes\HotThreads;
 use Mockery as m;
 
 /**
@@ -18,7 +18,7 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link    http://elasticsearch.org
  */
-class SettingsTest extends \PHPUnit_Framework_TestCase
+class HotThreadsTest extends \PHPUnit_Framework_TestCase
 {
     public function tearDown() {
         m::close();
@@ -31,7 +31,7 @@ public function testValidSettingsWithNodeID()
                          ->shouldReceive('performRequest')->once()->once()
                          ->with(
                                  'GET',
-                                 '/_cluster/nodes/abc/hot_threads',
+                                 '/_cluster/nodes/abc/hotthreads',
                                  array(),
                                  null
                              )
@@ -53,10 +53,9 @@ public function testValidSettingsWithInvalidNodeID()
 
         $action = new HotThreads($mockTransport);
 
-        $nodeID = array('field' => 'value');
+        $nodeID = new \stdClass();
 
-        $action->setNodeID($nodeID)
-        ->performRequest();
+        $action->setNodeID($nodeID);;
 
     }
 
@@ -66,7 +65,7 @@ public function testValidSettingsWithoutNodeID()
                          ->shouldReceive('performRequest')->once()
                          ->with(
                                  'GET',
-                                 '/_cluster/nodes/hot_threads',
+                                 '/_cluster/nodes/hotthreads',
                                  array(),
                                  null
                              )

diff --git a/...Tests/Endpoints/Cluster/Node/InfoTest.php → ...ests/Endpoints/Cluster/Nodes/InfoTest.php b/...Tests/Endpoints/Cluster/Node/InfoTest.php → ...ests/Endpoints/Cluster/Nodes/InfoTest.php
@@ -5,10 +5,10 @@
  * Time: 1:02 PM
  */
 
-namespace Elasticsearch\Tests\Endpoints\Cluster\Node;
+namespace Elasticsearch\Tests\Endpoints\Cluster\Nodes;
 
 use Elasticsearch\Common\Exceptions\InvalidArgumentException;
-use Elasticsearch\Endpoints\Cluster\Node\Info;
+use Elasticsearch\Endpoints\Cluster\Nodes\Info;
 use Mockery as m;
 
 /**
@@ -31,7 +31,7 @@ public function testValidSettingsWithNodeID()
                          ->shouldReceive('performRequest')->once()->once()
                          ->with(
                                  'GET',
-                                 '/_cluster/nodes/abc',
+                                 '/_nodes/abc',
                                  array(),
                                  null
                              )
@@ -53,7 +53,7 @@ public function testValidSettingsWithInvalidNodeID()
 
         $action = new Info($mockTransport);
 
-        $nodeID = array('field' => 'value');
+        $nodeID = new \stdClass();
 
         $action->setNodeID($nodeID)
         ->performRequest();
@@ -66,7 +66,7 @@ public function testValidSettingsWithoutNodeID()
                          ->shouldReceive('performRequest')->once()
                          ->with(
                                  'GET',
-                                 '/_cluster/nodes',
+                                 '/_nodes',
                                  array(),
                                  null
                              )

diff --git a/...s/Endpoints/Cluster/Node/ShutdownTest.php → .../Endpoints/Cluster/Nodes/ShutdownTest.php b/...s/Endpoints/Cluster/Node/ShutdownTest.php → .../Endpoints/Cluster/Nodes/ShutdownTest.php
@@ -8,7 +8,7 @@
 namespace Elasticsearch\Tests\Endpoints\Cluster\Node;
 
 use Elasticsearch\Common\Exceptions\InvalidArgumentException;
-use Elasticsearch\Endpoints\Cluster\Node\Shutdown;
+use Elasticsearch\Endpoints\Cluster\Nodes\Shutdown;
 use Mockery as m;
 
 /**
@@ -53,7 +53,7 @@ public function testValidSettingsWithInvalidNodeID()
 
         $action = new Shutdown($mockTransport);
 
-        $nodeID = array('field' => 'value');
+        $nodeID = new \stdClass();
 
         $action->setNodeID($nodeID)
         ->performRequest();
@@ -66,7 +66,7 @@ public function testValidSettingsWithoutNodeID()
                          ->shouldReceive('performRequest')->once()
                          ->with(
                                  'POST',
-                                 '/_cluster/nodes/_shutdown',
+                                 '/_shutdown',
                                  array(),
                                  null
                              )

diff --git a/tests/Elasticsearch/Tests/Endpoints/Cluster/RerouteTest.php b/tests/Elasticsearch/Tests/Endpoints/Cluster/RerouteTest.php
@@ -45,22 +45,6 @@ public function testSetBody()
 
     }
 
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetIllegalBody()
-    {
-        $query = 5;
-
-        $mockTransport = m::mock('\Elasticsearch\Transport');
-
-        $action = new Reroute($mockTransport);
-        $action->setBody($query)
-        ->performRequest();
-
-    }
-
     public function testValidReroute()
     {
         $mockTransport = m::mock('\Elasticsearch\Transport')

diff --git a/tests/Elasticsearch/Tests/Endpoints/Cluster/Settings/PutTest.php b/tests/Elasticsearch/Tests/Endpoints/Cluster/Settings/PutTest.php
@@ -5,7 +5,7 @@
  * Time: 1:02 PM
  */
 
-namespace Elasticsearch\Tests\Endpoints\Cluster\Puttings;
+namespace Elasticsearch\Tests\Endpoints\Cluster\Settings;
 
 use Elasticsearch\Common\Exceptions\InvalidArgumentException;
 use Elasticsearch\Endpoints\Cluster\Settings\Put;
@@ -45,22 +45,6 @@ public function testPutBody()
 
     }
 
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testPutIllegalBody()
-    {
-        $query = 5;
-
-        $mockTransport = m::mock('\Elasticsearch\Transport');
-
-        $action = new Put($mockTransport);
-        $action->setBody($query)
-        ->performRequest();
-
-    }
-
     public function testValidPutWithBody()
     {
         $Puttings = array('field' => 'value');

diff --git a/tests/Elasticsearch/Tests/Endpoints/CountTest.php b/tests/Elasticsearch/Tests/Endpoints/CountTest.php
@@ -27,7 +27,7 @@ public function tearDown() {
     public function testGetURIWithNoIndexOrType()
     {
 
-        $uri = '/_all/_count';
+        $uri = '/_count';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
                          ->shouldReceive('performRequest')->once()

diff --git a/tests/Elasticsearch/Tests/Endpoints/Indices/Alias/AliasesTest.php b/tests/Elasticsearch/Tests/Endpoints/Indices/Alias/AliasesTest.php
@@ -8,8 +8,8 @@
 namespace Elasticsearch\Tests\Endpoints\Indices\Alias;
 
 use Elasticsearch\Common\Exceptions\InvalidArgumentException;
-use Elasticsearch\Common\Exceptions\RuntimeException;
-use Elasticsearch\Endpoints\Indices\Alias\Aliases;
+use Elasticsearch\Endpoints\Indices\Aliases\Get;
+use Elasticsearch\Endpoints\Indices\Aliases\Update;
 use Mockery as m;
 
 /**
@@ -26,17 +26,6 @@ public function tearDown() {
         m::close();
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetStringBody()
-    {
-        $body = 'value';
-        $mockTransport = m::mock('\Elasticsearch\Transport');
-        $action = new Aliases($mockTransport);
-        $action->setBody($body)->performRequest();
-    }
-
     public function testSetArrayBody()
     {
         $body = array('field' => 'value');
@@ -50,7 +39,7 @@ public function testSetArrayBody()
                              )
                          ->getMock();
 
-        $action = new Aliases($mockTransport);
+        $action = new Update($mockTransport);
         $action->setBody($body)->performRequest();
 
     }
@@ -68,7 +57,7 @@ public function testValidAliasesWithoutIndex()
                              )
                          ->getMock();
 
-        $action = new Aliases($mockTransport);
+        $action = new Get($mockTransport);
         $action->performRequest();
 
     }
@@ -86,7 +75,7 @@ public function testValidAliasesWithIndex()
                              )
                          ->getMock();
 
-        $action = new Aliases($mockTransport);
+        $action = new Get($mockTransport);
         $action->setIndex('testIndex')->performRequest();
 
     }

diff --git a/tests/Elasticsearch/Tests/Endpoints/Indices/Alias/GetTest.php b/tests/Elasticsearch/Tests/Endpoints/Indices/Alias/GetTest.php
@@ -7,7 +7,6 @@
 
 namespace Elasticsearch\Tests\Endpoints\Indices\Alias;
 
-use Elasticsearch\Common\Exceptions\RuntimeException;
 use Elasticsearch\Endpoints\Indices\Alias\Get;
 use Mockery as m;
 
@@ -25,25 +24,35 @@ public function tearDown() {
         m::close();
     }
 
-
-    /**
-     * @expectedException RuntimeException
-     */
     public function testNoIndexOrName()
     {
-        $mockTransport = m::mock('\Elasticsearch\Transport');
+        $mockTransport = m::mock('\Elasticsearch\Transport')
+                         ->shouldReceive('performRequest')->once()
+                         ->with(
+                                 'GET',
+                                 '/_alias',
+                                 array(),
+                                 null
+                             )
+                         ->getMock();
 
         $action = new Get($mockTransport);
         $action->performRequest();
 
     }
 
-    /**
-     * @expectedException RuntimeException
-     */
+
     public function testNoName()
     {
-        $mockTransport = m::mock('\Elasticsearch\Transport');
+        $mockTransport = m::mock('\Elasticsearch\Transport')
+                         ->shouldReceive('performRequest')->once()
+                         ->with(
+                                 'GET',
+                                 '/testIndex/_alias',
+                                 array(),
+                                 null
+                             )
+                         ->getMock();
 
         $action = new Get($mockTransport);
         $action->setIndex('testIndex')->performRequest();

diff --git a/tests/Elasticsearch/Tests/Endpoints/Indices/Alias/PutTest.php b/tests/Elasticsearch/Tests/Endpoints/Indices/Alias/PutTest.php
@@ -28,17 +28,6 @@ public function tearDown() {
     }
 
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetStringBody()
-    {
-        $body = 'value';
-        $mockTransport = m::mock('\Elasticsearch\Transport');
-        $action = new Put($mockTransport);
-        $action->setBody($body)->performRequest();
-    }
-
     public function testSetArrayBody()
     {
         $body = array('field' => 'value');
@@ -68,13 +57,18 @@ public function testNoBody()
     }
 
 
-    /**
-     * @expectedException RuntimeException
-     */
     public function testNoIndex()
     {
         $body = array('field' => 'value');
-        $mockTransport = m::mock('\Elasticsearch\Transport');
+        $mockTransport = m::mock('\Elasticsearch\Transport')
+                         ->shouldReceive('performRequest')->once()
+                         ->with(
+                                 'PUT',
+                                 '/_alias/testName',
+                                 array(),
+                                 $body
+                             )
+                         ->getMock();
 
         $action = new Put($mockTransport);
         $action->setBody($body)->setName('testName')->performRequest();

diff --git a/tests/Elasticsearch/Tests/Endpoints/Indices/AnalyzeTest.php b/tests/Elasticsearch/Tests/Endpoints/Indices/AnalyzeTest.php
@@ -45,22 +45,6 @@ public function testSetBody()
 
     }
 
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetIllegalQuery()
-    {
-        $body = array('field' => 'value');
-
-        $mockTransport = m::mock('\Elasticsearch\Transport');
-
-        $action = new Analyze($mockTransport);
-        $action->setBody($body)
-        ->performRequest();
-
-    }
-
     public function testGetURIWithNoIndex()
     {
 

diff --git a/tests/Elasticsearch/Tests/Endpoints/Indices/CreateTest.php b/tests/Elasticsearch/Tests/Endpoints/Indices/CreateTest.php
@@ -36,22 +36,6 @@ public function testSetBody()
 
     }
 
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetIllegalQuery()
-    {
-        $body = 'abc';
-
-        $mockTransport = m::mock('\Elasticsearch\Transport');
-
-        $action = new Create($mockTransport);
-        $action->setBody($body);
-
-    }
-
-
     /**
      * @expectedException RuntimeException
      */