Endpoint Provider Tests

MichaelJ2324 · Mar 22, 2017 · f6567eb · f6567eb
1 parent 57a36dd
commit f6567eb
Show file tree

Hide file tree

Showing 12 changed files with 182 additions and 33 deletions.
diff --git a/src/Endpoint/Abstracts/AbstractEndpoint.php b/src/Endpoint/Abstracts/AbstractEndpoint.php
@@ -4,13 +4,9 @@
 
 use MRussell\Http\Request\Curl;
 use MRussell\REST\Auth\AuthControllerInterface;
-use MRussell\REST\Endpoint\Data\AbstractEndpointData;
-use MRussell\REST\Endpoint\Data\DataInterface;
 use MRussell\REST\Endpoint\Interfaces\EndpointInterface;
 use MRussell\REST\Exception\Endpoint\InvalidRequest;
-use MRussell\REST\Exception\Endpoint\InvalidURLEndpointException;
 use MRussell\REST\Exception\Endpoint\InvalidData;
-use MRussell\REST\Exception\Endpoint\InvalidOptions;
 use MRussell\Http\Response\ResponseInterface;
 use MRussell\Http\Request\RequestInterface;
 

diff --git a/src/Endpoint/Abstracts/AbstractSmartEndpoint.php b/src/Endpoint/Abstracts/AbstractSmartEndpoint.php
@@ -3,7 +3,6 @@
 namespace MRussell\REST\Endpoint\Abstracts;
 
 use MRussell\REST\Endpoint\Data\AbstractEndpointData;
-use MRussell\REST\Endpoint\Data\EndpointData;
 use MRussell\REST\Exception\Endpoint\EndpointException;
 
 abstract class AbstractSmartEndpoint extends AbstractEndpoint

diff --git a/src/Endpoint/JSON/SmartEndpoint.php b/src/Endpoint/JSON/SmartEndpoint.php
@@ -4,9 +4,9 @@
 
 use MRussell\Http\Request\JSON as JSONRequest;
 use MRussell\Http\Response\JSON as JSONResponse;
-use MRussell\REST\Endpoint\Abstracts\AbstractEndpoint;
+use MRussell\REST\Endpoint\Abstracts\AbstractSmartEndpoint;
 
-class SmartEndpoint extends AbstractEndpoint
+class SmartEndpoint extends AbstractSmartEndpoint
 {
     protected static $_DATA_CLASS = 'MRussell\\REST\\Endpoint\\Data\\EndpointData';
 

diff --git a/src/Endpoint/Provider/AbstractEndpointProvider.php b/src/Endpoint/Provider/AbstractEndpointProvider.php
@@ -2,10 +2,8 @@
 
 namespace MRussell\REST\Endpoint\Provider;
 
-use MRussell\REST\Auth\AuthControllerInterface;
-use MRussell\REST\Endpoint\ControllerInterface;
 use MRussell\REST\Endpoint\Interfaces\EndpointInterface;
-use MRussell\REST\Exception\Endpoint\InvalidEndpointRegistration;
+use MRussell\REST\Exception\Endpoint\InvalidRegistration;
 use MRussell\REST\Exception\Endpoint\UnknownEndpoint;
 
 abstract class AbstractEndpointProvider implements EndpointProviderInterface
@@ -20,7 +18,7 @@ abstract class AbstractEndpointProvider implements EndpointProviderInterface
     /**
      * @var array
      */
-    protected $registry;
+    protected $registry = array();
 
     public function __construct() {
         foreach(static::$_DEFAULT_ENDPOINTS as $name => $epData){
@@ -33,20 +31,23 @@ public function __construct() {
 
     /**
      * @inheritdoc
-     * @throws InvalidEndpointRegistration
+     * @throws InvalidRegistration
      */
     public function registerEndpoint($name, $className, array $properties = array())
     {
-        $implements = class_implements($className);
-        if (is_array($implements) && isset($implements['MRussell\\REST\\Endpoint\\Interfaces\\EndpointInterface'])) {
-            $this->registry[$name] = array(
-                'class' => $className,
-                'properties' => $properties
-            );
-        } else {
-            throw new InvalidEndpointRegistration($className);
+        try{
+            $implements = class_implements($className);
+            if (is_array($implements) && isset($implements['MRussell\REST\Endpoint\Interfaces\EndpointInterface'])) {
+                $this->registry[$name] = array(
+                    'class' => $className,
+                    'properties' => $properties
+                );
+                return $this;
+            }
+        } catch(\Exception $ex){
+            //Class Implements failed to Load Class completely
         }
-        return $this;
+        throw new InvalidRegistration($className);
     }
 
     /**

diff --git a/src/Exception/Endpoint/InvalidRegistration.php b/src/Exception/Endpoint/InvalidRegistration.php
@@ -2,8 +2,9 @@
 
 namespace MRussell\REST\Exception\Endpoint;
 
-class InvalidRegistration extends EndpointException {
+class InvalidRegistration extends EndpointException
+{
 
-    protected $message = 'Endpoint Object [%s] must extend MRussell\REST\Endpoint\EndpointInterface';
+    protected $message = 'Endpoint Object [%s] must extend MRussell\REST\Endpoint\Interfaces\EndpointInterface';
 
 }
diff --git a/tests/Auth/AbstractAuthControllerTest.php b/tests/Auth/AbstractAuthControllerTest.php
@@ -202,7 +202,7 @@ public function testConfigureData(){
         $method = $Class->getMethod('configureEndpoint');
         $method->setAccessible(TRUE);
         $this->assertEquals($AuthEndpoint,$method->invoke($Auth,$AuthEndpoint,AuthController::ACTION_AUTH));
-        $this->assertEquals($this->credentials,$AuthEndpoint->getData());
+        $this->assertEquals($this->credentials,$AuthEndpoint->getData()->asArray());
         $this->assertEquals($LogoutEndpoint,$method->invoke($Auth,$LogoutEndpoint,AuthController::ACTION_LOGOUT));
         $this->assertEquals(array(),$LogoutEndpoint->getData());
 

diff --git a/tests/Client/AbstractClientTest.php b/tests/Client/AbstractClientTest.php
@@ -5,6 +5,7 @@
 use MRussell\REST\Tests\Stubs\Auth\AuthController;
 use MRussell\REST\Tests\Stubs\Client\Client;
 use MRussell\REST\Tests\Stubs\Endpoint\EndpointProvider;
+use MRussell\REST\Tests\Stubs\Endpoint\EndpointProviderWithDefaults;
 
 
 /**
@@ -67,7 +68,7 @@ public function testSetAuth(){
      */
     public function testSetEndpointProvider(Client $Client){
         $this->Client = $Client;
-        $EndpointProvider = new EndpointProvider();
+        $EndpointProvider = new EndpointProviderWithDefaults();
         $this->assertEquals($this->Client,$this->Client->setEndpointProvider($EndpointProvider));
         $this->assertEquals($EndpointProvider,$this->Client->getEndpointProvider());
         return $this->Client;

diff --git a/...ndpoint/Data/AbstractEndpointDataTest.php → tests/Endpoint/AbstractEndpointDataTest.php b/...ndpoint/Data/AbstractEndpointDataTest.php → tests/Endpoint/AbstractEndpointDataTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MRussell\REST\Tests\Endpoint\Data;
+namespace MRussell\REST\Tests\Endpoint;
 
 use MRussell\REST\Endpoint\Data\EndpointData as StockData;
 use MRussell\REST\Tests\Stubs\Endpoint\EndpointData as StubData;
@@ -211,4 +211,17 @@ public function testInvalidData(){
         $Data['foo'] = 1234;
         $Data->asArray(TRUE);
     }
+
+    /**
+     * @expectedException MRussell\REST\Exception\Endpoint\InvalidData
+     * @expectedExceptionMessageRegExp /Missing or Invalid data on Endpoint Data\. Errors: (Missing \[[A-z0-9,].*\]|Invalid \[[A-z0-9,].*\])/
+     */
+    public function testInvalidAndMissingData(){
+        $Data = new StubData();
+        $properties = $Data->getProperties();
+        $properties['required']['bar'] = NULL;
+        $Data->setProperties($properties);
+        $Data['foo'] = 1234;
+        $Data->asArray(TRUE);
+    }
 }
diff --git a/tests/Endpoint/AbstractEndpointProviderTest.php b/tests/Endpoint/AbstractEndpointProviderTest.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace MRussell\REST\Tests\Endpoint;
+
+use MRussell\Http\Request\JSON;
+use MRussell\REST\Endpoint\Provider\EndpointProviderInterface;
+use MRussell\REST\Tests\Stubs\Endpoint\AuthEndpoint;
+use MRussell\REST\Tests\Stubs\Endpoint\EndpointProvider;
+use MRussell\REST\Tests\Stubs\Endpoint\EndpointProviderWithDefaults;
+
+
+/**
+ * Class AbstractEndpointProviderTest
+ * @package MRussell\REST\Tests\Endpoint
+ * @coversDefaultClass MRussell\REST\Endpoint\Provider\AbstractEndpointProvider
+ * @group AbstractEndpointProviderTest
+ */
+class AbstractEndpointProviderTest extends \PHPUnit_Framework_TestCase
+{
+
+    public static function setUpBeforeClass()
+    {
+        //Add Setup for static properties here
+    }
+
+    public static function tearDownAfterClass()
+    {
+        //Add Tear Down for static properties here
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::registerEndpoint
+     */
+    public function testConstructor(){
+        $Provider = new EndpointProvider();
+        $Class = new \ReflectionClass('MRussell\REST\Tests\Stubs\Endpoint\EndpointProvider');
+        $property = $Class->getProperty('registry');
+        $property->setAccessible(TRUE);
+        $this->assertEquals(array(),$property->getValue($Provider));
+
+        $Provider = new EndpointProviderWithDefaults();
+        $this->assertNotEmpty($property->getValue($Provider));
+    }
+
+    /**
+     * @covers ::registerEndpoint
+     * @return EndpointProviderInterface
+     */
+    public function testRegisterEndpoint(){
+        $Provider = new EndpointProvider();
+        $this->assertEquals($Provider,$Provider->registerEndpoint('auth','MRussell\REST\Tests\Stubs\Endpoint\AuthEndpoint'));
+        $this->assertEquals($Provider,$Provider->registerEndpoint('foo','MRussell\REST\Endpoint\JSON\Endpoint',array(
+            'url' => 'foo',
+            'httpMethod' => JSON::HTTP_GET
+        )));
+        return $Provider;
+    }
+
+    /**
+     * @depends testRegisterEndpoint
+     * @param EndpointProviderInterface $Provider
+     * @covers ::registerEndpoint
+     * @expectedException MRussell\REST\Exception\Endpoint\InvalidRegistration
+     */
+    public function testInvalidRegistration(EndpointProviderInterface $Provider){
+        $Provider->registerEndpoint("baz","baz");
+    }
+
+    /**
+     * @depends testRegisterEndpoint
+     * @covers ::hasEndpoint
+     * @covers ::getEndpoint
+     * @covers ::buildEndpoint
+     * @param EndpointProviderInterface $Provider
+     */
+    public function testGetEndpoint(EndpointProviderInterface $Provider){
+        $this->assertEquals(FALSE, $Provider->hasEndpoint('test'));
+        $this->assertEquals(TRUE, $Provider->hasEndpoint('foo'));
+        $this->assertEquals(TRUE, $Provider->hasEndpoint('auth'));
+        $Auth = new AuthEndpoint();
+        $this->assertEquals($Auth, $Provider->getEndpoint('auth'));
+        $FooEP = $Provider->getEndpoint('foo');
+        $this->assertNotEmpty($FooEP);
+        $this->assertEquals('foo',$FooEP->getEndPointUrl());
+        $this->assertEquals(array(
+            'url' => 'foo',
+            'httpMethod' => JSON::HTTP_GET,
+            'auth' => FALSE
+        ),$FooEP->getProperties());
+    }
+
+    /**
+     * @depends testRegisterEndpoint
+     * @param EndpointProviderInterface $Provider
+     * @covers ::getEndpoint
+     * @expectedException MRussell\REST\Exception\Endpoint\UnknownEndpoint
+     */
+    public function testUnknownEndpoint(EndpointProviderInterface $Provider){
+        $Provider->getEndpoint('test');
+    }
+
+}
diff --git a/tests/Stubs/Endpoint/AuthEndpoint.php b/tests/Stubs/Endpoint/AuthEndpoint.php
@@ -3,9 +3,9 @@
 namespace MRussell\REST\Tests\Stubs\Endpoint;
 
 use MRussell\Http\Request\JSON;
-use MRussell\REST\Endpoint\JSON\Endpoint;
+use MRussell\REST\Endpoint\JSON\SmartEndpoint;
 
-class AuthEndpoint extends Endpoint
+class AuthEndpoint extends SmartEndpoint
 {
     protected static $_ENDPOINT_URL = 'authenticate';
 

diff --git a/tests/Stubs/Endpoint/EndpointProvider.php b/tests/Stubs/Endpoint/EndpointProvider.php
@@ -6,9 +6,5 @@
 
 class EndpointProvider extends AbstractEndpointProvider
 {
-    protected static $_DEFAULT_ENDPOINTS = array(
-        'auth' => array(
-            'class' => 'MRussell\\REST\\Tests\\Stubs\\Endpoint\\AuthEndpoint'
-        )
-    );
+
 }
diff --git a/tests/Stubs/Endpoint/EndpointProviderWithDefaults.php b/tests/Stubs/Endpoint/EndpointProviderWithDefaults.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace MRussell\REST\Tests\Stubs\Endpoint;
+
+
+use MRussell\Http\Request\JSON;
+use MRussell\REST\Endpoint\Provider\AbstractEndpointProvider;
+
+class EndpointProviderWithDefaults extends AbstractEndpointProvider
+{
+    protected static $_DEFAULT_ENDPOINTS = array(
+        'auth' => array(
+            'class' => 'MRussell\REST\Tests\Stubs\Endpoint\AuthEndpoint'
+        ),
+        'refresh' => array(
+            'class' => 'MRussell\REST\Tests\Stubs\Endpoint\RefreshEndpoint'
+        ),
+        'logout' => array(
+            'class' => 'MRussell\REST\Tests\Stubs\Endpoint\LogoutEndpoint'
+        ),
+        'ping' => array(
+            'class' => 'MRussell\REST\Endpoint\JSON\Endpoint',
+            'properties' => array(
+                'url' => 'ping',
+                'httpMethod' => JSON::HTTP_GET
+            )
+        )
+    );
+}