Merge pull request #35 from IntelLabs/bug_fix_images_props

luisremis · web-flow · commit f07a3ca95755 · 2018-09-14T10:49:13.000-07:00
Fix ImageCommand, Add Test
diff --git a/src/ImageCommand.cc b/src/ImageCommand.cc
@@ -310,7 +310,7 @@ Json::Value FindImage::construct_responses(
         }
     }
 
-    if (!flag_empty) {
+    if (flag_empty) {
         findImage.removeMember("entities");
     }
 
diff --git a/tests/python/TestImages.py b/tests/python/TestImages.py
@@ -182,8 +182,45 @@ def test_findImage(self):
         response = json.loads(response)
         self.assertEqual(response[0]["FindImage"]["status"], 0)
         self.assertEqual(response[1]["FindImage"]["status"], 0)
-        # self.assertEqual(response[0]["FindImage"]["entities"][0]["name"], prefix_name + "0")
-        # self.assertEqual(response[1]["FindImage"]["entities"][0]["name"], prefix_name + "1")
+        self.assertEqual(len(img_array), 2)
+
+    def test_findImageResults(self):
+        db = vdms.VDMS()
+        db.connect(hostname, port)
+
+        prefix_name = "fimg_results_"
+
+        for i in range(0,2):
+            props = {}
+            props["name"] = prefix_name + str(i)
+            self.insertImage(db, props=props)
+
+        all_queries = []
+
+        for i in range(0,2):
+            constraints = {}
+            constraints["name"] = ["==", prefix_name + str(i)]
+
+            results = {}
+            results["list"] = ["name"]
+
+            img_params = {}
+            img_params["constraints"] = constraints
+            img_params["results"] = results
+
+            query = {}
+            query["FindImage"] = img_params
+
+            all_queries.append(query)
+
+        response, img_array = db.query(all_queries)
+        # print vdms.aux_print_json(str(response))
+
+        response = json.loads(response)
+        self.assertEqual(response[0]["FindImage"]["status"], 0)
+        self.assertEqual(response[1]["FindImage"]["status"], 0)
+        self.assertEqual(response[0]["FindImage"]["entities"][0]["name"], prefix_name + "0")
+        self.assertEqual(response[1]["FindImage"]["entities"][0]["name"], prefix_name + "1")
         self.assertEqual(len(img_array), 2)
 
     def test_addImageWithLink(self):

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ Json::Value FindImage::construct_responses(`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`
`313`		`- if (!flag_empty) {`
	`313`	`+ if (flag_empty) {`
`314`	`314`	`findImage.removeMember("entities");`
`315`	`315`	`}`
`316`	`316`