Improve unit tests

webeweb · Apr 10, 2020 · f047cf0 · f047cf0
1 parent 86c7cf8
commit f047cf0
Show file tree

Hide file tree

Showing 19 changed files with 231 additions and 231 deletions.
diff --git a/src/Serializer/ResponseDeserializer.php b/src/Serializer/ResponseDeserializer.php
@@ -37,18 +37,18 @@ class ResponseDeserializer {
      */
     protected static function deserializeHit(AbstractHit $model, array $response) {
 
-        $model->setComments(intval(ArrayHelper::get($response, "comments", -1)));
-        $model->setDownloads(intval(ArrayHelper::get($response, "downloads", -1)));
-        $model->setFavorites(intval(ArrayHelper::get($response, "favorites", -1)));
         $model->setId(intval(ArrayHelper::get($response, "id", -1)));
-        $model->setLikes(intval(ArrayHelper::get($response, "likes", -1)));
         $model->setPageURL(ArrayHelper::get($response, "pageURL"));
-        $model->setTags(ArrayHelper::get($response, "tags"));
         $model->setType(ArrayHelper::get($response, "type"));
-        $model->setUser(ArrayHelper::get($response, "user"));
+        $model->setTags(ArrayHelper::get($response, "tags"));
+        $model->setViews(intval(ArrayHelper::get($response, "views", -1)));
+        $model->setDownloads(intval(ArrayHelper::get($response, "downloads", -1)));
+        $model->setFavorites(intval(ArrayHelper::get($response, "favorites", -1)));
+        $model->setLikes(intval(ArrayHelper::get($response, "likes", -1)));
+        $model->setComments(intval(ArrayHelper::get($response, "comments", -1)));
         $model->setUserId(intval(ArrayHelper::get($response, "user_id", -1)));
+        $model->setUser(ArrayHelper::get($response, "user"));
         $model->setUserImageURL(ArrayHelper::get($response, "userImageURL"));
-        $model->setViews(intval(ArrayHelper::get($response, "views", -1)));
     }
 
     /**
@@ -63,18 +63,18 @@ protected static function deserializeImageHit(array $response) {
 
         static::deserializeHit($model, $response);
 
-        $model->setFullHDURL(ArrayHelper::get($response, "fullHDURL"));
-        $model->setImageHeight(intval(ArrayHelper::get($response, "imageHeight", -1)));
-        $model->setImageSize(intval(ArrayHelper::get($response, "imageSize", -1)));
-        $model->setImageURL(ArrayHelper::get($response, "imageURL"));
-        $model->setImageWidth(intval(ArrayHelper::get($response, "imageWidth", -1)));
-        $model->setLargeImageURL(ArrayHelper::get($response, "largeImageURL"));
-        $model->setPreviewHeight(intval(ArrayHelper::get($response, "previewHeight", -1)));
         $model->setPreviewURL(ArrayHelper::get($response, "previewURL"));
         $model->setPreviewWidth(intval(ArrayHelper::get($response, "previewWidth", -1)));
-        $model->setWebFormatHeight(intval(ArrayHelper::get($response, "webformatHeight", -1)));
+        $model->setPreviewHeight(intval(ArrayHelper::get($response, "previewHeight", -1)));
         $model->setWebFormatURL(ArrayHelper::get($response, "webformatURL"));
         $model->setWebFormatWidth(intval(ArrayHelper::get($response, "webformatWidth", -1)));
+        $model->setWebFormatHeight(intval(ArrayHelper::get($response, "webformatHeight", -1)));
+        $model->setLargeImageURL(ArrayHelper::get($response, "largeImageURL"));
+        $model->setFullHDURL(ArrayHelper::get($response, "fullHDURL"));
+        $model->setImageURL(ArrayHelper::get($response, "imageURL"));
+        $model->setImageWidth(intval(ArrayHelper::get($response, "imageWidth", -1)));
+        $model->setImageHeight(intval(ArrayHelper::get($response, "imageHeight", -1)));
+        $model->setImageSize(intval(ArrayHelper::get($response, "imageSize", -1)));
 
         return $model;
     }
@@ -154,10 +154,10 @@ protected static function deserializeVideo(array $response) {
 
         $model = new Video();
 
-        $model->setHeight(intval(ArrayHelper::get($response, "height", -1)));
-        $model->setSize(intval(ArrayHelper::get($response, "size", -1)));
         $model->setUrl(ArrayHelper::get($response, "url"));
         $model->setWidth(intval(ArrayHelper::get($response, "width", -1)));
+        $model->setHeight(intval(ArrayHelper::get($response, "height", -1)));
+        $model->setSize(intval(ArrayHelper::get($response, "size", -1)));
 
         return $model;
     }

diff --git a/tests/API/RequestInterfaceTest.php b/tests/API/RequestInterfaceTest.php
@@ -27,7 +27,7 @@ class RequestInterfaceTest extends AbstractTestCase {
      *
      * @return void
      */
-    public function testConstruct() {
+    public function test__construct() {
 
         $this->assertEquals("bg", RequestInterface::LANG_BG);
         $this->assertEquals("cs", RequestInterface::LANG_CS);

diff --git a/tests/API/SearchImagesRequestInterfaceTest.php b/tests/API/SearchImagesRequestInterfaceTest.php
@@ -27,7 +27,7 @@ class SearchImagesRequestInterfaceTest extends AbstractTestCase {
      *
      * @return void
      */
-    public function testConstructor() {
+    public function test__construct() {
 
         $this->assertEquals("animals", SearchImagesRequestInterface::CATEGORY_ANIMALS);
         $this->assertEquals("backgrounds", SearchImagesRequestInterface::CATEGORY_BACKGROUNDS);

diff --git a/tests/API/SearchVideosRequestInterfaceTest.php b/tests/API/SearchVideosRequestInterfaceTest.php
@@ -27,7 +27,7 @@ class SearchVideosRequestInterfaceTest extends AbstractTestCase {
      *
      * @return void
      */
-    public function testConstructor() {
+    public function test__construct() {
 
         $this->assertEquals("all", SearchVideosRequestInterface::VIDEO_TYPE_ALL);
         $this->assertEquals("animation", SearchVideosRequestInterface::VIDEO_TYPE_ANIMATION);

diff --git a/tests/Exception/APIExceptionTest.php b/tests/Exception/APIExceptionTest.php
@@ -28,7 +28,7 @@ class APIExceptionTest extends AbstractTestCase {
      *
      * @return void
      */
-    public function testConstruct() {
+    public function test__construct() {
 
         // Set an Exception mock.
         $throwable = new Exception;

diff --git a/tests/Exception/AbstractExceptionTest.php b/tests/Exception/AbstractExceptionTest.php
@@ -28,7 +28,7 @@ class AbstractExceptionTest extends AbstractTestCase {
      *
      * @return void
      */
-    public function testConstruct() {
+    public function test__construct() {
 
         // Set an Exception mock.
         $throwable = new Exception("throwable");

diff --git a/tests/Model/AbstractHitTest.php b/tests/Model/AbstractHitTest.php
@@ -22,28 +22,6 @@
  */
 class AbstractHitTest extends AbstractTestCase {
 
-    /**
-     * Tests the __construct() method.
-     *
-     * @return void
-     */
-    public function testConstruct() {
-
-        $obj = new TestHit();
-
-        $this->assertNull($obj->getComments());
-        $this->assertNull($obj->getDownloads());
-        $this->assertNull($obj->getFavorites());
-        $this->assertNull($obj->getLikes());
-        $this->assertNull($obj->getPageURL());
-        $this->assertNull($obj->getTags());
-        $this->assertNull($obj->getType());
-        $this->assertNull($obj->getUser());
-        $this->assertNull($obj->getUserId());
-        $this->assertNull($obj->getUserImageURL());
-        $this->assertNull($obj->getViews());
-    }
-
     /**
      * Tests the setComments() method.
      *
@@ -199,4 +177,26 @@ public function testSetViews() {
         $obj->setViews(1);
         $this->assertEquals(1, $obj->getViews());
     }
+
+    /**
+     * Tests the __construct() method.
+     *
+     * @return void
+     */
+    public function test__construct() {
+
+        $obj = new TestHit();
+
+        $this->assertNull($obj->getComments());
+        $this->assertNull($obj->getDownloads());
+        $this->assertNull($obj->getFavorites());
+        $this->assertNull($obj->getLikes());
+        $this->assertNull($obj->getPageURL());
+        $this->assertNull($obj->getTags());
+        $this->assertNull($obj->getType());
+        $this->assertNull($obj->getUser());
+        $this->assertNull($obj->getUserId());
+        $this->assertNull($obj->getUserImageURL());
+        $this->assertNull($obj->getViews());
+    }
 }
diff --git a/tests/Model/AbstractRequestTest.php b/tests/Model/AbstractRequestTest.php
@@ -26,29 +26,6 @@
  */
 class AbstractRequestTest extends AbstractTestCase {
 
-    /**
-     * Tests the __construct() method.
-     *
-     * @return void
-     */
-    public function testConstruct() {
-
-        $obj = new TestRequest();
-
-        $this->assertNull($obj->getCategory());
-        $this->assertFalse($obj->getEditorsChoice());
-        $this->assertNull($obj->getId());
-        $this->assertEquals(AbstractRequest::LANG_EN, $obj->getLang());
-        $this->assertEquals(0, $obj->getMinHeight());
-        $this->assertEquals(0, $obj->getMinWidth());
-        $this->assertEquals(AbstractRequest::ORDER_POPULAR, $obj->getOrder());
-        $this->assertEquals(1, $obj->getPage());
-        $this->assertEquals(AbstractRequest::PER_PAGE_DEFAULT, $obj->getPerPage());
-        $this->assertFalse($obj->getPretty());
-        $this->assertNull($obj->getQ());
-        $this->assertFalse($obj->getSafeSearch());
-    }
-
     /**
      * Tests the enumLang() method.
      *
@@ -343,4 +320,27 @@ public function testSetSafeSearch() {
         $obj->setSafeSearch(true);
         $this->assertTrue($obj->getSafeSearch());
     }
+
+    /**
+     * Tests the __construct() method.
+     *
+     * @return void
+     */
+    public function test__construct() {
+
+        $obj = new TestRequest();
+
+        $this->assertNull($obj->getCategory());
+        $this->assertFalse($obj->getEditorsChoice());
+        $this->assertNull($obj->getId());
+        $this->assertEquals(AbstractRequest::LANG_EN, $obj->getLang());
+        $this->assertEquals(0, $obj->getMinHeight());
+        $this->assertEquals(0, $obj->getMinWidth());
+        $this->assertEquals(AbstractRequest::ORDER_POPULAR, $obj->getOrder());
+        $this->assertEquals(1, $obj->getPage());
+        $this->assertEquals(AbstractRequest::PER_PAGE_DEFAULT, $obj->getPerPage());
+        $this->assertFalse($obj->getPretty());
+        $this->assertNull($obj->getQ());
+        $this->assertFalse($obj->getSafeSearch());
+    }
 }
diff --git a/tests/Model/AbstractResponseTest.php b/tests/Model/AbstractResponseTest.php
@@ -40,24 +40,6 @@ public function testAddHit() {
         $this->assertSame($hit, $obj->getHits()[0]);
     }
 
-    /**
-     * Tests the __construct() method.
-     *
-     * @return void
-     */
-    public function testConstruct() {
-
-        $obj = new TestResponse();
-
-        $this->assertCount(0, $obj->getHits());
-        $this->assertNull($obj->getLimit());
-        $this->assertNull($obj->getRawResponse());
-        $this->assertNull($obj->getRemaining());
-        $this->assertNull($obj->getReset());
-        $this->assertNull($obj->getTotal());
-        $this->assertNull($obj->getTotalHits());
-    }
-
     /**
      * Tests the setRawResponse() method.
      *
@@ -96,4 +78,22 @@ public function testSetTotalHits() {
         $obj->setTotalHits(1);
         $this->assertEquals(1, $obj->getTotalHits());
     }
+
+    /**
+     * Tests the __construct() method.
+     *
+     * @return void
+     */
+    public function test__construct() {
+
+        $obj = new TestResponse();
+
+        $this->assertCount(0, $obj->getHits());
+        $this->assertNull($obj->getLimit());
+        $this->assertNull($obj->getRawResponse());
+        $this->assertNull($obj->getRemaining());
+        $this->assertNull($obj->getReset());
+        $this->assertNull($obj->getTotal());
+        $this->assertNull($obj->getTotalHits());
+    }
 }
diff --git a/tests/Model/ImageHitTest.php b/tests/Model/ImageHitTest.php
@@ -22,29 +22,6 @@
  */
 class ImageHitTest extends AbstractTestCase {
 
-    /**
-     * Tests the __construct() method.
-     *
-     * @return void
-     */
-    public function testConstruct() {
-
-        $obj = new ImageHit();
-
-        $this->assertNull($obj->getFullHDURL());
-        $this->assertNull($obj->getImageHeight());
-        $this->assertNull($obj->getImageSize());
-        $this->assertNull($obj->getImageURL());
-        $this->assertNull($obj->getImageWidth());
-        $this->assertNull($obj->getLargeImageURL());
-        $this->assertNull($obj->getPreviewHeight());
-        $this->assertNull($obj->getPreviewURL());
-        $this->assertNull($obj->getPreviewWidth());
-        $this->assertNull($obj->getWebFormatHeight());
-        $this->assertNull($obj->getWebFormatURL());
-        $this->assertNull($obj->getWebFormatWidth());
-    }
-
     /**
      * Tests the setFullHDURL() method.
      *
@@ -200,4 +177,27 @@ public function testSetWebFormatWidth() {
         $obj->setWebFormatWidth(1);
         $this->assertEquals(1, $obj->getWebFormatWidth());
     }
+
+    /**
+     * Tests the __construct() method.
+     *
+     * @return void
+     */
+    public function test__construct() {
+
+        $obj = new ImageHit();
+
+        $this->assertNull($obj->getFullHDURL());
+        $this->assertNull($obj->getImageHeight());
+        $this->assertNull($obj->getImageSize());
+        $this->assertNull($obj->getImageURL());
+        $this->assertNull($obj->getImageWidth());
+        $this->assertNull($obj->getLargeImageURL());
+        $this->assertNull($obj->getPreviewHeight());
+        $this->assertNull($obj->getPreviewURL());
+        $this->assertNull($obj->getPreviewWidth());
+        $this->assertNull($obj->getWebFormatHeight());
+        $this->assertNull($obj->getWebFormatURL());
+        $this->assertNull($obj->getWebFormatWidth());
+    }
 }
diff --git a/tests/Model/RateLimitTraitTest.php b/tests/Model/RateLimitTraitTest.php
@@ -24,20 +24,6 @@
  */
 class RateLimitTraitTest extends AbstractTestCase {
 
-    /**
-     * Tests the __construct() method.
-     *
-     * @return void
-     */
-    public function testConstruct() {
-
-        $obj = new TestRateLimitTrait();
-
-        $this->assertNull($obj->getLimit());
-        $this->assertNull($obj->getRemaining());
-        $this->assertNull($obj->getReset());
-    }
-
     /**
      * Tests the setLimit() method.
      *
@@ -80,4 +66,18 @@ public function testSetReset() {
         $obj->setReset($reset);
         $this->assertSame($reset, $obj->getReset());
     }
+
+    /**
+     * Tests the __construct() method.
+     *
+     * @return void
+     */
+    public function test__construct() {
+
+        $obj = new TestRateLimitTrait();
+
+        $this->assertNull($obj->getLimit());
+        $this->assertNull($obj->getRemaining());
+        $this->assertNull($obj->getReset());
+    }
 }