comparison libtests/0001/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.

-#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>
-#include <errno.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;
+  struct stat st;
 
+  clean_remove_db(TESTDB);
 
-int main(int argc, char **argv){
+  adb = audiodb_open(TESTDB, O_RDWR);
+  if(adb)
+    return 1;
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    adb_ptr mydbp2={0};
-    struct stat statbuf;
-    int statval=0;
+  adb = audiodb_create(TESTDB, 0, 0, 0);
+  if (!adb)
+    return 1;
 
-    char * databasename="testdb";
+  if(stat(TESTDB, &st))
+    return 1;
 
-    //if [ -f testdb ]; then rm -f testdb; fi
-    /* remove old directory */
-    clean_remove_db(databasename);
+  audiodb_close(adb);
 
-    /* create new db */
-    //# creation
-    //${AUDIODB} -N -d testdb
-    mydbp=audiodb_open(databasename);
+  adb = audiodb_create(TESTDB, 0, 0, 0);
+  if(adb)
+    return 1;
 
+  adb = audiodb_open(TESTDB, O_RDONLY);
+  if (!adb)
+    return 1;
 
-    /* open should fail (return NULL), so create a new db */
-    if (!mydbp){
-        mydbp=audiodb_create(databasename,0,0,0);
-    }
+  audiodb_close(adb);
 
-
-
-    if (!mydbp){
-        printf("fail\n");
-        returnval=-1;
-    }
-    
-
-    /* stat testdb - let's make sure that it is there */
-    //stat testdb
-    statval=stat(databasename, &statbuf);
-
-    if (statval){
-       returnval=-1;
-    }
-    
-    audiodb_close(mydbp);
-
-    /* try to create should fail, because db exists now */
-    mydbp2=audiodb_create(databasename,0,0,0);
-
-    if (mydbp2){
-        returnval=-1;
-    }
-
-
-/* should pass now - db exists */ 
-//expect_clean_error_exit ${AUDIODB} -N -d testdb
-    mydbp2=audiodb_open(databasename);
-    if (!mydbp2){
-       returnval=-1;
-    }
-
-//this test would fail at compile time because of the API interface
-//# should fail (no db given)
-//expect_clean_error_exit ${AUDIODB} -N
-
-
-    audiodb_close(mydbp2);
-
-//    printf("returnval:%d\n",returnval);
-
-    return(returnval);
+  return 104;
 }
-