Mercurial > hg > audiodb
changeset 488:f4dc8e47ee37 api-inversion
Remove dump_query() function.
It seems to have been used for printf debugging of test files and never
removed. (Debuggers aren't great, but they are better than
hand-maintained printing routines for this kind of thing; in particular,
gdb will do this for you rather better than dump_query() did.)
| author | mas01cr |
|---|---|
| date | Sat, 10 Jan 2009 15:32:49 +0000 |
| parents | e072aa1611f5 |
| children | 4cb6c611f812 |
| files | libtests/0010/prog1.c libtests/0022/prog1.c libtests/0023/prog1.c libtests/0024/prog1.c libtests/0025/prog1.c libtests/0027/prog1.c libtests/0028/prog1.c libtests/0029/prog1.c libtests/0030/prog1.c libtests/0031/prog1.c libtests/0032/prog1.c libtests/0035/prog1.c libtests/test_utils_lib.h |
| diffstat | 13 files changed, 0 insertions(+), 72 deletions(-) [+] |
line wrap: on
line diff
--- a/libtests/0010/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0010/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -68,7 +68,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 2) {returnval = -1;}; //if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;};
--- a/libtests/0022/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0022/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -77,7 +77,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 2) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;};
--- a/libtests/0023/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0023/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -82,7 +82,6 @@ //printf("size:%d\n",size); - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 2) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;}; @@ -119,7 +118,6 @@ audiodb_query(mydbp,&myadbquery3,&myadbqueryresult3); size=myadbqueryresult3.sizeRlist; -// dump_query(&myadbquery3,&myadbqueryresult3); if (size != 2) {returnval = -1;}; if (testoneresult(&myadbqueryresult3,0,"testfeature10",0,1,0)) {returnval = -1;}; if (testoneresult(&myadbqueryresult3,1,"testfeature01",2,1,0)) {returnval = -1;};
--- a/libtests/0024/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0024/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -73,7 +73,6 @@ size=myadbqueryresult.sizeRlist; //printf("size:%d\n",size); - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 2) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature01",1,0,0)) {returnval = -1;}; @@ -92,7 +91,6 @@ size=myadbqueryresult.sizeRlist; //printf("size:%d\n",size); - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 2) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;};
--- a/libtests/0025/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0025/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -66,7 +66,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;}; @@ -82,7 +81,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; @@ -104,7 +102,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;}; @@ -120,7 +117,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,1)) {returnval = -1;};
--- a/libtests/0027/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0027/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -204,7 +204,6 @@ myadbquery.absolute_threshold=-0.2; audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 0) {returnval = -1;};
--- a/libtests/0028/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0028/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -89,7 +89,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;}; @@ -104,7 +103,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; @@ -127,7 +125,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;}; @@ -142,7 +139,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,1)) {returnval = -1;}; @@ -189,7 +185,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; @@ -206,7 +201,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 0) {returnval = -1;}; @@ -224,7 +218,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;}; @@ -242,7 +235,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;}; @@ -267,7 +259,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; -// dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;}; @@ -285,7 +276,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",2,0,0)) {returnval = -1;}; @@ -303,7 +293,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 0) {returnval = -1;}; @@ -320,7 +309,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); ///* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,1)) {returnval = -1;};
--- a/libtests/0029/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0029/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -85,8 +85,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - dump_query(&myadbquery,&myadbqueryresult); - /* check the test values */ if (size != 1) {returnval = -1;}; if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;};
--- a/libtests/0030/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0030/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -88,8 +88,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - dump_query(&myadbquery,&myadbqueryresult); - /* check the test values */ if (size != 1) {returnval = -1;}; if (testoneradiusresult(&myadbqueryresult,0,"testfeature",1)) {returnval = -1;};
--- a/libtests/0031/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0031/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -78,7 +78,6 @@ myadbquery.sequencelength="1"; audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 0) {returnval = -1;}; @@ -96,7 +95,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -115,7 +113,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -135,7 +132,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -160,7 +156,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 2) {returnval = -1;}; @@ -178,7 +173,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 0) {returnval = -1;}; @@ -197,7 +191,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -218,7 +211,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -238,7 +230,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;};
--- a/libtests/0032/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0032/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -100,7 +100,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -121,7 +120,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -142,7 +140,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -167,7 +164,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 2) {returnval = -1;}; @@ -185,7 +181,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 0) {returnval = -1;}; @@ -203,7 +198,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -221,7 +215,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;}; @@ -240,7 +233,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); /* check the test values */ if (size != 1) {returnval = -1;};
--- a/libtests/0035/prog1.c Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/0035/prog1.c Sat Jan 10 15:32:49 2009 +0000 @@ -68,8 +68,6 @@ audiodb_query(mydbp,&myadbquery,&myadbqueryresult); size=myadbqueryresult.sizeRlist; - //dump_query(&myadbquery,&myadbqueryresult); - /* check the test values */ ////wc -l testoutput | grep "1 testoutput" ////grep "^testfeature3 .* 0 1$" testoutput
--- a/libtests/test_utils_lib.h Sat Jan 10 15:32:42 2009 +0000 +++ b/libtests/test_utils_lib.h Sat Jan 10 15:32:49 2009 +0000 @@ -12,36 +12,10 @@ int testoneradiusresult(adb_queryresult_ptr myadbqueryresult, int i, char * Rlist, int count); void makekeylistfile(char * filename, char * item); - void clean_remove_db(char * dbname) { unlink(dbname); } - -void dump_query(adb_query_ptr adbq, adb_queryresult_ptr myadbqueryresult){ - - int size=0; - int i=0; - - size=myadbqueryresult->sizeRlist; - - printf("Dumping query:\n"); - for(i=0; i<size; i++){ - printf("\t'%s' query: Result %02d:%s is dist:%f qpos:%d spos:%d\n", - adbq->querytype, - i, - myadbqueryresult->Rlist[i], - myadbqueryresult->Dist[i], - myadbqueryresult->Qpos[i], - myadbqueryresult->Spos[i] - ); - } - printf("\n"); - -} - - - int testoneresult(adb_queryresult_ptr myadbqueryresult, int i, char * Rlist, double Dist,double Qpos,double Spos){ int ret=0;