Merge pull request #5190 from diffblue/fix_split_string

Fix split_string remove_empty case

Author: Daniel Kroening

src/util/string_utils.cpp

@@ -50,7 +50,8 @@ void split_string(
 
   if(s.empty())
   {
-    result.push_back("");
+    if(!remove_empty)
+      result.push_back("");
     return;
   }
 
@@ -84,7 +85,7 @@ void split_string(
   if(!remove_empty || !new_s.empty())
     result.push_back(new_s);
 
-  if(result.empty())
+  if(!remove_empty && result.empty())
     result.push_back("");
 }
 

unit/util/string_utils/split_string.cpp

@@ -113,11 +113,8 @@ SCENARIO("split_string", "[core][utils][string_utils][split_string]")
       expected_resultst expected_results;
       expected_results.no_strip_no_remove = {""};
       expected_results.strip_no_remove = {""};
-
-      // TODO(tkiley): This is probably wrong, since I'd expect removing empty
-      // TODO(tkiley): elements to return an empty vector here.
-      expected_results.no_strip_remove_empty = {""};
-      expected_results.strip_remove_empty = {""};
+      expected_results.no_strip_remove_empty = {};
+      expected_results.strip_remove_empty = {};
 
       run_on_all_variants(string, ',', expected_results);
     }
@@ -131,9 +128,7 @@ SCENARIO("split_string", "[core][utils][string_utils][split_string]")
       expected_results.no_strip_no_remove = {"    "};
       expected_results.strip_no_remove = {""};
       expected_results.no_strip_remove_empty = {"    "};
-      // TODO(tkiley): This is probably wrong, since I'd expect removing empty
-      // TODO(tkiley): elements to return an empty vector here.
-      expected_results.strip_remove_empty = {""};
+      expected_results.strip_remove_empty = {};
 
       run_on_all_variants(string, ',', expected_results);
     }