diff libtests/0002/prog1.c @ 498:342822c2d49a

Merge api-inversion branch (-r656:771, but I don't expect to return to
that branch) into the trunk.

I expect there to be minor performance regressions (e.g. in the SOAP
server index cacheing, which I have forcibly removed) and minor
unplugged memory leaks (e.g. in audioDB::query(), where I don't free up
the datum).  I hope that these leaks and performance regressions can be
plugged in short order.  I also expect that some (but maybe not all) of
the issues currently addressed in the memory-leaks branch are superseded
or fixed by this merge.

There remains much work to be done; go forth and do it.

--- a/libtests/0002/prog1.c	Sat Jan 10 11:11:27 2009 +0000
+++ b/libtests/0002/prog1.c	Sat Jan 10 16:47:57 2009 +0000
@@ -1,58 +1,22 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sysexits.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
-/*
- *  * #define NDEBUG
- *   * */
-#include <assert.h>
+#include "audioDB_API.h"
+#include "test_utils_lib.h"
 
-#include "../../audioDB_API.h"
-#include "../test_utils_lib.h"
+int main(int argc, char **argv) {
+  adb_t *adb;
+  adb_status_t status={0};
 
+  clean_remove_db(TESTDB);
 
-int main(int argc, char **argv){
+  adb = audiodb_create(TESTDB, 0, 0, 0);
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    adb_status_t mystatus={0};
+  if(audiodb_status(adb, &status)){
+    return 1;
+  }
+  if(status.numFiles != 0)
+    return 1;
 
-    char * databasename="testdb";
+  audiodb_close(adb);
 
-//. ../test-utils.sh
-//
-//if [ -f testdb ]; then rm -f testdb; fi
-//
-    /* remove old directory */
-    clean_remove_db(databasename);
-
-    /* create new db */
-//${AUDIODB} -N -d testdb
-//
-    mydbp=audiodb_create(databasename,0,0,0);
-
-
-//# FIXME: at some point we will want to test that some relevant
-//# information is being printed
-//${AUDIODB} -S -d testdb
-//${AUDIODB} -d testdb -S
-
-    if(audiodb_status(mydbp,&mystatus)){
-        returnval=-1;
-    }
-
-/* not relevent, caught by API */
-//# should fail (no db given)
-//expect_clean_error_exit ${AUDIODB} -S
-
-
-
-    audiodb_close(mydbp);
-
-    return(returnval);
+  return 104;
 }