Added nunit, relative paths, and travis ci config

kspearrin · kspearrin · commit a7f5da70f868 · 2015-06-14T23:47:18.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -98,7 +98,9 @@ publish/
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
+packages/
+.nuget/
+.nuget/packages.config
 
 # Windows Azure Build Output
 csx
diff --git a/ListingBuilder/Program.cs b/ListingBuilder/Program.cs
@@ -12,8 +12,8 @@ class Program
     {
         static void Main(string[] args)
         {
-            string readPath = @"C:\Projects\Visual-Studio-jQuery-Code-Snippets\jQueryCodeSnippets";
-            string listingFilePath = @"C:\Projects\Visual-Studio-jQuery-Code-Snippets\SnippetListing.html";
+            string readPath = @"..\..\..\jQueryCodeSnippets";
+            string listingFilePath = @"..\..\..\SnippetListing.html";
             StringBuilder tableSb = new StringBuilder();
 
             tableSb.AppendLine("<table>");
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # 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
+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.
 
@@ -31,4 +31,4 @@ There are over 130 code snippets for jQuery included. Check out the [snippet lis
 
 ## Contributing
 
-Please feel free to submit pull requests to the `dev` branch.
+Please feel free to submit pull requests to the `master` branch.
diff --git a/Tests/SnippetTests.cs b/Tests/SnippetTests.cs
@@ -1,21 +1,20 @@
 ﻿using System;
 using System.IO;
 using System.Xml;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Tests
 {
-    [TestClass]
+    [TestFixture]
     public class SnippetTests
     {
         // --- CONFIGURATION ---
-        // update path to local project directory
-        private string m_path = @"C:\Projects\Visual-Studio-jQuery-Code-Snippets\jQueryCodeSnippets";
+        private string m_path = @"..\..\..\jQueryCodeSnippets";
         private string m_helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";
         private string m_version = "1.4.0";
         // --- END CONFIGURATION ---
 
-        [TestMethod]
+        [Test]
         public void SnippetTitlesAreCorrect()
         {
             foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
@@ -33,7 +32,7 @@ public void SnippetTitlesAreCorrect()
             }
         }
 
-        [TestMethod]
+        [Test]
         public void SnippetShortcutsAreCorrect()
         {
             foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
@@ -51,7 +50,7 @@ public void SnippetShortcutsAreCorrect()
             }
         }
 
-        [TestMethod]
+        [Test]
         public void SnippetsHaveDescriptions()
         {
             foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
@@ -67,7 +66,7 @@ public void SnippetsHaveDescriptions()
             }
         }
 
-        [TestMethod]
+        [Test]
         public void SnippetsHaveAuthors()
         {
             foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
@@ -83,7 +82,7 @@ public void SnippetsHaveAuthors()
             }
         }
 
-        [TestMethod]
+        [Test]
         public void SnippetsHaveHelpUrls()
         {
             var helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";
@@ -101,7 +100,7 @@ public void SnippetsHaveHelpUrls()
             }
         }
 
-        [TestMethod]
+        [Test]
         public void SnippetsAreProperFormattedXml()
         {
             foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
@@ -111,7 +110,7 @@ public void SnippetsAreProperFormattedXml()
             }
         }
 
-        [TestMethod]
+        [Test]
         public void SnippetsHaveCorrectVersion()
         {
             foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -35,6 +35,25 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.core">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="nunit.core.interfaces">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.util">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="NUnit.VisualStudio.TestAdapter">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.XML" />
   </ItemGroup>
@@ -44,16 +63,15 @@
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
       </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
+    <Otherwise />
   </Choose>
   <ItemGroup>
     <Compile Include="SnippetTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/Tests/packages.config b/Tests/packages.config
@@ -0,0 +1,6 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
+  <package id="NUnit.Runners" version="2.6.4" />
+</packages>
diff --git a/jQueryCodeSnippets.sln b/jQueryCodeSnippets.sln
@@ -1,12 +1,21 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQueryCodeSnippets", "jQueryCodeSnippets\jQueryCodeSnippets.csproj", "{C1131DC7-264F-467E-90E2-ED2ED49BE43F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{90164978-E461-4BD8-8F21-15B199E7AFB1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ListingBuilder", "ListingBuilder\ListingBuilder.csproj", "{C5E392D6-D12C-4361-9E5C-5358DCCCB1C9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E747CB5-56E9-4E50-BDD1-9C47A1A263D0}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		README.md = README.md
+		travis.yml = travis.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/travis.yml b/travis.yml
@@ -0,0 +1,5 @@
+language: csharp
+solution: jQueryCodeSnippets.sln
+script:
+  - xbuild /p:Configuration=Release jQueryCodeSnippets.sln
+  - mono ./packages/NUnit.Runners.*/tools/nunit-console.exe ./Tests/bin/Release/Tests.dll

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ class Program`
`12`	`12`	`{`
`13`	`13`	`static void Main(string[] args)`
`14`	`14`	`{`
`15`		`- string readPath = @"C:\Projects\Visual-Studio-jQuery-Code-Snippets\jQueryCodeSnippets";`
`16`		`- string listingFilePath = @"C:\Projects\Visual-Studio-jQuery-Code-Snippets\SnippetListing.html";`
	`15`	`+ string readPath = @"..\..\..\jQueryCodeSnippets";`
	`16`	`+ string listingFilePath = @"..\..\..\SnippetListing.html";`
`17`	`17`	`StringBuilder tableSb = new StringBuilder();`
`18`	`18`
`19`	`19`	`tableSb.AppendLine("<table>");`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,20 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Xml;`
`4`		`-using Microsoft.VisualStudio.TestTools.UnitTesting;`
	`4`	`+using NUnit.Framework;`
`5`	`5`
`6`	`6`	`namespace Tests`
`7`	`7`	`{`
`8`		`- [TestClass]`
	`8`	`+ [TestFixture]`
`9`	`9`	`public class SnippetTests`
`10`	`10`	`{`
`11`	`11`	`// --- CONFIGURATION ---`
`12`		`- // update path to local project directory`
`13`		`- private string m_path = @"C:\Projects\Visual-Studio-jQuery-Code-Snippets\jQueryCodeSnippets";`
	`12`	`+ private string m_path = @"..\..\..\jQueryCodeSnippets";`
`14`	`13`	`private string m_helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";`
`15`	`14`	`private string m_version = "1.4.0";`
`16`	`15`	`// --- END CONFIGURATION ---`
`17`	`16`
`18`		`- [TestMethod]`
	`17`	`+ [Test]`
`19`	`18`	`public void SnippetTitlesAreCorrect()`
`20`	`19`	`{`
`21`	`20`	`foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
`@@ -33,7 +32,7 @@ public void SnippetTitlesAreCorrect()`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`
`36`		`- [TestMethod]`
	`35`	`+ [Test]`
`37`	`36`	`public void SnippetShortcutsAreCorrect()`
`38`	`37`	`{`
`39`	`38`	`foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
`@@ -51,7 +50,7 @@ public void SnippetShortcutsAreCorrect()`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`
`54`		`- [TestMethod]`
	`53`	`+ [Test]`
`55`	`54`	`public void SnippetsHaveDescriptions()`
`56`	`55`	`{`
`57`	`56`	`foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
`@@ -67,7 +66,7 @@ public void SnippetsHaveDescriptions()`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`
`70`		`- [TestMethod]`
	`69`	`+ [Test]`
`71`	`70`	`public void SnippetsHaveAuthors()`
`72`	`71`	`{`
`73`	`72`	`foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
`@@ -83,7 +82,7 @@ public void SnippetsHaveAuthors()`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`
`86`		`- [TestMethod]`
	`85`	`+ [Test]`
`87`	`86`	`public void SnippetsHaveHelpUrls()`
`88`	`87`	`{`
`89`	`88`	`var helpUrl = "https://github.com/kspearrin/Visual-Studio-jQuery-Code-Snippets";`
`@@ -101,7 +100,7 @@ public void SnippetsHaveHelpUrls()`
`101`	`100`	`}`
`102`	`101`	`}`
`103`	`102`
`104`		`- [TestMethod]`
	`103`	`+ [Test]`
`105`	`104`	`public void SnippetsAreProperFormattedXml()`
`106`	`105`	`{`
`107`	`106`	`foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`
`@@ -111,7 +110,7 @@ public void SnippetsAreProperFormattedXml()`
`111`	`110`	`}`
`112`	`111`	`}`
`113`	`112`
`114`		`- [TestMethod]`
	`113`	`+ [Test]`
`115`	`114`	`public void SnippetsHaveCorrectVersion()`
`116`	`115`	`{`
`117`	`116`	`foreach (var snippetFile in Directory.EnumerateFiles(m_path, "*.snippet", SearchOption.AllDirectories))`