From 12a0e6ab2388b9e7a67dd0582c45fb3305836c09 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 14 Dec 2011 02:04:18 +0000 Subject: [PATCH] added test for url_encode --- po/fr.po | 34 ++++---- po/psensor.pot | 34 ++++---- po/tr.po | 34 ++++---- po/zh_CN.po | 34 ++++---- src/lib/hdd_atasmart.c | 2 +- tests/Makefile.am | 8 +- tests/Makefile.in | 228 ++++++++++++++++++++++++++++++++++++++++++++---- tests/test_url_encode.c | 80 +++++++++++++++++ 8 files changed, 366 insertions(+), 88 deletions(-) create mode 100644 tests/test_url_encode.c diff --git a/po/fr.po b/po/fr.po index 6093b8f..56f1cd0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.9\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-11 12:29+0100\n" +"POT-Creation-Date: 2011-12-14 02:51+0100\n" "PO-Revision-Date: 2011-02-07 21:18+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Oriya\n" @@ -33,7 +33,7 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisees par la loi applicable.\n" -#: src/main.c:88 src/server/server.c:86 +#: src/main.c:88 src/server/server.c:85 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation: %s [OPTION]...\n" @@ -69,12 +69,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:104 +#: src/main.c:110 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bugs à: %s\n" -#: src/main.c:112 src/server/server.c:106 +#: src/main.c:112 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page d'acceuil: <%s>\n" @@ -84,7 +84,7 @@ msgstr "%s page d'acceuil: <%s>\n" msgid "Enables debug mode." msgstr "Activée" -#: src/main.c:421 src/server/server.c:354 +#: src/main.c:421 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez `%s --help' pour plus d'informations.\n" @@ -228,12 +228,12 @@ msgstr "ERREUR: Contenu invalide: %s\n" msgid "Invalid JSON: %s" msgstr "ERREUR: Invalide JSON: %s\n" -#: src/server/server.c:53 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:76 +#: src/server/server.c:75 #, fuzzy, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -250,14 +250,14 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisees par la loi applicable.\n" -#: src/server/server.c:88 +#: src/server/server.c:87 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server est un serveur HTTP pour surveiller à distance les sondes " "matérielles." -#: src/server/server.c:93 +#: src/server/server.c:92 #, fuzzy msgid "" " -h, --help\t\tdisplay this help and exit\n" @@ -266,7 +266,7 @@ msgstr "" " -h, --help afficher cette aide et quitter\n" " -v, --version afficher les informations de version et quitter" -#: src/server/server.c:98 +#: src/server/server.c:97 #, fuzzy msgid "" " -d,--debug\t\trun in debug mode\n" @@ -276,36 +276,36 @@ msgstr "" " -p,--port=PORT port du serveur Web\n" " -w,--wdir=DIR répertoire contenant les pages du serveur Web" -#: src/server/server.c:175 +#: src/server/server.c:174 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:290 +#: src/server/server.c:289 #, c-format msgid "HTTP Request: %s\n" msgstr "Requete HTTP: %s\n" -#: src/server/server.c:368 +#: src/server/server.c:367 #, c-format msgid "ERROR: no sensors detected\n" msgstr "ERREUR: Aucune sonde detectee\n" -#: src/server/server.c:375 +#: src/server/server.c:374 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "ERREUR: Echec de la creation du serveur Web\n" -#: src/server/server.c:379 +#: src/server/server.c:378 #, fuzzy, c-format msgid "Web server started on port: %d" msgstr "Server Web demarre sur le port: %d\n" -#: src/server/server.c:380 +#: src/server/server.c:379 #, fuzzy, c-format msgid "WWW directory: %s" msgstr "WWW repertoire: %s\n" -#: src/server/server.c:381 +#: src/server/server.c:380 #, fuzzy, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d\n" diff --git a/po/psensor.pot b/po/psensor.pot index f47b252..3d137b9 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-11 12:29+0100\n" +"POT-Creation-Date: 2011-12-14 02:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,7 +27,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:86 +#: src/main.c:88 src/server/server.c:85 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" @@ -58,12 +58,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:104 +#: src/main.c:110 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:112 src/server/server.c:106 +#: src/main.c:112 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -72,7 +72,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:354 +#: src/main.c:421 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -206,12 +206,12 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:53 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:76 +#: src/server/server.c:75 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -221,54 +221,54 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:88 +#: src/server/server.c:87 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:93 +#: src/server/server.c:92 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:98 +#: src/server/server.c:97 msgid "" " -d,--debug\t\trun in debug mode\n" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:175 +#: src/server/server.c:174 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:290 +#: src/server/server.c:289 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:368 +#: src/server/server.c:367 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:375 +#: src/server/server.c:374 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:378 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:380 +#: src/server/server.c:379 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:381 +#: src/server/server.c:380 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/tr.po b/po/tr.po index a8eee90..a339455 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-11 12:29+0100\n" +"POT-Creation-Date: 2011-12-14 02:51+0100\n" "PO-Revision-Date: 2011-04-10 13:11+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -28,7 +28,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:86 +#: src/main.c:88 src/server/server.c:85 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" @@ -59,12 +59,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:104 +#: src/main.c:110 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:112 src/server/server.c:106 +#: src/main.c:112 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" @@ -73,7 +73,7 @@ msgstr "%s ana sayfa: <%s>\n" msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:354 +#: src/main.c:421 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" @@ -211,12 +211,12 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:53 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:76 +#: src/server/server.c:75 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -226,54 +226,54 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:88 +#: src/server/server.c:87 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:93 +#: src/server/server.c:92 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:98 +#: src/server/server.c:97 msgid "" " -d,--debug\t\trun in debug mode\n" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:175 +#: src/server/server.c:174 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:290 +#: src/server/server.c:289 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:368 +#: src/server/server.c:367 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:375 +#: src/server/server.c:374 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:378 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:380 +#: src/server/server.c:379 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:381 +#: src/server/server.c:380 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3d0d820..415b4ae 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.10\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-11 12:29+0100\n" +"POT-Creation-Date: 2011-12-14 02:51+0100\n" "PO-Revision-Date: 2011-06-06 08:57+0000\n" "Last-Translator: royclark \n" "Language-Team: Chinese (simplified)\n" @@ -28,7 +28,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:86 +#: src/main.c:88 src/server/server.c:85 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法:%s [选项]...\n" @@ -61,12 +61,12 @@ msgstr " -u, --url=URL psensor服务器的 URL ,比如:http://hostname:3131 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:110 src/server/server.c:104 +#: src/main.c:110 src/server/server.c:103 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:112 src/server/server.c:106 +#: src/main.c:112 src/server/server.c:105 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -75,7 +75,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:354 +#: src/main.c:421 src/server/server.c:353 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -210,12 +210,12 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:53 +#: src/server/server.c:52 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:76 +#: src/server/server.c:75 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -225,12 +225,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:88 +#: src/server/server.c:87 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。" -#: src/server/server.c:93 +#: src/server/server.c:92 #, fuzzy msgid "" " -h, --help\t\tdisplay this help and exit\n" @@ -239,43 +239,43 @@ msgstr "" " -h, --help 显示这个帮助并退出\n" " -v, --version 显示版本信息并退出" -#: src/server/server.c:98 +#: src/server/server.c:97 msgid "" " -d,--debug\t\trun in debug mode\n" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:175 +#: src/server/server.c:174 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:290 +#: src/server/server.c:289 #, c-format msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:368 +#: src/server/server.c:367 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:375 +#: src/server/server.c:374 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:378 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:380 +#: src/server/server.c:379 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:381 +#: src/server/server.c:380 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c index 56be1a7..592fcbd 100644 --- a/src/lib/hdd_atasmart.c +++ b/src/lib/hdd_atasmart.c @@ -29,7 +29,7 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors, int values_max_length) { - + log_debug("hdd_psensor_list_add"); return sensors; diff --git a/tests/Makefile.am b/tests/Makefile.am index 1acf104..aa957a0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,4 +2,10 @@ check-local: checkpatch.pl find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl -q --no-tree -emacs -f {} \; find $(top_srcdir)/src -name \*.h -exec $(srcdir)/checkpatch.pl -q --no-tree -emacs -f {} \; -EXTRA_DIST = checkpatch.pl \ No newline at end of file +EXTRA_DIST = checkpatch.pl + +check_PROGRAMS = test-url-encode +test_url_encode_SOURCES = test_url_encode.c +test_url_encode_LDADD = ../src/lib/libpsensor.a + +TESTS = test-url-encode \ No newline at end of file diff --git a/tests/Makefile.in b/tests/Makefile.in index 20e46b2..85ec185 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -33,6 +33,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +check_PROGRAMS = test-url-encode$(EXEEXT) +TESTS = test-url-encode$(EXEEXT) subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -43,8 +45,23 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = +am_test_url_encode_OBJECTS = test_url_encode.$(OBJEXT) +test_url_encode_OBJECTS = $(am_test_url_encode_OBJECTS) +test_url_encode_DEPENDENCIES = ../src/lib/libpsensor.a +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(test_url_encode_SOURCES) +DIST_SOURCES = $(test_url_encode_SOURCES) +ETAGS = etags +CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -193,9 +210,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = checkpatch.pl +test_url_encode_SOURCES = test_url_encode.c +test_url_encode_LDADD = ../src/lib/libpsensor.a all: all-am .SUFFIXES: +.SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -226,12 +246,178 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +clean-checkPROGRAMS: + -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) +test-url-encode$(EXEEXT): $(test_url_encode_OBJECTS) $(test_url_encode_DEPENDENCIES) + @rm -f test-url-encode$(EXEEXT) + $(LINK) $(test_url_encode_OBJECTS) $(test_url_encode_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_url_encode.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique tags: TAGS -TAGS: +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi ctags: CTAGS -CTAGS: - +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -264,7 +450,8 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile installdirs: @@ -295,11 +482,13 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic mostlyclean-am +clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -342,12 +531,13 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-am @@ -361,15 +551,17 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: all all-am check check-am check-local clean clean-generic \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ + clean clean-checkPROGRAMS clean-generic ctags distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am check-local: checkpatch.pl diff --git a/tests/test_url_encode.c b/tests/test_url_encode.c new file mode 100644 index 0000000..3d7ed68 --- /dev/null +++ b/tests/test_url_encode.c @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2010-2011 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + *02110-1301 USA + */ + + +#include +#include +#include +#include + +#include "../src/lib/url.h" + +int test_url_encode(char *url, char *ref_url) +{ + char *res_url; + int ret; + + res_url = url_encode(url); + + if (strcmp(ref_url, res_url)) { + fprintf(stderr, + "FAILURE: url_encode(%s) returns %s instead of %s\n", + url, res_url, ref_url); + ret = 0; + } else { + ret = 1; + } + + free(res_url); + + return ret; +} + +int tests_url_encode() +{ + int failures; + + failures = 0; + + if (!test_url_encode("abcdef12345", "abcdef12345")) + failures++; + + if (!test_url_encode("a b", "a%20b")) + failures++; + + if (!test_url_encode("ab-_.~", "ab-_.~")) + failures++; + + return failures; +} + + +int main(int argc, char **argv) +{ + int failures; + + failures = 0; + + failures += tests_url_encode(); + + if (failures) + exit(EXIT_FAILURE); + else + exit(EXIT_SUCCESS); +} -- 2.7.4