partial tests for kvp.c

diff --git a/lib/test.c b/lib/test.c
index 5aa9f5749a09580669f0d89b3f2c681a322e8bc3..07d09a7be94e25773799e8016f2b06506e0f82ff 100644 (file)
--- a/lib/test.c
+++ b/lib/test.c
@@ -50,6 +50,7 @@
 #include "hash.h"
 #include "selection.h"
 #include "syscalls.h"
 #include "hash.h"
 #include "selection.h"
 #include "syscalls.h"

+#include "kvp.h"

 
 static int tests, errors;
 static int fail_first;
 
 static int tests, errors;
 static int fail_first;


@@ -814,6 +815,31 @@ static void test_wstat(void) {
   check_string_prefix(wstat(w), "terminated by signal 15");
 }
 
   check_string_prefix(wstat(w), "terminated by signal 15");
 }
 

+static void test_kvp(void) {
+  struct kvp *k;
+  
+  fprintf(stderr, "test_kvp\n");
+#define KVP_URLDECODE(S) kvp_urldecode((S), strlen(S))
+  insist(KVP_URLDECODE("=%zz") == 0);
+  insist(KVP_URLDECODE("=%0") == 0);
+  insist(KVP_URLDECODE("=%0z") == 0);
+  insist(KVP_URLDECODE("=%%") == 0);
+  insist(KVP_URLDECODE("==%") == 0);
+  insist(KVP_URLDECODE("wibble") == 0);
+  insist(KVP_URLDECODE("") == 0);
+  insist(KVP_URLDECODE("wibble&") == 0);
+  insist((k = KVP_URLDECODE("one=bl%61t+foo")) != 0);
+  check_string(kvp_get(k, "one"), "blat foo");
+  insist(kvp_get(k, "ONE") == 0);
+  insist(k->next == 0);
+  insist((k = KVP_URLDECODE("wibble=splat&bar=spong")) != 0);
+  check_string(kvp_get(k, "wibble"), "splat");
+  check_string(kvp_get(k, "bar"), "spong");
+  insist(kvp_get(k, "ONE") == 0);
+  insist(k->next->next == 0);
+  /* TODO test encoding too */
+}
+

 int main(void) {
   fail_first = !!getenv("FAIL_FIRST");
   insist('\n' == 0x0A);
 int main(void) {
   fail_first = !!getenv("FAIL_FIRST");
   insist('\n' == 0x0A);


@@ -842,6 +868,7 @@ int main(void) {
   test_hex();
   /* inputline.c */
   /* kvp.c */
   test_hex();
   /* inputline.c */
   /* kvp.c */

+  test_kvp();

   /* log.c */
   /* mem.c */
   /* mime.c */
   /* log.c */
   /* mem.c */
   /* mime.c */

diff --git a/lib/wstat.h b/lib/wstat.h
index 5a145ecb9f9e270ea7ce2d6b920fcc499b479769..873b4f412bcee68b60193290d097bb6ec2325b57 100644 (file)
--- a/lib/wstat.h
+++ b/lib/wstat.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */

+/** @file lib/wstat.h
+ * @brief Convert wait status to text
+ */

 
 #ifndef WSTAT_H
 #define WSTAT_H
 
 #ifndef WSTAT_H
 #define WSTAT_H