[bugfix] fix trim function for some edgecases

lutraconsulting · Jan 10, 2020 · 5d64904 · 5d64904
1 parent c6eca00
commit 5d64904
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/mdal/mdal_utils.cpp b/mdal/mdal_utils.cpp
@@ -296,7 +296,16 @@ std::string MDAL::ltrim( const std::string &s, const std::string &delimiters )
   if ( s.empty() )
     return s;
 
-  return s.substr( s.find_first_not_of( delimiters ) );
+  size_t found = s.find_first_not_of( delimiters );
+
+  if ( found == std::string::npos )
+  {
+    return "";
+  }
+  else
+  {
+    return s.substr( found );
+  }
 }
 
 // http://www.cplusplus.com/faq/sequences/strings/trim/
@@ -305,7 +314,15 @@ std::string MDAL::rtrim( const std::string &s, const std::string &delimiters )
   if ( s.empty() )
     return s;
 
-  return s.substr( 0, s.find_last_not_of( delimiters ) + 1 );
+  size_t found = s.find_last_not_of( delimiters );
+  if ( found == std::string::npos )
+  {
+    return "";
+  }
+  else
+  {
+    return s.substr( 0, found + 1 );
+  }
 }
 
 MDAL::BBox MDAL::computeExtent( const MDAL::Vertices &vertices )

diff --git a/tests/unittests/test_mdal_utils.cpp b/tests/unittests/test_mdal_utils.cpp
@@ -71,6 +71,26 @@ TEST( MdalUtilsTest, SplitChar )
   }
 }
 
+TEST( MdalUtilsTest, TrimString )
+{
+  std::vector<SplitTestData> tests =
+  {
+    SplitTestData( "", {"", "", ""} ),
+    SplitTestData( " ", {"", "", ""} ),
+    SplitTestData( " a", {"a", " a", "a"} ),
+    SplitTestData( "a ", {"a", "a", "a "} ),
+    SplitTestData( " a ", {"a", " a", "a "} ),
+    SplitTestData( " a b ", {"a b", " a b", "a b "} ),
+    SplitTestData( "\na b ", {"a b", "\na b", "a b "} )
+  };
+  for ( const auto &test : tests )
+  {
+    EXPECT_EQ( test.mExpectedResult[0], MDAL::trim( test.mInput ) );
+    EXPECT_EQ( test.mExpectedResult[1], MDAL::rtrim( test.mInput ) );
+    EXPECT_EQ( test.mExpectedResult[2], MDAL::ltrim( test.mInput ) );
+  }
+}
+
 TEST( MdalUtilsTest, TimeParsing )
 {
   std::vector<std::pair<std::string, double>> tests =