Work around iRODS generating invalid SQL when coercing AVU values to a

numeric form. Report the operator name in search operator test results.
wtsi-npg · Oct 16, 2015 · 06e49fe · 06e49fe
1 parent d40cfdc
commit 06e49fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/tests/check_baton.c b/tests/check_baton.c
@@ -1915,29 +1915,29 @@ START_TEST(test_regression_github_issue137) {
 
     for (size_t i = 0; i < 11; i++) {
         json_t *avu = json_pack("{s:s, s:s, s:s}",
-                                JSON_ATTRIBUTE_KEY, "attr1000",
-                                JSON_VALUE_KEY,     "value1000",
+                                JSON_ATTRIBUTE_KEY, "numattr1",
+                                JSON_VALUE_KEY,     "10",
                                 JSON_OPERATOR_KEY,  operators[i]);
         json_t *query = json_pack("{s:[o]}", JSON_AVUS_KEY, avu);
 
         baton_error_t error;
         json_t *results = search_metadata(conn, query, NULL, flags, &error);
-        ck_assert_int_eq(error.code, 0);
+        ck_assert_msg(error.code == 0, operators[i]);
 
         json_decref(query);
         json_decref(results);
     }
 
     // Test 'in' here
     json_t *avu = json_pack("{s:s, s:[s], s:s}",
-                            JSON_ATTRIBUTE_KEY, "attr1000",
-                            JSON_VALUE_KEY,     "value1000",
+                            JSON_ATTRIBUTE_KEY, "numattr1",
+                            JSON_VALUE_KEY,     "10",
                             JSON_OPERATOR_KEY,  "in");
     json_t *query = json_pack("{s:[o]}", JSON_AVUS_KEY, avu);
 
     baton_error_t error;
     json_t *results = search_metadata(conn, query, NULL, flags, &error);
-    ck_assert_int_eq(error.code, 0);
+    ck_assert_msg(error.code == 0, "in");
     json_decref(query);
     json_decref(results);
 

diff --git a/tests/metadata/meta1.imeta b/tests/metadata/meta1.imeta
@@ -23,3 +23,7 @@ add -d __IRODS_TEST_ROOT__/r1.txt a y
 add -d __IRODS_TEST_ROOT__/r1.txt b x
 add -d __IRODS_TEST_ROOT__/r1.txt b y
 add -d __IRODS_TEST_ROOT__/r1.txt b z
+
+add -d __IRODS_TEST_ROOT__/r1.txt numattr1 1
+add -d __IRODS_TEST_ROOT__/r1.txt numattr1 10
+add -d __IRODS_TEST_ROOT__/r1.txt numattr1 100