Browse Source

verify NPE essentially

Mike Smith 11 years ago
parent
commit
797e1b2f7d
1 changed files with 5 additions and 19 deletions
  1. 5 19
      toolset/benchmark/framework_test.py

+ 5 - 19
toolset/benchmark/framework_test.py

@@ -136,29 +136,15 @@ class FrameworkTest:
   def validateDb(self, jsonString):
   def validateDb(self, jsonString):
     arr = json.loads(jsonString)
     arr = json.loads(jsonString)
 
 
-    if not arr:
+    if not arr or len(arr) != 2 or type(arr[0]) != dict or type(arr[1]) != dict:
       return False
       return False
-    if not len(arr) == 2:
+    if not arr[0]["id"] or type(arr[0]["id"]) != int:
       return False
       return False
-    if type(arr[0]) != dict:
+    if not arr[0]["randomNumber"] or type(arr[0]["randomNumber"]) != int:
       return False
       return False
-    if type(arr[1]) != dict:
+    if not arr[1]["id"] or type(arr[1]["id"]) != int:
       return False
       return False
-    if not arr[0]["id"]:
-      return False
-    if not arr[0]["randomNumber"]:
-      return False
-    if type(arr[0]["id"]) != int:
-      return False
-    if type(arr[0]["randomNumber"]) != int:
-      return False
-    if not arr[1]["id"]:
-      return False
-    if not arr[1]["randomNumber"]:
-      return False
-    if type(arr[1]["id"]) != int:
-      return False
-    if type(arr[1]["randomNumber"]) != int:
+    if not arr[1]["randomNumber"] or type(arr[1]["randomNumber"]) != int:
       return False
       return False
     return True
     return True