Merge pull request #5 from nunit/V1

V1
nunit · Jan 14, 2016 · 7d91f6d · 7d91f6d
2 parents 83ccf4e + adaa2e6
commit 7d91f6d
Show file tree

Hide file tree

Showing 22 changed files with 291 additions and 325 deletions.
diff --git a/CreateUnitTests.NUnit/NUnit2FrameworkProvider.cs b/CreateUnitTests.NUnit/NUnit2FrameworkProvider.cs
@@ -1,3 +1,25 @@
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 using System;
 using System.ComponentModel.Composition;
 using Microsoft.VisualStudio.TestPlatform.TestGeneration.Data;

diff --git a/CreateUnitTests.NUnit/NUnit2SolutionManager.cs b/CreateUnitTests.NUnit/NUnit2SolutionManager.cs
@@ -1,13 +1,25 @@
-//---------------------------------------------------------------------
-// <copyright file="NUnitSolutionManager.cs" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-//     THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY
-//     OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
-//     LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR
-//     FITNESS FOR A PARTICULAR PURPOSE.
-// </copyright>
-// <summary>The NUnitSolutionManager type.</summary>
-//---------------------------------------------------------------------
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 
 using System;
 using EnvDTE;
@@ -25,6 +37,7 @@ namespace TestGeneration.Extensions.NUnit
     /// </summary>
     public class NUnit2SolutionManager : SolutionManagerBase
     {
+        private const string NUnitVersion = "2.6.4";
         /// <summary>
         /// Initializes a new instance of the <see cref="NUnitSolutionManager"/> class.
         /// </summary>
@@ -51,17 +64,14 @@ protected override void OnUnitTestProjectCreated(Project unitTestProject, CodeFu
             TraceLogger.LogInfo("NUnitSolutionManager.OnUnitTestProjectCreated: Adding reference to NUnit 2 assemblies through nuget.");
 
             base.OnUnitTestProjectCreated(unitTestProject, sourceMethod);
-            EnsureNuGetReference(unitTestProject, "NUnit", "2.6.4");
+            EnsureNuGetReference(unitTestProject, "NUnit", NUnitVersion);
 
             var vsp = unitTestProject.Object as VSProject2;
-            if (vsp != null)
+            var reference = vsp?.References.Find(GlobalConstants.MSTestAssemblyName);
+            if (reference != null)
             {
-                var reference = vsp.References.Find(GlobalConstants.MSTestAssemblyName);
-                if (reference != null)
-                {
-                    TraceLogger.LogInfo("NUnitSolutionManager.OnUnitTestProjectCreated: Removing reference to {0}", reference.Name);
-                    reference.Remove();
-                }
+                TraceLogger.LogInfo("NUnitSolutionManager.OnUnitTestProjectCreated: Removing reference to {0}", reference.Name);
+                reference.Remove();
             }
         }
     }

diff --git a/CreateUnitTests.NUnit/NUnitFrameworkProvider.cs b/CreateUnitTests.NUnit/NUnitFrameworkProvider.cs
@@ -1,13 +1,25 @@
-//---------------------------------------------------------------------
-// <copyright file="NUnitFrameworkProvider.cs" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-//     THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY
-//     OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
-//     LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR
-//     FITNESS FOR A PARTICULAR PURPOSE.
-// </copyright>
-// <summary>The NUnitFrameworkProvider type.</summary>
-//---------------------------------------------------------------------
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 
 using System;
 using System.ComponentModel.Composition;

diff --git a/CreateUnitTests.NUnit/NUnitSolutionManager.cs b/CreateUnitTests.NUnit/NUnitSolutionManager.cs
@@ -1,3 +1,25 @@
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 using System;
 using EnvDTE;
 using EnvDTE80;
@@ -11,6 +33,7 @@ namespace TestGeneration.Extensions.NUnit
 {
     public class NUnitSolutionManager : SolutionManagerBase
     {
+        private const string NUnit3Version = "3.0.1";
         /// <summary>
         /// Initializes a new instance of the <see cref="NUnitSolutionManager"/> class.
         /// </summary>
@@ -37,7 +60,7 @@ protected override void OnUnitTestProjectCreated(Project unitTestProject, CodeFu
             TraceLogger.LogInfo("NUnitSolutionManager.OnUnitTestProjectCreated: Adding reference to NUnit assemblies through nuget.");
 
             base.OnUnitTestProjectCreated(unitTestProject, sourceMethod);
-            this.EnsureNuGetReference(unitTestProject, "NUnit", "3.0.0-beta-3");
+            this.EnsureNuGetReference(unitTestProject, "NUnit", NUnit3Version);
 
             var vsp = unitTestProject.Object as VSProject2;
             var reference = vsp?.References.Find(GlobalConstants.MSTestAssemblyName);

diff --git a/CreateUnitTests.NUnit/NUnitUnitTestClassManager.cs b/CreateUnitTests.NUnit/NUnitUnitTestClassManager.cs
@@ -1,13 +1,25 @@
-//---------------------------------------------------------------------
-// <copyright file="NUnitUnitTestClassManager.cs" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-//     THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY
-//     OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
-//     LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR
-//     FITNESS FOR A PARTICULAR PURPOSE.
-// </copyright>
-// <summary>The NUnitUnitTestClassManager type.</summary>
-//---------------------------------------------------------------------
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 
 using Microsoft.VisualStudio.TestPlatform.TestGeneration.Data;
 using Microsoft.VisualStudio.TestPlatform.TestGeneration.Model;

diff --git a/CreateUnitTests.NUnit/NUnitUnitTestProjectManager.cs b/CreateUnitTests.NUnit/NUnitUnitTestProjectManager.cs
@@ -1,14 +1,25 @@
-//---------------------------------------------------------------------
-// <copyright file="NUnitUnitTestProjectManager.cs" company="Microsoft">
-//     Copyright (c) Microsoft Corporation.  All rights reserved.
-//     THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY
-//     OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
-//     LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR
-//     FITNESS FOR A PARTICULAR PURPOSE.
-// </copyright>
-// <summary>The NUnitUnitTestProjectManager type.</summary>
-//---------------------------------------------------------------------
-
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 using System;
 using EnvDTE;
 using Microsoft.VisualStudio.TestPlatform.TestGeneration.Model;

diff --git a/CreateUnitTests.NUnit/Properties/AssemblyInfo.cs b/CreateUnitTests.NUnit/Properties/AssemblyInfo.cs
@@ -1,16 +1,15 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Extensions.NUnit")]
+[assembly: AssemblyTitle("TestGeneratorNUnitExtension")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Samples.Extensions.NUnit")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCompany("NUnit.org")]
+[assembly: AssemblyProduct("TestGenerator.Extensions.NUnit")]
+[assembly: AssemblyCopyright("Copyright © NUnit  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/IntelliTest.NUnit/NUnit2TestFramework.cs b/IntelliTest.NUnit/NUnit2TestFramework.cs
@@ -1,3 +1,25 @@
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -21,6 +43,7 @@ namespace TestGeneration.Extensions.IntelliTest.NUnit
     [Serializable]
     sealed class NUnit2TestFramework : AttributeBasedTestFrameworkBase
     {
+        private const string NUnitVersion = "2.6.4";
         /// <summary>
         /// Initializes a new instance of the <see cref="NUnit2TestFramework"/> class.
         /// </summary>
@@ -52,7 +75,8 @@ public NUnit2TestFramework(IPexComponent host)
         /// <summary>
         /// The test framework references.
         /// </summary>
-        public override ICountable<ShortReferenceAssemblyName> References => Indexable.One(new ShortReferenceAssemblyName(ShortAssemblyName.FromName("NUnit"), "2.6.4", AssemblyReferenceType.NugetReference));
+        public override ICountable<ShortReferenceAssemblyName> References => 
+            Indexable.One(new ShortReferenceAssemblyName(ShortAssemblyName.FromName("NUnit"), NUnitVersion, AssemblyReferenceType.NugetReference));
 
         /// <summary>
         /// The _directory.

diff --git a/IntelliTest.NUnit/NUnitAssertMethodFilter.cs b/IntelliTest.NUnit/NUnitAssertMethodFilter.cs
@@ -1,4 +1,26 @@
-using Microsoft.ExtendedReflection.Asserts;
+// ***********************************************************************
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
+using Microsoft.ExtendedReflection.Asserts;
 using Microsoft.ExtendedReflection.Metadata;
 using Microsoft.ExtendedReflection.Utilities.Safe.Diagnostics;