Add some utility to manage query strings.

[bertos.git] / bertos / net / http_test.c

diff --git a/bertos/net/http_test.c b/bertos/net/http_test.c
index e57ced9aa4310a8e8d181863c76db620a542bc99..59902e2697af3d22b801897612ed34088cfd4f1d 100644 (file)
--- a/bertos/net/http_test.c
+++ b/bertos/net/http_test.c
@@ -66,6 +66,16 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 \
 Accept-Encoding: gzip,deflate,sdch Accept-Language: it-IT,it;q=0.8,en-US;\
 q=0.6,en;q=0.4 Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3";
 
+
+static const char uri[] = "test%5B%5D!@;'%22%5C.%20";
+static const char uri_check[] = "test[]!@;'\"\\. ";
+
+static const char uri1[] = "!*'();:@&=%2B%24%2C/?#%5B%5D%3C%3E%7E.%22%7B%7D%7C%5C-%60_%5E%25";
+static const char uri_check1[] = "!*'();:@&=+$,/?#[]<>~.\"{}|\\-`_^%";
+
+static char token_str[] = "var1=1&var2=2&var3=3&var4=4";
+static char token_str1[] = "var1=1&var2=2&=3&var4=";
+
 int http_testSetup(void)
 {
        kdbg_init();
@@ -78,26 +88,105 @@ int http_testRun(void)
        memset(name, 0, sizeof(name));
        http_getPageName(get_str, sizeof(get_str), name, sizeof(name));
 
-       if (!strcmp("/test/page1", name))
+       if (strcmp("test/page1", name))
+       {
+               kprintf("error 0 %s\n", name);
                goto error;
+       }
 
        http_getPageName(get_str1, sizeof(get_str1), name, sizeof(name));
 
-       kprintf("1 name %s\n", name);
-       if (!strcmp("/test/page1", name))
+       if (strcmp("test/page1", name))
+       {
+               kprintf("error 1 %s\n", name);
                goto error;
+       }
+
 
        http_getPageName(get_str2, sizeof(get_str2), name, sizeof(name));
 
-       kprintf("2 name %s\n", name);
        if (name[0] != '\0')
+       {
+               kprintf("error 2 %s\n", name);
                goto error;
+       }
+
 
        http_getPageName(get_str2, sizeof(get_str2), name, sizeof(name));
 
-       kprintf("3 name %s\n", name);
        if (name[0] != '\0')
+       {
+               kprintf("error 3 %s\n", name);
+               goto error;
+       }
+
+
+       char decoded[sizeof(uri)];
+       http_decodeUri(uri,sizeof(uri), decoded, sizeof(uri));
+
+       if (strcmp(decoded, uri_check))
+       {
+               kprintf("error 4 %s\n", decoded);
+               goto error;
+       }
+
+       char decoded1[sizeof(uri1)];
+       http_decodeUri(uri1,sizeof(uri1), decoded1, sizeof(uri1));
+
+       if (strcmp(decoded1, uri_check1))
+       {
+               kprintf("error 5 %s\n", decoded1);
+               goto error;
+       }
+
+
+       int len = http_tokenizeGetRequest(token_str, sizeof(token_str));
+       if (len != 4)
+       {
+               kprintf("error 6 len %d expect %d\n", len, 4);
                goto error;
+       }
+
+       char value[80];
+       http_getValue(token_str, sizeof(token_str), "var1", value, sizeof(value));
+       if (strcmp(value, "1"))
+       {
+               kprintf("error 6 value %s expect %s\n", value, "1");
+               goto error;
+
+       }
+
+       http_getValue(token_str, sizeof(token_str), "var4", value, sizeof(value));
+       if (strcmp(value, "4"))
+       {
+               kprintf("error 6 value %s expect %s\n", value, "4");
+               goto error;
+
+       }
+
+
+       len = http_tokenizeGetRequest(token_str1, sizeof(token_str1));
+       if (len != 4)
+       {
+               kprintf("error 7 len %d expect %d\n", len, 4);
+               goto error;
+       }
+
+       http_getValue(token_str1, sizeof(token_str1), "var1", value, sizeof(value));
+       if (strcmp(value, "1"))
+       {
+               kprintf("error 7 value %s expect %s\n", value, "1");
+               goto error;
+
+       }
+
+       http_getValue(token_str1, sizeof(token_str1), "var4", value, sizeof(value));
+       if (strcmp(value, ""))
+       {
+               kprintf("error 7 value %s expect %s\n", value, "");
+               goto error;
+
+       }
 
        return 0;