Imported Upstream version 0.9.2

[platform/upstream/iotivity.git] / resource / csdk / connectivity / test / caprotocolmessagetest.cpp

diff --git a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
index 12d6701..4791ce0 100644 (file)
--- a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
+++ b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
@@ -26,8 +26,6 @@
 
 namespace {
 
-static const char COAP_HEADER[] = "coap://[::]/";
-
 class CoAPOptionCase
 {
 public:
@@ -79,11 +77,10 @@ void verifyParsedOptions(CoAPOptionCase const *cases,
 
 TEST(CAProtocolMessage, CAParseURIBase)
 {
-    char sampleURI[] = "coap://[::]/oc/core?rt=core.sensor&if=core.mi.ll";
-
+    char sampleURI[] = "coap://[::]/oic/res?rt=core.sensor;if=core.mi.ll";
     CoAPOptionCase cases[] = {
-        {COAP_OPTION_URI_PATH, 2, "oc"},
-        {COAP_OPTION_URI_PATH, 4, "core"},
+        {COAP_OPTION_URI_PATH, 3, "oic"},
+        {COAP_OPTION_URI_PATH, 3, "res"},
         {COAP_OPTION_URI_QUERY, 14, "rt=core.sensor"},
         {COAP_OPTION_URI_QUERY, 13, "if=core.mi.ll"},
     };
@@ -95,6 +92,7 @@ TEST(CAProtocolMessage, CAParseURIBase)
 
 
     verifyParsedOptions(cases, numCases, optlist);
+    coap_delete_list(optlist);
 }
 
 // Try for multiple URI path components that still total less than 128
@@ -102,7 +100,7 @@ TEST(CAProtocolMessage, CAParseURIManyPath)
 {
     char sampleURI[] = "coap://[::]"
         "/medium/a/b/c/d/e/f/g/h/i/j/"
-        "?rt=core.sensor&if=core.mi.ll";
+        "?rt=core.sensor;if=core.mi.ll";
 
     CoAPOptionCase cases[] = {
         {COAP_OPTION_URI_PATH, 6, "medium"},
@@ -127,17 +125,18 @@ TEST(CAProtocolMessage, CAParseURIManyPath)
 
 
     verifyParsedOptions(cases, numCases, optlist);
+    coap_delete_list(optlist);
 }
 
 // Try for multiple URI parameters that still total less than 128
 TEST(CAProtocolMessage, CAParseURIManyParams)
 {
-    char sampleURI[] = "coap://[::]/oc/core/"
-        "?rt=core.sensor&a=0&b=1&c=2&d=3&e=4&f=5&g=6&h=7&i=8&j=9";
+    char sampleURI[] = "coap://[::]/oic/res/"
+        "?rt=core.sensor;a=0;b=1;c=2;d=3;e=4;f=5;g=6;h=7;i=8;j=9";
 
     CoAPOptionCase cases[] = {
-        {COAP_OPTION_URI_PATH, 2, "oc"},
-        {COAP_OPTION_URI_PATH, 4, "core"},
+        {COAP_OPTION_URI_PATH, 3, "oic"},
+        {COAP_OPTION_URI_PATH, 3, "res"},
         {COAP_OPTION_URI_QUERY, 14, "rt=core.sensor"},
         {COAP_OPTION_URI_QUERY, 3, "a=0"},
         {COAP_OPTION_URI_QUERY, 3, "b=1"},
@@ -158,21 +157,22 @@ TEST(CAProtocolMessage, CAParseURIManyParams)
 
 
     verifyParsedOptions(cases, numCases, optlist);
+    coap_delete_list(optlist);
 }
 
 // Test that an initial long path component won't hide latter ones.
 TEST(CAProtocolMessage, CAParseURILongPath)
 {
-    char sampleURI[] = "coap://[::]/oc"
+    char sampleURI[] = "coap://[::]/oic"
         "123456789012345678901234567890123456789012345678901234567890"
         "12345678901234567890123456789012345678901234567890"
-        "/core?rt=core.sensor&if=core.mi.ll";
+        "/res?rt=core.sensor;if=core.mi.ll";
 
     CoAPOptionCase cases[] = {
-        {COAP_OPTION_URI_PATH, 112, "oc"
+        {COAP_OPTION_URI_PATH, 113, "oic"
         "123456789012345678901234567890123456789012345678901234567890"
         "12345678901234567890123456789012345678901234567890"},
-        {COAP_OPTION_URI_PATH, 4, "core"},
+        {COAP_OPTION_URI_PATH, 3, "res"},
         {COAP_OPTION_URI_QUERY, 14, "rt=core.sensor"},
         {COAP_OPTION_URI_QUERY, 13, "if=core.mi.ll"},
     };
@@ -184,4 +184,5 @@ TEST(CAProtocolMessage, CAParseURILongPath)
 
 
     verifyParsedOptions(cases, numCases, optlist);
+    coap_delete_list(optlist);
 }