From 12a4c360725088b1cf0340e958ef1adda10202b0 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 8 Jun 2012 23:28:37 +0000
Subject: [PATCH] fix the str_split test to function the way our docs specify
 that it should

SVN revision: 71872
---
 legacy/eina/src/tests/eina_test_str.c | 34 ++++++++++++++++-----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/legacy/eina/src/tests/eina_test_str.c b/legacy/eina/src/tests/eina_test_str.c
index f0ea291731..b1bc4ffe31 100644
--- a/legacy/eina/src/tests/eina_test_str.c
+++ b/legacy/eina/src/tests/eina_test_str.c
@@ -96,76 +96,82 @@ START_TEST(str_split)
 
    result = eina_str_split_full("nomatch", "x", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 1);
+        fail_if(elements != 2);
         fail_if(strcmp(result[0], "nomatch") != 0);
+        fail_if(result[1]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("nomatch", "xyz", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 1);
+        fail_if(elements != 2);
         fail_if(strcmp(result[0], "nomatch") != 0);
+        fail_if(result[1]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("match:match:match", ":", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 3);
-   while (elements >= 1)
-     {
-        elements--;
-        fail_if(strcmp(result[elements], "match") != 0);
-     }
+        fail_if(elements != 4);
+   for (elements = 0; elements < 4 - 1; elements++)
+     fail_if(strcmp(result[elements], "match") != 0);
+     fail_if(result[3]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("a:b:c", ":", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 3);
+        fail_if(elements != 4);
         fail_if(strcmp(result[0], "a") != 0);
         fail_if(strcmp(result[1], "b") != 0);
         fail_if(strcmp(result[2], "c") != 0);
+        fail_if(result[3]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("a:b:", ":", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 3);
+        fail_if(elements != 4);
         fail_if(strcmp(result[0], "a") != 0);
         fail_if(strcmp(result[1], "b") != 0);
         fail_if(strcmp(result[2], "") != 0);
+        fail_if(result[3]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full(":b:c", ":", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 3);
+        fail_if(elements != 4);
         fail_if(strcmp(result[0], "") != 0);
         fail_if(strcmp(result[1], "b") != 0);
         fail_if(strcmp(result[2], "c") != 0);
+        fail_if(result[3]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full(":", ":", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 2);
+        fail_if(elements != 3);
         fail_if(strcmp(result[0], "") != 0);
         fail_if(strcmp(result[1], "") != 0);
+        fail_if(result[2]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("a", "!!!!!!!!!", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 1);
+        fail_if(elements != 2);
         fail_if(strcmp(result[0], "a") != 0);
+        fail_if(result[1]);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("aaba", "ab", -1, &elements);
         fail_if(result == NULL);
-        fail_if(elements != 2);
+        fail_if(elements != 3);
         fail_if(strcmp(result[0], "a") != 0);
         fail_if(strcmp(result[1], "a") != 0);
+        fail_if(result[2]);
         free(result[0]);
         free(result);