Merge pull request #6705 from PMExtra/patch-1

Fix AbpStringExtensions

framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs

@@ -133,7 +133,7 @@ namespace System
         {
             if (str.IsNullOrEmpty())
             {
-                return null;
+                return str;
             }
 
             if (postFixes.IsNullOrEmpty())
@@ -174,7 +174,7 @@ namespace System
         {
             if (str.IsNullOrEmpty())
             {
-                return null;
+                return str;
             }
 
             if (preFixes.IsNullOrEmpty())

framework/test/Volo.Abp.Core.Tests/System/StringExtensions_Tests.cs

@@ -182,7 +182,10 @@ namespace System
         public void RemovePostFix_Tests()
         {
             //null case
-            (null as string).RemovePreFix("Test").ShouldBeNull();
+            (null as string).RemovePostFix("Test").ShouldBeNull();
+
+            //empty case
+            string.Empty.RemovePostFix("Test").ShouldBe(string.Empty);
 
             //Simple case
             "MyTestAppService".RemovePostFix("AppService").ShouldBe("MyTest");
@@ -202,7 +205,13 @@ namespace System
         [Fact]
         public void RemovePreFix_Tests()
         {
-            "Home.Index".RemovePreFix("NotMatchedPostfix").ShouldBe("Home.Index");
+            //null case
+            (null as string).RemovePreFix("Test").ShouldBeNull();
+
+            //empty case
+            string.Empty.RemovePreFix("Test").ShouldBe(string.Empty);
+
+            "Home.Index".RemovePreFix("NotMatchedPrefix").ShouldBe("Home.Index");
             "Home.About".RemovePreFix("Home.").ShouldBe("About");
 
             //Ignore case