Resolved #2595: No need to normalize "-" chars.

aspnetboilerplate · Nov 14, 2017 · ac1fad0 · ac1fad0
1 parent b8409f4
commit ac1fad0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/src/Abp/Resources/Embedded/EmbeddedFilePathHelper.cs b/src/Abp/Resources/Embedded/EmbeddedFilePathHelper.cs
@@ -23,12 +23,7 @@ public static string NormalizePath(string fullPath)
                 }
             }
 
-            return NormalizeChars(fileName) + extension;
-        }
-
-        private static string NormalizeChars(string fileName)
-        {
-            return fileName.Replace(".", "/").Replace("-", "_");
+            return fileName + extension;
         }
     }
 }
diff --git a/src/Abp/Resources/Embedded/EmbeddedResourceSet.cs b/src/Abp/Resources/Embedded/EmbeddedResourceSet.cs
@@ -55,18 +55,12 @@ private string ConvertToRelativePath(string resourceName)
                 return resourceName;
             }
 
-            var folder = pathParts.Take(pathParts.Length - 2).Select(NormalizeFolderName).JoinAsString("/");
+            var folder = pathParts.Take(pathParts.Length - 2).JoinAsString("/");
             var fileName = pathParts[pathParts.Length - 2] + "." + pathParts[pathParts.Length - 1];
 
             return folder + "/" + fileName;
         }
 
-        private static string NormalizeFolderName(string pathPart)
-        {
-            //TODO: Implement all rules of .NET
-            return pathPart.Replace('-', '_');
-        }
-
         private static string CalculateFileName(string filePath)
         {
             if (!filePath.Contains("/"))

diff --git a/test/Abp.Tests/Resources/Embedded/EmbeddedResourceTests.cs b/test/Abp.Tests/Resources/Embedded/EmbeddedResourceTests.cs
@@ -31,5 +31,15 @@ public void Should_Define_And_Get_Embedded_Resources()
             Assert.True(resource.Assembly == GetType().GetAssembly());
             Assert.True(resource.Content.Length > 0);
         }
+
+        [Fact]
+        public void Should_Get_Embedded_Resource_With_Dash_In_Name()
+        {
+            var resource = _embeddedResourceManager.GetResource("/MyApp/MyResources/js/MyScriptFile1.js");
+
+            resource.ShouldNotBeNull();
+            Assert.True(resource.Assembly == GetType().GetAssembly());
+            Assert.True(resource.Content.Length > 0);
+        }
     }
 }
diff --git a/test/Abp.Tests/Resources/Embedded/MyResources/js/MyScriptFile-2.js b/test/Abp.Tests/Resources/Embedded/MyResources/js/MyScriptFile-2.js
@@ -0,0 +1,2 @@
+/* This file is just a sample to use in tests */
+alert('hello world 2!');