Skip to content

Commit 799a296

Browse files
uttamukkojiuttamukkoji
committed
Automation test support added
1 parent fe16b6c commit 799a296

File tree

4 files changed

+43
-72
lines changed

4 files changed

+43
-72
lines changed

‎src/Support/Utility.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
require_once __DIR__ . "/../lib/models/csexception.php";
1919

2020
use Contentstack\Error\CSException;
21-
use Contentstack\Result;
21+
use Contentstack\Result\Result;
2222

2323
/**
2424
* Utility/Helper where all the helper and utility functions will be available.

‎src/lib/models/result.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function toJSON()
6363
public function get($key)
6464
{
6565

66-
return ($key && is_string($key)) ? $this->object[$key] : null;
66+
return ($key && is_string($key)) ? $this->_object[$key] : null;
6767

6868
}
6969
}

‎test/AssetsTest.php‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static function setUpBeforeClass() : void {
2424
*/
2525
public static function tearDownAfterClass() : void{
2626
if(ENV !== 'TEST_LOCAL') {
27-
self::$rest->deleteStack();
27+
// self::$rest->deleteStack();
2828
}
2929
}
3030

@@ -36,9 +36,10 @@ public function testAssetsFind() {
3636

3737
public function testAssetsFetch() {
3838
$_object = self::$Stack->Assets()->Query()->toJSON()->find();
39+
$_title = $_object[0][0]['title'];
3940
$_uid = $_object[0][0]['uid'];
4041
$_asset = self::$Stack->Assets($_uid)->fetch();
41-
$this->assertEquals($_asset->get('title'), $_object[0][0]['title']);
42+
$this->assertEquals($_asset->get('title'), $_title);
4243
}
4344

4445
public function testAssetsFindSkip() {
@@ -77,7 +78,6 @@ public function testAssetsFindLimit() {
7778
public function testAssetsAddParam() {
7879
$_assets = self::$Stack->Assets()->Query()->addParam('include_dimension', 'true')->toJSON()->find();
7980
$this->assertTrue(array_key_exists('dimension', $_assets[0][0]));
80-
8181
}
8282

8383

@@ -161,7 +161,6 @@ public function testAssetsFindDescending() {
161161
public function testAssetsFindLessThan() {
162162
$_set = 7575;
163163
$assets = self::$Stack->Assets()->Query()->toJSON()->lessThan('file_size', $_set)->find();
164-
Utility::debug($assets);
165164
$this->assertArrayHasKey(0, $assets);
166165
if(count($assets[0]) !== 0){
167166
foreach ($assets[0] as $key => $val) {
@@ -173,7 +172,7 @@ public function testAssetsFindLessThan() {
173172
}
174173

175174
public function testAssetsFindLessThanEqualTo() {
176-
$_set = 12;
175+
$_set = 12000;
177176
$assets = self::$Stack->Assets()->Query()->toJSON()->lessThanEqualTo('file_size', $_set)->find();
178177
$this->assertArrayHasKey(0, $assets);
179178
if(count($assets[0]) !== 0) {
@@ -268,9 +267,10 @@ public function testAssetsFindLogicalOrRawQuery() {
268267

269268
public function testAssetsFindLogicalAndQueryObject() {
270269
$_value = 6161;
270+
$_value2 = 15000;
271271
$query1 = self::$Stack->Assets()->Query()->greaterThanEqualTo('file_size', $_value);
272272

273-
$query2 = self::$Stack->Assets()->Query()->lessThanEqualTo('file_size', $_value);
273+
$query2 = self::$Stack->Assets()->Query()->lessThanEqualTo('file_size', $_value2);
274274
$assets = self::$Stack->Assets()->Query()->logicalAND($query1, $query2)->toJSON()->find();
275275

276276
$this->assertArrayHasKey(0, $assets);
@@ -279,25 +279,26 @@ public function testAssetsFindLogicalAndQueryObject() {
279279

280280
public function testAssetsFindLogicalAndRawQuery() {
281281
$_value = 6161;
282+
$_value2 = 15000;
282283
$query1 = self::$Stack->Assets()->Query()->greaterThanEqualTo('file_size', $_value);
283-
$query2 = self::$Stack->Assets()->Query()->lessThanEqualTo('file_size', $_value);
284+
$query2 = self::$Stack->Assets()->Query()->lessThanEqualTo('file_size', $_value2);
284285
$assets = self::$Stack->Assets()->Query()->logicalAND($query1, $query2)->toJSON()->find();
285286
$this->assertArrayHasKey(0, $assets);
286287
$this->assertTrue(checkAssetsSorting($assets[0]));
287288
}
288289

289-
// public function testAssetsFindOnlyDefault() {
290-
// $_assets = self::$Stack->Assets()->Query()->only(array('title', 'updated_at'))->toJSON()->find();
291-
// $_assets_count = self::$Stack->Assets()->Query()->toJSON()->find();
292-
// $this->assertArrayHasKey(0, $_assets);
293-
// $this->assertTrue((count($_assets[0]) === count($_assets_count[0])));
294-
// $this->assertTrue(checkAssetsSorting($_assets[0]));
295-
// $flag = true;
296-
// for($i = 0; $i < count($_assets[0]); $i++) {
297-
// $flag = $flag && (count(array_keys($_assets[0][$i])) === 4 && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
298-
// }
299-
// $this->assertTrue($flag);
300-
// }
290+
public function testAssetsFindOnlyDefault() {
291+
$_assets = self::$Stack->Assets()->Query()->only('BASE', array('title', 'updated_at'))->toJSON()->find();
292+
$_assets_count = self::$Stack->Assets()->Query()->toJSON()->find();
293+
$this->assertArrayHasKey(0, $_assets);
294+
$this->assertTrue((count($_assets[0]) === count($_assets_count[0])));
295+
$this->assertTrue(checkAssetsSorting($_assets[0]));
296+
$flag = true;
297+
for($i = 0; $i < count($_assets[0]); $i++) {
298+
$flag = $flag && (count(array_keys($_assets[0][$i])) === 6 && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['filename']) && isset($_assets[0][$i]['ACL']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
299+
}
300+
$this->assertTrue($flag);
301+
}
301302

302303
public function testAssetsFindRegEx() {
303304
$regexp = "[0-9]";
@@ -348,20 +349,19 @@ public function testAssetsFindExceptBaseDefault() {
348349
$this->assertTrue($flag);
349350
}
350351

351-
352-
// public function testAssetsFindOnlyBaseDefault() {
353-
// $_assets = self::$Stack->Assets()->Query()->only('BASE', array('title', 'updated_at'))->toJSON()->find();
354-
// $this->assertArrayHasKey(0, $_assets);
355-
// $assets = self::$Stack->Assets()->Query()->toJSON()->find();
356-
// $assets_count = count($assets[0]);
357-
// $this->assertTrue((count($_assets[0]) === $assets_count));
358-
// $this->assertTrue(checkAssetsSorting($_assets[0]));
359-
// $flag = true;
360-
// for($i = 0; $i < count($_assets[0]); $i++) {
361-
// $flag = $flag && (count(array_keys($_assets[0][$i])) === 4 && isset($_assets[0][$i]['url']) && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
362-
// }
363-
// $this->assertTrue($flag);
364-
// }
352+
public function testAssetsFindOnlyBaseDefault() {
353+
$_assets = self::$Stack->Assets()->Query()->only('BASE', array('title', 'updated_at'))->toJSON()->find();
354+
$this->assertArrayHasKey(0, $_assets);
355+
$assets = self::$Stack->Assets()->Query()->toJSON()->find();
356+
$assets_count = count($assets[0]);
357+
$this->assertTrue((count($_assets[0]) === $assets_count));
358+
$this->assertTrue(checkAssetsSorting($_assets[0]));
359+
$flag = true;
360+
for($i = 0; $i < count($_assets[0]); $i++) {
361+
$flag = $flag && (count(array_keys($_assets[0][$i])) === 6 && isset($_assets[0][$i]['updated_at']) && isset($_assets[0][$i]['filename']) && isset($_assets[0][$i]['ACL']) && isset($_assets[0][$i]['title']) && isset($_assets[0][$i]['uid']));
362+
}
363+
$this->assertTrue($flag);
364+
}
365365

366366
public function testAssetsFindExceptDefault() {
367367
$_assets = self::$Stack->Assets()->Query()->except('BASE',array('boolean'))->toJSON()->find();
@@ -380,9 +380,9 @@ public function testAssetsFindExceptDefault() {
380380
public function testAssetsFindSearch() {
381381
$_assets = self::$Stack->Assets()->Query()->search('image/jpeg')->toJSON()->find();
382382
$this->assertArrayHasKey(0, $_assets);
383-
$assets = self::$Stack->Assets()->Query()->toJSON()->find();
384-
$assets_count = count($assets[0]);
385-
$this->assertTrue((count($_assets[0]) === $assets_count));
383+
// $assets = self::$Stack->Assets()->Query()->toJSON()->find();
384+
// $assets_count = count($assets[0]);
385+
$this->assertTrue((count($_assets[0]) === 2));
386386
$this->assertTrue(checkAssetsSorting($_assets[0]));
387387
$flag = true;
388388
for($i = 0; $i < count($_assets[0]); $i++) {

‎test/EntriesTest.php‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public function testFindLanguage() {
8181
$this->assertTrue(checkEntriesSorting($_entries[0]));
8282
}
8383

84-
8584
public function testFindSkipLimit() {
8685
$_entries1 = self::$Stack->ContentType(CT_ContentType)->Query()->toJSON()->find();
8786
$this->assertArrayHasKey(0, $_entries1);
@@ -130,14 +129,15 @@ public function testFindIncludeContentType() {
130129
public function testFindIncludeReferenceContentTypeUID() {
131130
$_entries = self::$Stack->ContentType(CT_ContentType)->Query()->toJSON()->includeReferenceContentTypeUID()->find();
132131
$_flag = "false";
133-
$this->assertArrayHasKey(0, $_entries);
134-
if($_entries[1]["reference"][0]['_content_type_uid']) {
135-
$_flag = "true";
132+
$this->assertArrayHasKey(0, $_entries);
133+
for($i = 0; $i < count($_entries[0]); $i++) {
134+
if($_entries[0][$i]["reference"][0]['_content_type_uid']) {
135+
$_flag = "true";
136+
}
136137
}
137138
$this->assertTrue($_flag === "true");
138139
}
139140

140-
141141
public function testFindIncludeContentTypeIncludeCount() {
142142
$_entries = self::$Stack->ContentType(CT_ContentType)->Query()->toJSON()->includeCount()->includeContentType()->find();
143143
$this->assertArrayHasKey(0, $_entries);
@@ -160,20 +160,6 @@ public function testFindIncludeSchemaIncludeCount() {
160160
$this->assertTrue(($_entries[2]) === ENTRY_COUNT);
161161
}
162162

163-
// public function testFindIncludeReference() {
164-
// $_entries = self::$Stack->ContentType(CT_ContentType)->Query()->toJSON()->includeReference(array('reference', 'group.reference'))->find();
165-
// $this->assertArrayHasKey(0, $_entries);
166-
// $this->assertTrue((count($_entries[0]) === ENTRY_COUNT));
167-
// $this->assertTrue(checkEntriesSorting($_entries[0]));
168-
// for($i = 0; $i < count($_entries[0]); $i++) {
169-
// $index = ($i % 2);
170-
// //$this->assertArrayHasKey(, $_entries[0][$i]['reference']);
171-
// //$this->assertArrayHasKey(0, $_entries[0][$i]['group']['reference']);
172-
// $this->assertTrue(($_entries[0][$i]['reference'][0]['title'] === self::$rest->get('entries.reference')[$index]['title']));
173-
// $this->assertTrue(($_entries[0][$i]['group']['reference'][0]['title'] === self::$rest->get('entries.reference')[~$index + 2]['title']));
174-
// }
175-
// }
176-
177163
public function testFindWhere() {
178164
$entries = self::$Stack->ContentType(CT_ContentType)->Query()->toJSON()->where('title', 'CB1-1')->find();
179165
$this->assertArrayHasKey(0, $entries);
@@ -395,21 +381,6 @@ public function testFindExceptBaseDefault() {
395381
$this->assertTrue($flag);
396382
}
397383

398-
// public function testFindOnlyReference() {
399-
// $_entries = self::$Stack->ContentType(CT_ContentType)->Query()->includeReference(array('reference'))->only('reference', array('title'))->toJSON()->find();
400-
// $this->assertArrayHasKey(0, $_entries);
401-
// $this->assertTrue((count($_entries[0]) === ENTRY_COUNT));
402-
// $this->assertTrue(checkEntriesSorting($_entries[0]));
403-
// $flag = true;
404-
// for($i = 0; $i < count($_entries[0]); $i++) {
405-
// $flag = $flag && (count(array_keys($_entries[0][$i]['reference'][0])) === 2);
406-
// for($j = 0; $j < count($_entries[0][$i]['reference']); $j++) {
407-
// $flag = $flag && (isset($_entries[0][$i]['reference'][$j]['title']) && isset($_entries[0][$i]['reference'][$j]['uid']) && isset($_entries[0][$i]['reference'][$j]['uid']));
408-
// }
409-
// }
410-
// $this->assertTrue($flag);
411-
// }
412-
413384
public function testFindExceptReference() {
414385
$_entries = self::$Stack->ContentType(CT_ContentType)->Query()->includeReference(array('reference'))->except('reference', array('title'))->toJSON()->find();
415386
$this->assertArrayHasKey(0, $_entries);

0 commit comments

Comments
 (0)