Merge pull request #10 from monich/test_success3

[mms-lib] Added retrieve/Success3 test case
sailfishos · Mar 28, 2014 · c917f17 · c917f17
2 parents d83579a + f366735
commit c917f17
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 10 deletions.
diff --git a/...t/retrieve/data/Success/m-acknowledge.ind → .../retrieve/data/Success1/m-acknowledge.ind b/...t/retrieve/data/Success/m-acknowledge.ind → .../retrieve/data/Success1/m-acknowledge.ind
diff --git a/.../retrieve/data/Success/m-notification.ind → ...retrieve/data/Success1/m-notification.ind b/.../retrieve/data/Success/m-notification.ind → ...retrieve/data/Success1/m-notification.ind
diff --git a/...est/retrieve/data/Success/m-retrieve.conf → ...st/retrieve/data/Success1/m-retrieve.conf b/...est/retrieve/data/Success/m-retrieve.conf → ...st/retrieve/data/Success1/m-retrieve.conf
diff --git a/mms-lib/test/retrieve/data/Success/parts/0 → mms-lib/test/retrieve/data/Success1/parts/0 b/mms-lib/test/retrieve/data/Success/parts/0 → mms-lib/test/retrieve/data/Success1/parts/0
diff --git a/...retrieve/data/Success/parts/131200181.jpg → ...etrieve/data/Success1/parts/131200181.jpg b/...retrieve/data/Success/parts/131200181.jpg → ...etrieve/data/Success1/parts/131200181.jpg
diff --git a/...retrieve/data/Success/parts/140100041.jpg → ...etrieve/data/Success1/parts/140100041.jpg b/...retrieve/data/Success/parts/140100041.jpg → ...etrieve/data/Success1/parts/140100041.jpg
diff --git a/...retrieve/data/Success/parts/text_0011.txt → ...etrieve/data/Success1/parts/text_0011.txt b/...retrieve/data/Success/parts/text_0011.txt → ...etrieve/data/Success1/parts/text_0011.txt
diff --git a/...retrieve/data/Success/parts/text_0021.txt → ...etrieve/data/Success1/parts/text_0021.txt b/...retrieve/data/Success/parts/text_0021.txt → ...etrieve/data/Success1/parts/text_0021.txt
diff --git a/mms-lib/test/retrieve/data/Success3/m-acknowledge.ind b/mms-lib/test/retrieve/data/Success3/m-acknowledge.ind
diff --git a/mms-lib/test/retrieve/data/Success3/m-notification.ind b/mms-lib/test/retrieve/data/Success3/m-notification.ind
diff --git a/mms-lib/test/retrieve/data/Success3/m-retrieve.conf b/mms-lib/test/retrieve/data/Success3/m-retrieve.conf
diff --git a/mms-lib/test/retrieve/data/Success3/parts/0 b/mms-lib/test/retrieve/data/Success3/parts/0
@@ -0,0 +1,17 @@
+<smil>
+ <head>
+  <layout>
+   <root-layout/>
+   <region width="100%" height="30%" left="0%" fit="scroll" id="Text" top="0%"/>
+   <region width="100%" height="70%" left="0%" fit="meet" id="Image" top="30%"/>
+  </layout>
+ </head>
+ <body>
+  <par dur="5s">
+   <img region="Image" src="cid:1"/>
+  </par>
+  <par dur="5s">
+   <text region="Text" src="cid:2"/>
+  </par>
+ </body>
+</smil>
diff --git a/mms-lib/test/retrieve/data/Success3/parts/1.jpg b/mms-lib/test/retrieve/data/Success3/parts/1.jpg
diff --git a/mms-lib/test/retrieve/data/Success3/parts/text_001.txt b/mms-lib/test/retrieve/data/Success3/parts/text_001.txt
@@ -0,0 +1 @@
+Баночка
diff --git a/mms-lib/test/retrieve/test_retrieve.c b/mms-lib/test/retrieve/test_retrieve.c
@@ -72,7 +72,7 @@ typedef struct test {
     int ret;
 } Test;
 
-static const TestPartDesc retrieve_success_parts [] = {
+static const TestPartDesc retrieve_success1_parts [] = {
     { "application/smil;charset=utf-8", "<0>", "0.smil" },
     { "text/plain;charset=utf-8", "<text_0011.txt>", "text_0011.txt" },
     { "image/jpeg", "<131200181.jpg>", "131200181.jpg" },
@@ -86,12 +86,18 @@ static const TestPartDesc retrieve_success2_parts [] = {
     { "application/smil;charset=utf-8", "<332047400>", "332047400" },
 };
 
+static const TestPartDesc retrieve_success3_parts [] = {
+    { "application/smil;charset=utf-8", "<0>", "0" },
+    { "image/jpeg", "<1>", "1.jpg" },
+    { "text/plain;charset=utf-8", "<2>", "text_001.txt" }
+};
+
 #define TEST_PARTS(parts) parts, G_N_ELEMENTS(parts)
 #define TEST_PARTS_NONE NULL, 0
 
 static const TestDesc retrieve_tests[] = {
     {
-        "Success",
+        "Success1",
         NULL,
         "m-notification.ind",
         "m-retrieve.conf",
@@ -100,22 +106,22 @@ static const TestDesc retrieve_tests[] = {
         NULL,
         MMS_RECEIVE_STATE_DECODING,
         MMS_MESSAGE_TYPE_ACKNOWLEDGE_IND,
-        TEST_PARTS(retrieve_success_parts),
+        TEST_PARTS(retrieve_success1_parts),
         0
-   },{
-        "DeferSuccess",
-        "Success",
+    },{
+        "Success2", /* Generated by Nokia C6 (Symbian "Belle") */
+        NULL,
         "m-notification.ind",
         "m-retrieve.conf",
         SOUP_STATUS_OK,
         MMS_CONTENT_TYPE,
         NULL,
         MMS_RECEIVE_STATE_DECODING,
         MMS_MESSAGE_TYPE_ACKNOWLEDGE_IND,
-        TEST_PARTS(retrieve_success_parts),
-        TEST_DEFER_RECEIVE
+        TEST_PARTS(retrieve_success2_parts),
+        0
     },{
-        "Success2", /* Generated by Nokia C6 (Symbian "Belle") */
+        "Success3", /* Generated by Nokia N9 */
         NULL,
         "m-notification.ind",
         "m-retrieve.conf",
@@ -124,8 +130,20 @@ static const TestDesc retrieve_tests[] = {
         NULL,
         MMS_RECEIVE_STATE_DECODING,
         MMS_MESSAGE_TYPE_ACKNOWLEDGE_IND,
-        TEST_PARTS(retrieve_success2_parts),
+        TEST_PARTS(retrieve_success3_parts),
         0
+   },{
+        "DeferSuccess",
+        "Success1",
+        "m-notification.ind",
+        "m-retrieve.conf",
+        SOUP_STATUS_OK,
+        MMS_CONTENT_TYPE,
+        NULL,
+        MMS_RECEIVE_STATE_DECODING,
+        MMS_MESSAGE_TYPE_ACKNOWLEDGE_IND,
+        TEST_PARTS(retrieve_success1_parts),
+        TEST_DEFER_RECEIVE
      },{
         "Expired",
         NULL,