Updated in Testcases

Author: rohitmishra209

src/lib/models/assets.php

@@ -17,7 +17,7 @@
 class Assets {
 
     var $stack    = '';
-
+    
 
     /*
      * Assets
@@ -31,7 +31,7 @@ public function __construct($stack = '') {
     }
 
     public function Query() {
-        return new Query($this);
+        return new Query($this, $this->type);
     }
 
 }

src/lib/models/base_query.php

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

src/lib/models/content_type.php

@@ -26,6 +26,7 @@ class ContentType {
     public function __construct($uid = '', $stack = '') {
         $this->uid = $uid;
         $this->stack = $stack;
+        $this->type = 'contentType';
     }
 
     /*
@@ -43,6 +44,6 @@ public function Entry($entry_uid = '') {
      * @returns Query
      * */
     public function Query() {
-        return new Query($this);
+        return new Query($this, $this->type);
     }
 }

src/lib/models/query.php

@@ -20,8 +20,9 @@ class Query extends BaseQuery {
      * Query Class to initalize your Query
      * @param
      * */
-    public function __construct($data = '') {
+    public function __construct($data = '', $type = '') {
         $this->_query = array();
+        $this->type = $type;
         parent::__construct($data, $this);
 
     }
@@ -32,10 +33,9 @@ public function __construct($data = '') {
      * */
     public function find() {
         $this->operation = __FUNCTION__;
-        if($this->assets){
+        if($this->type == 'assets'){
             return Utility\request($this, 'assets');
-        }
-        else if($this->contentType){
+        }else if($this->type == 'contentType'){
             return Utility\request($this);
     }
 

src/lib/models/result.php

@@ -10,7 +10,8 @@ class Result {
      * */
     public function __construct($result = '') {
         $this->object = $result;
-       // \Contentstack\Utility\debug($this);
+
+       
     }
 
     /*

src/lib/utility.php

@@ -4,7 +4,7 @@
  * */
 namespace Contentstack\Utility;
 
-require_once __DIR__ . "/models/result.php";
+ require_once __DIR__ . "/models/result.php";
 require_once __DIR__ . "/models/csexception.php";
 
 use Contentstack\Error\CSException;

test/ContentStackTestCases.php

@@ -44,9 +44,8 @@ public function testAssetsFind() {
 
     public function testAssetFetch() {
          $_object = self::$Stack->Assets()->Query()->toJSON()->find();
-         //\Contentstack\Utility\debug($_object);
          $_uid = $_object[0][0]['uid'];
-         $_asset = self::$Stack->Asset($_uid)->toJSON()->fetch();
+         $_asset = self::$Stack->Asset($_uid)->fetch();
          $this->assertEquals($_asset->get('title'), $_object[0][0]['title']);
     }
 

test/utility.php

@@ -17,7 +17,6 @@ function checkEntriesSorting($entries = array(), $sortKey = 'updated_at', $order
 if (!function_exists('assetsSorting')) {
 
     function checkAssetsSorting($assets = array(), $sortKey = 'updated_at', $order = 'desc') {
-        \Contentstack\Utility\debug($assets);
         $result = true;
         for($i = 0;$i < count($assets) - 1; $i++) {
             if($order === 'desc')
@@ -31,7 +30,7 @@ function checkAssetsSorting($assets = array(), $sortKey = 'updated_at', $order =
 
 if (!function_exists('sortEntries')) {
     function sortEntries($entries = array(), $sortKey = 'updated_at', $order = 'desc') {
-        \Contentstack\Utility\debug(array_column($entries, $sortKey));
+      
         usort($entries, create_function('$a, $b', '
             $a = $a["' . $sortKey . '"];
             $b = $b["' . $sortKey . '"];