diff libtests/0037/prog1.c @ 489:4cb6c611f812 api-inversion

Begin removing uses of audiodb_query()

audiodb_query() is actually an unsupportable interface.  It requires
access to the filesystem, does not (and cannot) actually support whole
swathes of functionality, is only implementable using code that is no
longer part of the core of audioDB (reporter.h), is in the way of fixing
memory leaks in the SOAP server, and is horrible to use to boot.

So, begin converting the libtests uses of audiodb_query() to
audio_query_spec().  In the process, go through the test code and
remove useless comments, pointless variables, and commented-out bits
of shell scripts.

--- a/libtests/0037/prog1.c	Sat Jan 10 15:32:49 2009 +0000
+++ b/libtests/0037/prog1.c	Sat Jan 10 15:32:53 2009 +0000
@@ -1,27 +1,15 @@
 #include "audioDB_API.h"
 #include "test_utils_lib.h"
 
-int result_position(adb_query_results_t *r, const char *key, float dist, uint32_t qpos, uint32_t ipos) {
-  for(uint32_t k = 0; k < r->nresults; k++) {
-    adb_result_t result = r->results[k];
-    if((dist == result.dist) && (qpos == result.qpos) &&
-       (ipos == result.ipos) && !(strcmp(key, result.key))) {
-      return k;
-    }
-  }
-  return -1;
-}
-
 int main(int argc, char *argv[]) {
-  char *dbname = "testdb";
   adb_t *adb;
   adb_insert_t *batch = 0;
   adb_status_t status;
   adb_query_t query = {0};
   adb_queryresult_t result;
 
-  clean_remove_db(dbname);
-  adb = audiodb_create("testdb", 0, 0, 0);
+  clean_remove_db(TESTDB);
+  adb = audiodb_create(TESTDB, 0, 0, 0);
   if(!adb) {
     return 1;
   }
@@ -71,39 +59,39 @@
 
   adb_query_results_t *results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 4) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature01", 2, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature10", 2, 0, 0) < 0) return 1;
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature01", 2, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
   audiodb_query_free_results(adb, &spec, results);
 
   spec.params.npoints = 2;
   results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 4) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature01", 2, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature10", 2, 0, 0) < 0) return 1;
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature01", 2, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
   audiodb_query_free_results(adb, &spec, results);
 
   spec.params.npoints = 5;
   results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 4) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature01", 2, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature10", 2, 0, 0) < 0) return 1;
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature01", 2, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
   audiodb_query_free_results(adb, &spec, results);
 
   spec.params.npoints = 1;
   results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 2) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 1) < 0) return 1;
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
 
   audiodb_query_free_results(adb, &spec, results);
 
@@ -111,39 +99,39 @@
   spec.params.npoints = 10;
   results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 4) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature01", 2, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature10", 2, 0, 1) < 0) return 1;
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature01", 2, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 1);
   audiodb_query_free_results(adb, &spec, results);
 
   spec.params.npoints = 2;
   results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 4) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature01", 2, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature10", 2, 0, 1) < 0) return 1;
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature01", 2, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 1);
   audiodb_query_free_results(adb, &spec, results);
 
   spec.params.npoints = 5;
   results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 4) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature01", 2, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 0) < 0) return 1;
-  if(result_position(results, "testfeature10", 2, 0, 1) < 0) return 1;
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature01", 2, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 1);
   audiodb_query_free_results(adb, &spec, results);
 
   spec.params.npoints = 1;
   results = audiodb_query_spec(adb, &spec);
 
-  if(results->nresults != 2) return 1;
-  if(result_position(results, "testfeature01", 0, 0, 1) < 0) return 1;
-  if(result_position(results, "testfeature10", 0, 0, 0) < 0) return 1;
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
   audiodb_query_free_results(adb, &spec, results);
 
   audiodb_close(adb);