X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fhttp_test.c;h=288282774d46bc6dbe3912add57ac58a3f545b09;hb=b25d0da3633407b2b12915097f7ae92022f3dabb;hp=e57ced9aa4310a8e8d181863c76db620a542bc99;hpb=d603ad8d35758a54f6cb08a7f8c16f6327ea86e0;p=bertos.git

diff --git a/bertos/net/http_test.c b/bertos/net/http_test.c
index e57ced9a..28828277 100644
--- a/bertos/net/http_test.c
+++ b/bertos/net/http_test.c
@@ -33,6 +33,8 @@
  * \brief HTTP Server test
  *
  * \author Daniele Basile <asterix@develer.com>
+ *
+ * notest: avr
  */
 
 #include <cfg/compiler.h>
@@ -66,6 +68,20 @@ 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 const char uri2[] = "test+test1+test2";
+static const char uri_check2[] = "test test1 test2";
+
+static char token_str[] = "var1=1&var2=2&var3=3&var4=4";
+static char token_str1[] = "var1=1&var2=2&=3&var4=";
+static char token_str2[] = "var1=test+test&var2=2&var3=test%5B%5D!@;'%22%5C.%20&var4=4";
+
 int http_testSetup(void)
 {
 	kdbg_init();
@@ -78,27 +94,155 @@ 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_decodeUrl(uri,sizeof(uri), decoded, sizeof(uri));
+
+	if (strcmp(decoded, uri_check))
+	{
+		kprintf("error 4 %s\n", decoded);
+		goto error;
+	}
+
+	char decoded1[sizeof(uri1)];
+	http_decodeUrl(uri1,sizeof(uri1), decoded1, sizeof(uri1));
+
+	if (strcmp(decoded1, uri_check1))
+	{
+		kprintf("error 5 %s\n", decoded1);
+		goto error;
+	}
+
+	char decoded2[sizeof(uri2)];
+	http_decodeUrl(uri2,sizeof(uri2), decoded2, sizeof(uri2));
+
+	if (strcmp(decoded2, uri_check2))
+	{
+		kprintf("error 5 %s\n", decoded2);
+		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;
+	}
+
+	if (http_getValue(token_str1, sizeof(token_str1), "var1", value, sizeof(value)) < 0)
+	{
+		kprintf("error 7 during get key %s\n", "var1");
+		goto error;
+	}
+	if (strcmp(value, "1"))
+	{
+		kprintf("error 7 value %s expect %s\n", value, "1");
+		goto error;
+
+	}
+
+	if (http_getValue(token_str1, sizeof(token_str1), "var4", value, sizeof(value)) < 0)
+	{
+		kprintf("error 7 during get key %s\n", "var4");
+		goto error;
+	}
+
+	if (strcmp(value, ""))
+	{
+		kprintf("error 7 value %s expect %s\n", value, "");
+		goto error;
+
+	}
+
+	len = http_tokenizeGetRequest(token_str2, sizeof(token_str2));
+	if (len != 4)
+	{
+		kprintf("error 8 len %d expect %d\n", len, 4);
+		goto error;
+	}
+
+	if (http_getValue(token_str2, sizeof(token_str2), "var3", value, sizeof(value)) < 0)
+	{
+		kprintf("error 8 during get key %s\n", "var3");
+		goto error;
+	}
+
+	if (strcmp(value, "test[]!@;'\"\\. "))
+	{
+		kprintf("error 8 value %s expect %s\n", value, "test[]!@;'\"\\. ");
+		goto error;
+
+	}
+
+	if (http_getValue(token_str2, sizeof(token_str2), "var1", value, sizeof(value)) < 0)
+	{
+		kprintf("error 7 during get key %s\n", "var1");
+		goto error;
+	}
+	if (strcmp(value, "test test"))
+	{
+		kprintf("error 7 value %s expect %s\n", value, "test test");
+		goto error;
+
+	}
+
 	return 0;
 
 error: