From 66fb4ebdf605eba523f7b34e422a3c056d559c5d Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Sun, 19 Aug 2007 14:26:13 +0000 Subject: move dict and tio tests into the tests directory git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@359 ef36b2f9-881f-0410-afb5-c4e39611909c --- configure.ac | 2 +- tests/Makefile.am | 12 ++- tests/dict/Makefile.am | 27 ------- tests/dict/test_dict.c | 78 ------------------- tests/test_dict.c | 78 +++++++++++++++++++ tests/test_tio.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/tio/Makefile.am | 29 ------- tests/tio/test_tio.c | 206 ------------------------------------------------- 8 files changed, 296 insertions(+), 342 deletions(-) delete mode 100644 tests/dict/Makefile.am delete mode 100644 tests/dict/test_dict.c create mode 100644 tests/test_dict.c create mode 100644 tests/test_tio.c delete mode 100644 tests/tio/Makefile.am delete mode 100644 tests/tio/test_tio.c diff --git a/configure.ac b/configure.ac index 3dba332..1e7c056 100644 --- a/configure.ac +++ b/configure.ac @@ -320,5 +320,5 @@ AC_SUBST(nss_ldap_so_LIBS) AC_SUBST(nslcd_LIBS) # generate files -AC_CONFIG_FILES([Makefile common/Makefile nss/Makefile nslcd/Makefile man/Makefile tests/Makefile tests/dict/Makefile tests/tio/Makefile]) +AC_CONFIG_FILES([Makefile common/Makefile nss/Makefile nslcd/Makefile man/Makefile tests/Makefile]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am index 684da86..8908a2d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,7 +18,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA -SUBDIRS = dict tio +TESTS = test_dict test_tio + +check_PROGRAMS = test_dict test_tio noinst_PROGRAMS = test_aliases test_ethers test_group test_hosts \ test_netgroup test_networks test_passwd test_protocols \ @@ -28,6 +30,14 @@ AM_CPPFLAGS=-I$(top_srcdir) # the following enables verbose protocol debugging information to be dumped #AM_CFLAGS=-DDEBUG_PROT -DDEBUG_PROT_DUMP +test_dict_SOURCES = test_dict.c ../common/dict.h +test_dict_LDADD = ../common/dict.o + +test_tio_SOURCES = test_tio.c ../common/tio.h ../common/tio.c +#test_tio_LDADD = ../common/libtio.a +test_tio_CFLAGS = -pthread +test_tio_LDFLAGS = -pthread + common_SOURCES = ../nss/common.c ../nslcd.h ../nss/prototypes.h \ ../common/tio.c ../common/tio.h diff --git a/tests/dict/Makefile.am b/tests/dict/Makefile.am deleted file mode 100644 index 36e471e..0000000 --- a/tests/dict/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Makefile.am - use automake to generate Makefile.in -# -# Copyright (C) 2007 Arthur de Jong -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA - -TESTS = test_dict - -check_PROGRAMS = test_dict - -AM_CPPFLAGS=-I$(top_srcdir) - -test_dict_SOURCES = test_dict.c ../../common/dict.h -test_dict_LDADD = ../../common/dict.o diff --git a/tests/dict/test_dict.c b/tests/dict/test_dict.c deleted file mode 100644 index 7cfc169..0000000 --- a/tests/dict/test_dict.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - test_dict.c - simple test for the dict module - This file is part of the nss-ldapd library. - - Copyright (C) 2007 Arthur de Jong - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include "config.h" - -#include -#include -#include - -#include "common/dict.h" -#include "compat/attrs.h" - -/* the main program... */ -int main(int UNUSED(argc),char UNUSED(*argv[])) -{ - DICT *dict; - void *ret; - static char *value1="value1"; - static char *value2="value2"; - static char *replace2="replace2"; - - /* initialize */ - dict=dict_new(); - - /* store some entries */ - dict_put(dict,"key1",value1); - dict_put(dict,"key2",value2); - dict_put(dict,"key3",dict); - dict_put(dict,"KEY2",replace2); - - /* check dictionary contents */ - ret=dict_get(dict,"KeY1"); - assert(ret==value1); - ret=dict_get(dict,"kEy2"); - assert(ret==replace2); - ret=dict_get(dict,"KeY3"); - assert(ret==dict); - ret=dict_get(dict,"key4"); - assert(ret==NULL); - - /* remove a key */ - dict_put(dict,"kEy3",NULL); - ret=dict_get(dict,"keY3"); - assert(ret==NULL); - - /* loop over dictionary contents */ - dict_values_first(dict); - while ((ret=dict_values_next(dict))!=NULL) - { - assert(((ret==value1)||(ret==replace2))); - } - - /* free dictionary */ - dict_free(dict); - - /* TODO: test dict_values_first() and dict_values_next() */ - - return 0; -} diff --git a/tests/test_dict.c b/tests/test_dict.c new file mode 100644 index 0000000..7cfc169 --- /dev/null +++ b/tests/test_dict.c @@ -0,0 +1,78 @@ +/* + test_dict.c - simple test for the dict module + This file is part of the nss-ldapd library. + + Copyright (C) 2007 Arthur de Jong + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include "config.h" + +#include +#include +#include + +#include "common/dict.h" +#include "compat/attrs.h" + +/* the main program... */ +int main(int UNUSED(argc),char UNUSED(*argv[])) +{ + DICT *dict; + void *ret; + static char *value1="value1"; + static char *value2="value2"; + static char *replace2="replace2"; + + /* initialize */ + dict=dict_new(); + + /* store some entries */ + dict_put(dict,"key1",value1); + dict_put(dict,"key2",value2); + dict_put(dict,"key3",dict); + dict_put(dict,"KEY2",replace2); + + /* check dictionary contents */ + ret=dict_get(dict,"KeY1"); + assert(ret==value1); + ret=dict_get(dict,"kEy2"); + assert(ret==replace2); + ret=dict_get(dict,"KeY3"); + assert(ret==dict); + ret=dict_get(dict,"key4"); + assert(ret==NULL); + + /* remove a key */ + dict_put(dict,"kEy3",NULL); + ret=dict_get(dict,"keY3"); + assert(ret==NULL); + + /* loop over dictionary contents */ + dict_values_first(dict); + while ((ret=dict_values_next(dict))!=NULL) + { + assert(((ret==value1)||(ret==replace2))); + } + + /* free dictionary */ + dict_free(dict); + + /* TODO: test dict_values_first() and dict_values_next() */ + + return 0; +} diff --git a/tests/test_tio.c b/tests/test_tio.c new file mode 100644 index 0000000..5e8758b --- /dev/null +++ b/tests/test_tio.c @@ -0,0 +1,206 @@ +/* + test_tio.c - simple test for the tio module + This file is part of the nss-ldapd library. + + Copyright (C) 2007 Arthur de Jong + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "common/tio.h" + +/* structure for passing arguments to helper (is a thread) */ +struct helper_args { + int fd; + size_t blocksize; + size_t blocks; + int timeout; +}; + +static void *help_tiowriter(void *arg) +{ + TFILE *fp; + struct timeval timeout; + size_t i,j,k; + uint8_t *buf; + struct helper_args *hargs=(struct helper_args *)arg; + /* allocate the buffer */ + buf=(uint8_t *)malloc(hargs->blocksize); + assert(buf!=NULL); + /* set the timeout */ + timeout.tv_sec=hargs->timeout; + timeout.tv_usec=0; + /* open the file */ + fp = tio_fdopen(hargs->fd,&timeout,&timeout); + assert(fp!=NULL); + /* write the blocks */ + i=0; + for (k=0;kblocks;k++) + { + /* fill the buffer */ + for (j=0;jblocksize;j++) + buf[j]=i++; + assert(tio_write(fp,buf,hargs->blocksize)==0); + } + /* close the file flushing the buffer */ + assert(tio_close(fp)==0); + /* we're done */ + free(buf); + return NULL; +} + +static void *help_tioreader(void *arg) +{ + TFILE *fp; + struct timeval timeout; + size_t i,j,k; + uint8_t *buf; + struct helper_args *hargs=(struct helper_args *)arg; + /* allocate the buffer */ + buf=(uint8_t *)malloc(hargs->blocksize); + assert(buf!=NULL); + /* set the timeout */ + timeout.tv_sec=hargs->timeout; + timeout.tv_usec=0; + /* open the file */ + fp = tio_fdopen(hargs->fd,&timeout,&timeout); + assert(fp!=NULL); + /* read the blocks */ + i=0; + for (k=0;kblocks;k++) + { + assert(tio_read(fp,buf,hargs->blocksize)==0); + /* check the buffer */ + for (j=0;jblocksize;j++) + assert(buf[j]==(uint8_t)(i++)); + } + /* close the file */ + assert(tio_close(fp)==0); + /* we're done */ + free(buf); + return NULL; +} + +static void *help_normwriter(void *arg) +{ + FILE *fp; + size_t i,j,k; + uint8_t *buf; + struct helper_args *hargs=(struct helper_args *)arg; + /* allocate the buffer */ + buf=(uint8_t *)malloc(hargs->blocksize); + assert(buf!=NULL); + /* open the file */ + fp = fdopen(hargs->fd,"wb"); + assert(fp!=NULL); + /* write the blocks */ + i=0; + for (k=0;kblocks;k++) + { + /* fill the buffer */ + for (j=0;jblocksize;j++) + buf[j]=i++; + assert(fwrite(buf,hargs->blocksize,1,fp)==1); + } + /* close the file flushing the buffer */ + assert(fclose(fp)==0); + /* we're done */ + free(buf); + return NULL; +} + +static void *help_normreader(void *arg) +{ + FILE *fp; + size_t i,j,k; + struct helper_args *hargs=(struct helper_args *)arg; + /* open the file */ + fp = fdopen(hargs->fd,"rb"); + assert(fp!=NULL); + /* read the blocks */ + i=0; + for (k=0;kblocks;k++) + { + /* check the buffer */ + for (j=0;jblocksize;j++) + assert(fgetc(fp)==(uint8_t)(i++)); + } + /* close the file */ + assert(fclose(fp)==0); + return NULL; +} + +/* +TODO: test timeout +TODO: test whether a simple request/response works +*/ + +static int test_blocks(size_t wbs, size_t wbl, size_t rbs, size_t rbl) +{ + int sp[2]; + pthread_t wthread, rthread; + struct helper_args wargs,rargs; + /* set up the socket pair */ + assert(socketpair(AF_UNIX,SOCK_STREAM,0,sp)==0); + /* log */ + printf("writing %d blocks of %d bytes (%d total)\n",wbl,wbs,wbl*wbs); + printf("reading %d blocks of %d bytes (%d total)\n",rbl,rbs,rbl*rbs); + /* start the writer thread */ + wargs.fd=sp[0]; + wargs.blocksize=wbs; + wargs.blocks=wbl; + wargs.timeout=2; + assert(pthread_create(&wthread,NULL,help_tiowriter,&wargs)==0); +/* sleep(1); */ + /* start the reader thread */ + rargs.fd=sp[1]; + rargs.blocksize=rbs; + rargs.blocks=rbl; + rargs.timeout=2; + assert(pthread_create(&rthread,NULL,help_tioreader,&rargs)==0); + /* wait for all threads to die */ + assert(pthread_join(wthread,NULL)==0); + assert(pthread_join(rthread,NULL)==0); + /* we're done */ + return 0; +} + +/* the main program... */ +int main(int UNUSED(argc),char UNUSED(*argv[])) +{ + /* normal read-writes */ + test_blocks(400,11,11,400); + test_blocks(4*1024,11,4*11,1024); + test_blocks(5*1023,20,20*1023,5); + /* reader closes file sooner */ +/* test_blocks(2*6*1023,20,20*1023,5); */ +/* test_blocks(10,10,10,9); */ + /* writer closes file sooner */ +/* test_blocks(4*1023,20,20*1023,5); */ +/* test_blocks(10,9,10,10); */ + return 0; +} diff --git a/tests/tio/Makefile.am b/tests/tio/Makefile.am deleted file mode 100644 index df02024..0000000 --- a/tests/tio/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile.am - use automake to generate Makefile.in -# -# Copyright (C) 2007 Arthur de Jong -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA - -TESTS = test_tio - -check_PROGRAMS = test_tio - -AM_CPPFLAGS=-I$(top_srcdir) - -test_tio_SOURCES = test_tio.c ../../common/tio.h ../../common/tio.c -#test_tio_LDADD = ../../common/libtio.a -test_tio_CFLAGS = -pthread -test_tio_LDFLAGS = -pthread diff --git a/tests/tio/test_tio.c b/tests/tio/test_tio.c deleted file mode 100644 index 5e8758b..0000000 --- a/tests/tio/test_tio.c +++ /dev/null @@ -1,206 +0,0 @@ -/* - test_tio.c - simple test for the tio module - This file is part of the nss-ldapd library. - - Copyright (C) 2007 Arthur de Jong - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "common/tio.h" - -/* structure for passing arguments to helper (is a thread) */ -struct helper_args { - int fd; - size_t blocksize; - size_t blocks; - int timeout; -}; - -static void *help_tiowriter(void *arg) -{ - TFILE *fp; - struct timeval timeout; - size_t i,j,k; - uint8_t *buf; - struct helper_args *hargs=(struct helper_args *)arg; - /* allocate the buffer */ - buf=(uint8_t *)malloc(hargs->blocksize); - assert(buf!=NULL); - /* set the timeout */ - timeout.tv_sec=hargs->timeout; - timeout.tv_usec=0; - /* open the file */ - fp = tio_fdopen(hargs->fd,&timeout,&timeout); - assert(fp!=NULL); - /* write the blocks */ - i=0; - for (k=0;kblocks;k++) - { - /* fill the buffer */ - for (j=0;jblocksize;j++) - buf[j]=i++; - assert(tio_write(fp,buf,hargs->blocksize)==0); - } - /* close the file flushing the buffer */ - assert(tio_close(fp)==0); - /* we're done */ - free(buf); - return NULL; -} - -static void *help_tioreader(void *arg) -{ - TFILE *fp; - struct timeval timeout; - size_t i,j,k; - uint8_t *buf; - struct helper_args *hargs=(struct helper_args *)arg; - /* allocate the buffer */ - buf=(uint8_t *)malloc(hargs->blocksize); - assert(buf!=NULL); - /* set the timeout */ - timeout.tv_sec=hargs->timeout; - timeout.tv_usec=0; - /* open the file */ - fp = tio_fdopen(hargs->fd,&timeout,&timeout); - assert(fp!=NULL); - /* read the blocks */ - i=0; - for (k=0;kblocks;k++) - { - assert(tio_read(fp,buf,hargs->blocksize)==0); - /* check the buffer */ - for (j=0;jblocksize;j++) - assert(buf[j]==(uint8_t)(i++)); - } - /* close the file */ - assert(tio_close(fp)==0); - /* we're done */ - free(buf); - return NULL; -} - -static void *help_normwriter(void *arg) -{ - FILE *fp; - size_t i,j,k; - uint8_t *buf; - struct helper_args *hargs=(struct helper_args *)arg; - /* allocate the buffer */ - buf=(uint8_t *)malloc(hargs->blocksize); - assert(buf!=NULL); - /* open the file */ - fp = fdopen(hargs->fd,"wb"); - assert(fp!=NULL); - /* write the blocks */ - i=0; - for (k=0;kblocks;k++) - { - /* fill the buffer */ - for (j=0;jblocksize;j++) - buf[j]=i++; - assert(fwrite(buf,hargs->blocksize,1,fp)==1); - } - /* close the file flushing the buffer */ - assert(fclose(fp)==0); - /* we're done */ - free(buf); - return NULL; -} - -static void *help_normreader(void *arg) -{ - FILE *fp; - size_t i,j,k; - struct helper_args *hargs=(struct helper_args *)arg; - /* open the file */ - fp = fdopen(hargs->fd,"rb"); - assert(fp!=NULL); - /* read the blocks */ - i=0; - for (k=0;kblocks;k++) - { - /* check the buffer */ - for (j=0;jblocksize;j++) - assert(fgetc(fp)==(uint8_t)(i++)); - } - /* close the file */ - assert(fclose(fp)==0); - return NULL; -} - -/* -TODO: test timeout -TODO: test whether a simple request/response works -*/ - -static int test_blocks(size_t wbs, size_t wbl, size_t rbs, size_t rbl) -{ - int sp[2]; - pthread_t wthread, rthread; - struct helper_args wargs,rargs; - /* set up the socket pair */ - assert(socketpair(AF_UNIX,SOCK_STREAM,0,sp)==0); - /* log */ - printf("writing %d blocks of %d bytes (%d total)\n",wbl,wbs,wbl*wbs); - printf("reading %d blocks of %d bytes (%d total)\n",rbl,rbs,rbl*rbs); - /* start the writer thread */ - wargs.fd=sp[0]; - wargs.blocksize=wbs; - wargs.blocks=wbl; - wargs.timeout=2; - assert(pthread_create(&wthread,NULL,help_tiowriter,&wargs)==0); -/* sleep(1); */ - /* start the reader thread */ - rargs.fd=sp[1]; - rargs.blocksize=rbs; - rargs.blocks=rbl; - rargs.timeout=2; - assert(pthread_create(&rthread,NULL,help_tioreader,&rargs)==0); - /* wait for all threads to die */ - assert(pthread_join(wthread,NULL)==0); - assert(pthread_join(rthread,NULL)==0); - /* we're done */ - return 0; -} - -/* the main program... */ -int main(int UNUSED(argc),char UNUSED(*argv[])) -{ - /* normal read-writes */ - test_blocks(400,11,11,400); - test_blocks(4*1024,11,4*11,1024); - test_blocks(5*1023,20,20*1023,5); - /* reader closes file sooner */ -/* test_blocks(2*6*1023,20,20*1023,5); */ -/* test_blocks(10,10,10,9); */ - /* writer closes file sooner */ -/* test_blocks(4*1023,20,20*1023,5); */ -/* test_blocks(10,9,10,10); */ - return 0; -} -- cgit v1.2.3