Use GetFileNameWithoutExtension for cross platform compatability

kspearrin · kspearrin · commit e398814978de · 2015-06-15T00:14:55.000-04:00
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Visual Studio jQuery Code Snippets
 
+[![Build Status](https://travis-ci.org/kspearrin/Visual-Studio-jQuery-Code-Snippets.svg)](https://travis-ci.org/kspearrin/Visual-Studio-jQuery-Code-Snippets)
+
 I have updated the popular jQuery code snippets for use in Visual Studio 2012, 2013, and 2015. See a demo video on YouTube here: <http://www.youtube.com/watch?v=Escy0hbEkI8&hd=1>
 
 Most of these snippets were originally developed by [John Sheehan](http://jquerysnippets.codeplex.com/) for Visual Studio 2010. Credit given where due.
diff --git a/Tests/SnippetTests.cs b/Tests/SnippetTests.cs
@@ -9,19 +9,17 @@ namespace Tests
     public class SnippetTests
     {
         // --- CONFIGURATION ---
-        private string m_path = @"../../../jQueryCodeSnippets";
-        private string m_helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";
-        private string m_version = "1.5.0";
+        private const string SnippetPath = @"../../../jQueryCodeSnippets";
+        private const string HelpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";
+        private const string Version = "1.5.0";
         // --- END CONFIGURATION ---
 
         [Test]
         public void SnippetTitlesAreCorrect()
         {
-            foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
+            foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))
             {
-                var filePaths = snippetFile.Split(new string[] { "\\" }, StringSplitOptions.None);
-                var fileName = filePaths[filePaths.Length - 1];
-                var snippetName = fileName.Split('.')[0];
+                var snippetName = Path.GetFileNameWithoutExtension(snippetFile);
 
                 var snippetDoc = new XmlDocument();
                 snippetDoc.Load(snippetFile);
@@ -35,11 +33,9 @@ public void SnippetTitlesAreCorrect()
         [Test]
         public void SnippetShortcutsAreCorrect()
         {
-            foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
+            foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))
             {
-                var filePaths = snippetFile.Split(new string[] { "\\" }, StringSplitOptions.None);
-                var fileName = filePaths[filePaths.Length - 1];
-                var snippetName = fileName.Split('.')[0];
+                var snippetName = Path.GetFileNameWithoutExtension(snippetFile);
 
                 var snippetDoc = new XmlDocument();
                 snippetDoc.Load(snippetFile);
@@ -53,7 +49,7 @@ public void SnippetShortcutsAreCorrect()
         [Test]
         public void SnippetsHaveDescriptions()
         {
-            foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
+            foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))
             {
                 var snippetDoc = new XmlDocument();
                 snippetDoc.Load(snippetFile);
@@ -69,7 +65,7 @@ public void SnippetsHaveDescriptions()
         [Test]
         public void SnippetsHaveAuthors()
         {
-            foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
+            foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))
             {
                 var snippetDoc = new XmlDocument();
                 snippetDoc.Load(snippetFile);
@@ -85,9 +81,7 @@ public void SnippetsHaveAuthors()
         [Test]
         public void SnippetsHaveHelpUrls()
         {
-            var helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";
-
-            foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
+            foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))
             {
                 var snippetDoc = new XmlDocument();
                 snippetDoc.Load(snippetFile);
@@ -96,14 +90,14 @@ public void SnippetsHaveHelpUrls()
                 Assert.IsTrue(urlNode != null);
 
                 var url = urlNode[0].InnerText;
-                Assert.IsTrue(!string.IsNullOrWhiteSpace(url) && url == helpUrl);
+                Assert.IsTrue(!string.IsNullOrWhiteSpace(url) && url == HelpUrl);
             }
         }
 
         [Test]
         public void SnippetsAreProperFormattedXml()
         {
-            foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
+            foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))
             {
                 var contents = File.ReadAllText(snippetFile);
                 Assert.IsTrue(contents.Contains("<?xml version=\"1.0\" encoding=\"utf-8\"?>"));
@@ -113,7 +107,7 @@ public void SnippetsAreProperFormattedXml()
         [Test]
         public void SnippetsHaveCorrectVersion()
         {
-            foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
+            foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))
             {
                 var snippetDoc = new XmlDocument();
                 snippetDoc.Load(snippetFile);
@@ -125,7 +119,7 @@ public void SnippetsHaveCorrectVersion()
                 Assert.IsTrue(formatAttr != null);
 
                 var format = formatAttr.InnerText;
-                Assert.IsTrue(!string.IsNullOrWhiteSpace(format) && format == m_version);
+                Assert.IsTrue(!string.IsNullOrWhiteSpace(format) && format == Version);
             }
         }
     }
diff --git a/jQueryCodeSnippets.sln b/jQueryCodeSnippets.sln
@@ -11,9 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ListingBuilder", "ListingBu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E747CB5-56E9-4E50-BDD1-9C47A1A263D0}"
 	ProjectSection(SolutionItems) = preProject
+		.travis.yml = .travis.yml
 		.gitignore = .gitignore
 		README.md = README.md
-		travis.yml = travis.yml
 	EndProjectSection
 EndProject
 Global

Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,17 @@ namespace Tests`
`9`	`9`	`public class SnippetTests`
`10`	`10`	`{`
`11`	`11`	`// --- CONFIGURATION ---`
`12`		`- private string m_path = @"../../../jQueryCodeSnippets";`
`13`		`- private string m_helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";`
`14`		`- private string m_version = "1.5.0";`
	`12`	`+ private const string SnippetPath = @"../../../jQueryCodeSnippets";`
	`13`	`+ private const string HelpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";`
	`14`	`+ private const string Version = "1.5.0";`
`15`	`15`	`// --- END CONFIGURATION ---`
`16`	`16`
`17`	`17`	`[Test]`
`18`	`18`	`public void SnippetTitlesAreCorrect()`
`19`	`19`	`{`
`20`		`- foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
	`20`	`+ foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))`
`21`	`21`	`{`
`22`		`- var filePaths = snippetFile.Split(new string[] { "\\" }, StringSplitOptions.None);`
`23`		`- var fileName = filePaths[filePaths.Length - 1];`
`24`		`- var snippetName = fileName.Split('.')[0];`
	`22`	`+ var snippetName = Path.GetFileNameWithoutExtension(snippetFile);`
`25`	`23`
`26`	`24`	`var snippetDoc = new XmlDocument();`
`27`	`25`	`snippetDoc.Load(snippetFile);`
`@@ -35,11 +33,9 @@ public void SnippetTitlesAreCorrect()`
`35`	`33`	`[Test]`
`36`	`34`	`public void SnippetShortcutsAreCorrect()`
`37`	`35`	`{`
`38`		`- foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
	`36`	`+ foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))`
`39`	`37`	`{`
`40`		`- var filePaths = snippetFile.Split(new string[] { "\\" }, StringSplitOptions.None);`
`41`		`- var fileName = filePaths[filePaths.Length - 1];`
`42`		`- var snippetName = fileName.Split('.')[0];`
	`38`	`+ var snippetName = Path.GetFileNameWithoutExtension(snippetFile);`
`43`	`39`
`44`	`40`	`var snippetDoc = new XmlDocument();`
`45`	`41`	`snippetDoc.Load(snippetFile);`
`@@ -53,7 +49,7 @@ public void SnippetShortcutsAreCorrect()`
`53`	`49`	`[Test]`
`54`	`50`	`public void SnippetsHaveDescriptions()`
`55`	`51`	`{`
`56`		`- foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
	`52`	`+ foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))`
`57`	`53`	`{`
`58`	`54`	`var snippetDoc = new XmlDocument();`
`59`	`55`	`snippetDoc.Load(snippetFile);`
`@@ -69,7 +65,7 @@ public void SnippetsHaveDescriptions()`
`69`	`65`	`[Test]`
`70`	`66`	`public void SnippetsHaveAuthors()`
`71`	`67`	`{`
`72`		`- foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
	`68`	`+ foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))`
`73`	`69`	`{`
`74`	`70`	`var snippetDoc = new XmlDocument();`
`75`	`71`	`snippetDoc.Load(snippetFile);`
`@@ -85,9 +81,7 @@ public void SnippetsHaveAuthors()`
`85`	`81`	`[Test]`
`86`	`82`	`public void SnippetsHaveHelpUrls()`
`87`	`83`	`{`
`88`		`- var helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";`
`89`		`-`
`90`		`- foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
	`84`	`+ foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))`
`91`	`85`	`{`
`92`	`86`	`var snippetDoc = new XmlDocument();`
`93`	`87`	`snippetDoc.Load(snippetFile);`
`@@ -96,14 +90,14 @@ public void SnippetsHaveHelpUrls()`
`96`	`90`	`Assert.IsTrue(urlNode != null);`
`97`	`91`
`98`	`92`	`var url = urlNode[0].InnerText;`
`99`		`- Assert.IsTrue(!string.IsNullOrWhiteSpace(url) && url == helpUrl);`
	`93`	`+ Assert.IsTrue(!string.IsNullOrWhiteSpace(url) && url == HelpUrl);`
`100`	`94`	`}`
`101`	`95`	`}`
`102`	`96`
`103`	`97`	`[Test]`
`104`	`98`	`public void SnippetsAreProperFormattedXml()`
`105`	`99`	`{`
`106`		`- foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
	`100`	`+ foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))`
`107`	`101`	`{`
`108`	`102`	`var contents = File.ReadAllText(snippetFile);`
`109`	`103`	`Assert.IsTrue(contents.Contains("<?xml version=\"1.0\" encoding=\"utf-8\"?>"));`
`@@ -113,7 +107,7 @@ public void SnippetsAreProperFormattedXml()`
`113`	`107`	`[Test]`
`114`	`108`	`public void SnippetsHaveCorrectVersion()`
`115`	`109`	`{`
`116`		`- foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
	`110`	`+ foreach (var snippetFile in Directory.EnumerateFiles(SnippetPath, "*.snippet", SearchOption.AllDirectories))`
`117`	`111`	`{`
`118`	`112`	`var snippetDoc = new XmlDocument();`
`119`	`113`	`snippetDoc.Load(snippetFile);`
`@@ -125,7 +119,7 @@ public void SnippetsHaveCorrectVersion()`
`125`	`119`	`Assert.IsTrue(formatAttr != null);`
`126`	`120`
`127`	`121`	`var format = formatAttr.InnerText;`
`128`		`- Assert.IsTrue(!string.IsNullOrWhiteSpace(format) && format == m_version);`
	`122`	`+ Assert.IsTrue(!string.IsNullOrWhiteSpace(format) && format == Version);`
`129`	`123`	`}`
`130`	`124`	`}`
`131`	`125`	`}`