diff --git a/mms-lib/test/retrieve/data/Success/m-acknowledge.ind b/mms-lib/test/retrieve/data/Success1/m-acknowledge.ind
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/m-acknowledge.ind
rename to mms-lib/test/retrieve/data/Success1/m-acknowledge.ind
diff --git a/mms-lib/test/retrieve/data/Success/m-notification.ind b/mms-lib/test/retrieve/data/Success1/m-notification.ind
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/m-notification.ind
rename to mms-lib/test/retrieve/data/Success1/m-notification.ind
diff --git a/mms-lib/test/retrieve/data/Success/m-retrieve.conf b/mms-lib/test/retrieve/data/Success1/m-retrieve.conf
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/m-retrieve.conf
rename to mms-lib/test/retrieve/data/Success1/m-retrieve.conf
diff --git a/mms-lib/test/retrieve/data/Success/parts/0 b/mms-lib/test/retrieve/data/Success1/parts/0
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/parts/0
rename to mms-lib/test/retrieve/data/Success1/parts/0
diff --git a/mms-lib/test/retrieve/data/Success/parts/131200181.jpg b/mms-lib/test/retrieve/data/Success1/parts/131200181.jpg
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/parts/131200181.jpg
rename to mms-lib/test/retrieve/data/Success1/parts/131200181.jpg
diff --git a/mms-lib/test/retrieve/data/Success/parts/140100041.jpg b/mms-lib/test/retrieve/data/Success1/parts/140100041.jpg
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/parts/140100041.jpg
rename to mms-lib/test/retrieve/data/Success1/parts/140100041.jpg
diff --git a/mms-lib/test/retrieve/data/Success/parts/text_0011.txt b/mms-lib/test/retrieve/data/Success1/parts/text_0011.txt
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/parts/text_0011.txt
rename to mms-lib/test/retrieve/data/Success1/parts/text_0011.txt
diff --git a/mms-lib/test/retrieve/data/Success/parts/text_0021.txt b/mms-lib/test/retrieve/data/Success1/parts/text_0021.txt
similarity index 100%
rename from mms-lib/test/retrieve/data/Success/parts/text_0021.txt
rename to mms-lib/test/retrieve/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
new file mode 100644
index 0000000..9eb95b7
Binary files /dev/null and b/mms-lib/test/retrieve/data/Success3/m-acknowledge.ind differ
diff --git a/mms-lib/test/retrieve/data/Success3/m-notification.ind b/mms-lib/test/retrieve/data/Success3/m-notification.ind
new file mode 100644
index 0000000..29c9606
Binary files /dev/null and b/mms-lib/test/retrieve/data/Success3/m-notification.ind differ
diff --git a/mms-lib/test/retrieve/data/Success3/m-retrieve.conf b/mms-lib/test/retrieve/data/Success3/m-retrieve.conf
new file mode 100644
index 0000000..852486d
Binary files /dev/null and b/mms-lib/test/retrieve/data/Success3/m-retrieve.conf differ
diff --git a/mms-lib/test/retrieve/data/Success3/parts/0 b/mms-lib/test/retrieve/data/Success3/parts/0
new file mode 100644
index 0000000..c97d23c
--- /dev/null
+++ b/mms-lib/test/retrieve/data/Success3/parts/0
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
diff --git a/mms-lib/test/retrieve/data/Success3/parts/1.jpg b/mms-lib/test/retrieve/data/Success3/parts/1.jpg
new file mode 100644
index 0000000..ae429f4
Binary files /dev/null and b/mms-lib/test/retrieve/data/Success3/parts/1.jpg differ
diff --git a/mms-lib/test/retrieve/data/Success3/parts/text_001.txt b/mms-lib/test/retrieve/data/Success3/parts/text_001.txt
new file mode 100644
index 0000000..1bb2e7b
--- /dev/null
+++ b/mms-lib/test/retrieve/data/Success3/parts/text_001.txt
@@ -0,0 +1 @@
+Баночка
\ No newline at end of file
diff --git a/mms-lib/test/retrieve/test_retrieve.c b/mms-lib/test/retrieve/test_retrieve.c
index 64dd77a..ee906b6 100644
--- 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" },
{ "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,11 +106,11 @@ 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,
@@ -112,10 +118,10 @@ static const TestDesc retrieve_tests[] = {
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,