upadate testcases

Author: rohitmishra209

src/lib/models/assets.php

@@ -5,12 +5,14 @@
 namespace Contentstack\Stack\Assets;
 
 
-use Contentstack\Stack\ContentType\BaseQuery\BaseQuery;
 use Contentstack\Stack\ContentType\Query\Query;
+use Contentstack\Stack\ContentType\BaseQuery\BaseQuery;
 use Contentstack\Utility;
 
 
 require_once __DIR__.'/query.php';
+require_once __DIR__."/base_query.php";
+
 
 /*
  * Class Assets
@@ -19,8 +21,8 @@ class Assets extends BaseQuery  {
 
     var $operation;
     var $assetUid = '';
-    var  $stack = '';
-    var  $type = '';
+    var $stack = '';
+    var $type = '';
 
 
 
@@ -31,16 +33,18 @@ class Assets extends BaseQuery  {
      *      
      * */
     public function __construct($asset_uid = '', $stack = '') { 
-       
+
          $this->stack = $stack;
          if($asset_uid == ''){
             $this->type = 'assets';
         }else{
             $this->type = 'asset';
-
+            $this->assetUid = $asset_uid; 
+            parent::__construct($this, $asset_uid);
+            
          }
-         $this->assetUid = $asset_uid; 
-         parent::__construct($this, $assetUid);
+         
+         
 
     }
 
@@ -62,6 +66,4 @@ public function fetch() {
         $this->operation = __FUNCTION__;
        return \Contentstack\Utility\request($this, 'asset');
     }
-
-
 }

src/lib/models/base_query.php

@@ -14,15 +14,16 @@ abstract class BaseQuery {
 
     public function __construct($data = '', $parent = '') {
 
-        if($data->type == 'assets'){
+        if($data->type === 'assets'){
             $this->assets = $data;
             $this->queryObject = $parent;
             $this->queryObject->_query = array();
             $this->subQuery = array();
-        }else if ($data->type == 'asset'){
+
+        }else if ($data->type === 'asset'){
 
             $this->asset = $data;
-            $this->queryObject = $parent;
+            $this->queryObject = $data;
             $this->queryObject->_query = array();
             $this->subQuery = array();
 

src/lib/models/query.php

@@ -33,6 +33,7 @@ public function __construct($data = '', $type = '') {
      * */
     public function find() {
         $this->operation = __FUNCTION__;
+
         if($this->type == 'assets'){
             return Utility\request($this, 'assets');
         }else if($this->type == 'contentType'){

src/lib/models/stack.php

@@ -4,11 +4,11 @@
 use Contentstack\Utility;
 use Contentstack\Stack\ContentType\ContentType;
 use Contentstack\Stack\Assets\Assets;
-use Contentstack\Stack\Asset\Asset;
+//use Contentstack\Stack\Asset\Asset;
 
 require_once __DIR__."/content_type.php";
 require_once __DIR__."/assets.php";
-require_once __DIR__."/asset.php";
+//require_once __DIR__."/asset.php";
 require_once __DIR__."/../../config/index.php";
 
 /*

src/lib/utility.php

@@ -243,7 +243,7 @@ function request($queryObject = '', $type = '') {
         $server_output = '';
         if($queryObject) {
             $http = curl_init(URL($queryObject, $type));
-        //    \Contentstack\Utility\debug(URL($queryObject, $type));
+            
             // setting the GET request
             curl_setopt($http, CURLOPT_HEADER, FALSE);
             // setting the GET request
@@ -253,6 +253,7 @@ function request($queryObject = '', $type = '') {
             $response = curl_exec($http);
             // status code extraction
             $httpcode = curl_getinfo($http, CURLINFO_HTTP_CODE);
+
             // close the curl            
             curl_close ($http);
             if($httpcode > 199 && $httpcode < 300) {

test/ContentStackTestCases.php

@@ -8,6 +8,7 @@
 use Contentstack\Test\REST;
 
 use PHPUnit\Framework\TestCase;
+
 class ContentStackTestCases extends TestCase {
     public static $rest;
     public static $Stack;
@@ -35,17 +36,18 @@ public function testFind() {
     }
 
       public function testAssetsFind() {
-        $_assets = self::$Stack->Assets()->Query()->toJSON()->find();
-        $this->assertArrayHasKey(0, $_assets);
-       // $this->assertTrue((count($_assets[0]) === ENTRY_COUNT));
-        $this->assertTrue(checkAssetsSorting($_assets[0]));
-    }
 
+         $_assets = self::$Stack->Assets()->Query()->toJSON()->find();
+         $this->assertArrayHasKey(0, $_assets);
+         $this->assertTrue(checkAssetsSorting($_assets[0])); 
+    
+    }
 
     public function testAssetFetch() {
          $_object = self::$Stack->Assets()->Query()->toJSON()->find();
+         //\Contentstack\Utility\debug($_object[0][0]['uid']);
          $_uid = $_object[0][0]['uid'];
-         $_asset = self::$Stack->Asset($_uid)->fetch();
+         $_asset = self::$Stack->Assets($_uid)->fetch();
          $this->assertEquals($_asset->get('title'), $_object[0][0]['title']);
     }
 

test/utility.php

@@ -17,6 +17,7 @@ function checkEntriesSorting($entries = array(), $sortKey = 'updated_at', $order
 if (!function_exists('assetsSorting')) {
 
     function checkAssetsSorting($assets = array(), $sortKey = 'updated_at', $order = 'desc') {
+
         $result = true;
         for($i = 0;$i < count($assets) - 1; $i++) {
             if($order === 'desc')