Merge pull request #414 from jerbri/patch-1

Renamed SafeSubstring param and supporting logic

Author: mythz

src/ServiceStack.Text/StringExtensions.cs

@@ -601,11 +601,9 @@ public static string ToLowercaseUnderscore(this string value)
             return sb.ToString();
         }
 
-        public static string SafeSubstring(this string value, int length)
+        public static string SafeSubstring(this string value, int startIndex)
         {
-            return String.IsNullOrEmpty(value)
-                ? String.Empty
-                : value.Substring(Math.Min(length, value.Length));
+            return SafeSubstring(value, startIndex, value.Length);
         }
 
         public static string SafeSubstring(this string value, int startIndex, int length)

tests/ServiceStack.Text.Tests/StringExtensionsTests.cs

@@ -226,5 +226,26 @@ public void Can_ParseKeyValueText()
             Assert.That("a:b\nc:d".ParseKeyValueText()["c"], Is.EqualTo("d"));
             Assert.That("a:b\r\nc:d".ParseKeyValueText()["c"], Is.EqualTo("d"));
         }
+        
+        [Test]
+        public void Can_SafeSubstring_with_no_length {
+        
+        	var input = "TestString";
+        	Assert.That(input.SafeSubstring(0), Is.EqualTo("TestString"));
+        	Assert.That(input.SafeSubstring(2), Is.EqualTo("stString"));
+        	Assert.That(input.SafeSubstring(20), Is.EqualTo(""));
+        }
+        
+        [Test]
+        public void Can_SafeSubstring_with_length {
+        	var input = "TestString";
+        	Assert.That(input.SafeSubstring(0,4), Is.EqualTo("Test"));
+        	Assert.That(input.SafeSubstring(2,4), Is.EqualTo("stSt"));
+        	Assert.That(input.SafeSubstring(20,4), Is.EqualTo(""));
+        	Assert.That(input.SafeSubstring(0,20), Is.EqualTo("TestString"));
+        	
+        }
+        }
+        }
 	}
-}
+}