Tests: Updated DoQuery

The previous API_DoQuery response enhancement exposed some mistakes in the DoQuery test - Removed leftover var_dump - Compare entire results set not just a subset
tflanagan · Oct 28, 2015 · f1bdc79 · f1bdc79
1 parent 0a76890
commit f1bdc79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/tests/API_DoQuery.php b/tests/API_DoQuery.php
@@ -210,8 +210,7 @@
 	'clist' => '1.2.3.4.5'
 ));
 
-if(!objStrctMatch($actual['table']['records'], $expected['table']['records'])){
-	var_dump($actual['table']['records'], $expected['table']['records']);
+if(!objStrctMatch($actual, $expected)){
 	throw new Exception('Mismatched API_DoQuery Formatted Data Structure');
 }
 

diff --git a/tests/runAll.php b/tests/runAll.php
@@ -78,11 +78,7 @@ function objStrctEquiv($a, $b){
 		$key = $keys[$i];
 		$val = $a[$key];
 
-		if(!isset($b[$key])){
-			return false;
-		}
-
-		if(!objStrctMatch($val, $b[$key])){
+		if(!isset($b[$key]) || !objStrctMatch($val, $b[$key])){
 			return false;
 		}
 	}