diff --git a/nunit.templates.sln b/nunit.templates.sln index 48981bd..af094b8 100644 --- a/nunit.templates.sln +++ b/nunit.templates.sln @@ -15,10 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Rebracer.xml = Rebracer.xml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.csharp", "nunit.tests.csharp\nunit.tests.csharp.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "nunit.tests.vb", "nunit.tests.vb\nunit.tests.vb.vbproj", "{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xamarin", "xamarin", "{B5138D8C-725E-425D-ADCF-C298F6B88F95}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.Droid", "xamarin\nunit.tests.Droid\nunit.tests.Droid.csproj", "{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}" @@ -27,24 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.iOS", "xamarin\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.uwp", "xamarin\nunit.tests.uwp\nunit.tests.uwp.csproj", "{159A55AF-9531-4107-8444-CA9C96107EF5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nunit.tests.csharp", "nunit.tests.csharp", "{2A0B82E3-6197-4605-8561-6AC3A32C5579}" - ProjectSection(SolutionItems) = preProject - nunit.tests.csharp\_preprocess.xml = nunit.tests.csharp\_preprocess.xml - nunit.tests.csharp\nunit.png = nunit.tests.csharp\nunit.png - nunit.tests.csharp\nunit.tests.csharp.csproj = nunit.tests.csharp\nunit.tests.csharp.csproj - nunit.tests.csharp\TestClass.cs = nunit.tests.csharp\TestClass.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Definitions", "_Definitions", "{7B9C40FE-8A89-4A3A-9C77-B7C13A781676}" - ProjectSection(SolutionItems) = preProject - nunit.tests.csharp\_Definitions\_project.vstemplate.xml = nunit.tests.csharp\_Definitions\_project.vstemplate.xml - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Properties", "Properties", "{E367F764-ECE8-4480-A42E-DF00D5E2C5CC}" - ProjectSection(SolutionItems) = preProject - nunit.tests.csharp\Properties\AssemblyInfo.cs = nunit.tests.csharp\Properties\AssemblyInfo.cs - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -121,54 +99,6 @@ Global {0660DC45-821A-4763-9818-4D6798A3A253}.Release|x64.Build.0 = Release|Any CPU {0660DC45-821A-4763-9818-4D6798A3A253}.Release|x86.ActiveCfg = Release|Any CPU {0660DC45-821A-4763-9818-4D6798A3A253}.Release|x86.Build.0 = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|ARM.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|x64.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|x86.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.ActiveCfg = Debug|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|ARM.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|iPhone.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.ActiveCfg = Release|Any CPU - {8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|ARM.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|x64.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|x86.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|x64.ActiveCfg = Debug|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|x86.ActiveCfg = Debug|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|ARM.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|iPhone.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|x64.ActiveCfg = Release|Any CPU - {6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|x86.ActiveCfg = Release|Any CPU {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU @@ -249,8 +179,6 @@ Global {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA} = {B5138D8C-725E-425D-ADCF-C298F6B88F95} {D2CED8F0-7A76-454D-B5F7-9E8B9FE6A58E} = {B5138D8C-725E-425D-ADCF-C298F6B88F95} {159A55AF-9531-4107-8444-CA9C96107EF5} = {B5138D8C-725E-425D-ADCF-C298F6B88F95} - {7B9C40FE-8A89-4A3A-9C77-B7C13A781676} = {2A0B82E3-6197-4605-8561-6AC3A32C5579} - {E367F764-ECE8-4480-A42E-DF00D5E2C5CC} = {2A0B82E3-6197-4605-8561-6AC3A32C5579} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {722CB21C-51BA-49C2-B37C-7A6E5785EA40} diff --git a/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/CSharp.vstemplate b/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/CSharp.vstemplate index 13fdcab..b26e78c 100644 --- a/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/CSharp.vstemplate +++ b/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/CSharp.vstemplate @@ -4,7 +4,7 @@ SetupFixture.cs NUnit Setup Fixture - A class that contains code that is run before and after all the tests in the assembly + A class that contains code that is run before and after all the tests in the assembly (C#) icon.png 1 4dfb61f8-ba75-4bf1-9c96-e8dc06021b4c diff --git a/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/VB.vstemplate b/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/VB.vstemplate index 4aee9be..266573d 100644 --- a/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/VB.vstemplate +++ b/nunit.templates/ItemTemplates/Test/NUnit Setup Fixture/Definitions/VB.vstemplate @@ -4,7 +4,7 @@ SetupFixture.vb NUnit Setup Fixture - A class that contains code that is run before and after all the tests in the assembly + A class that contains code that is run before and after all the tests in the assembly (VB) icon.png 1 05535130-0825-46af-a629-6598251c35cc diff --git a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/CSharp.vstemplate b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/CSharp.vstemplate index 09cc5a4..437e48d 100644 --- a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/CSharp.vstemplate +++ b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/CSharp.vstemplate @@ -4,7 +4,7 @@ TestClass.cs NUnit Test Fixture - A class that contains NUnit unit tests + A class that contains NUnit unit tests (C#) icon.png 1 9936e07b-28c2-44ad-99da-d00b06c4e168 diff --git a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/VB.vstemplate b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/VB.vstemplate index 3ddc8f8..64a7a00 100644 --- a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/VB.vstemplate +++ b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/Definitions/VB.vstemplate @@ -4,7 +4,7 @@ TestClass.vb NUnit Test Fixture - A class that contains NUnit unit tests + A class that contains NUnit unit tests (VB) icon.png 1 cb5f52ba-bd65-42e6-bbbf-f58c96cfd3c0 diff --git a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.cs b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.cs index 529540e..2e07746 100644 --- a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.cs +++ b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.cs @@ -1,9 +1,5 @@ -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +// NUnit3 Tests, see documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation +using NUnit.Framework; namespace $rootnamespace$ { @@ -14,7 +10,8 @@ namespace $rootnamespace$ public void TestMethod() { // TODO: Add your test code here - Assert.Pass("Your first passing test"); + var answer = 42; + Assert.That(answer,Is.EqualTo(42),"Some useful error message"); } } } diff --git a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.vb b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.vb index 37de721..108ea5f 100644 --- a/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.vb +++ b/nunit.templates/ItemTemplates/Test/NUnit Test Fixture/TestClass.vb @@ -1,5 +1,5 @@ Option Explicit On - +' NUnit3 Tests, see documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation Imports System Imports NUnit.Framework diff --git a/nunit.templates/Packages/NUnit.3.6.1.nupkg b/nunit.templates/Packages/NUnit.3.6.1.nupkg deleted file mode 100644 index 1ca02ef..0000000 Binary files a/nunit.templates/Packages/NUnit.3.6.1.nupkg and /dev/null differ diff --git a/nunit.templates/Snippets/CSharp/NUnit/nsetup.snippet b/nunit.templates/Snippets/CSharp/NUnit/nsetup.snippet new file mode 100644 index 0000000..7ee5190 --- /dev/null +++ b/nunit.templates/Snippets/CSharp/NUnit/nsetup.snippet @@ -0,0 +1,52 @@ + + + +
+ + Expansion + + NUnit SetUp Method + Terje Sandstrom + Code snippet for a setup method + + + nsetup +
+ + + + NUnit.Framework + + + + + nunit.framework.dll + + + + + name + Replace with the name of the setup method + TestSetUp + + + + + SetUp + + + + + SimpleTypeName(global::NUnit.Framework.Test) + + + + + + + \ No newline at end of file diff --git a/nunit.templates/Snippets/CSharp/NUnit/ntest.snippet b/nunit.templates/Snippets/CSharp/NUnit/ntest.snippet index b28691f..48d2487 100644 --- a/nunit.templates/Snippets/CSharp/NUnit/ntest.snippet +++ b/nunit.templates/Snippets/CSharp/NUnit/ntest.snippet @@ -40,9 +40,12 @@ SimpleTypeName(global::NUnit.Framework.Test) - + diff --git a/nunit.templates/Snippets/CSharp/NUnit/ntestcase.snippet b/nunit.templates/Snippets/CSharp/NUnit/ntestcase.snippet index 46f0d5a..f04b1ce 100644 --- a/nunit.templates/Snippets/CSharp/NUnit/ntestcase.snippet +++ b/nunit.templates/Snippets/CSharp/NUnit/ntestcase.snippet @@ -61,9 +61,12 @@ SimpleTypeName(global::NUnit.Framework.TestCase) - + diff --git a/nunit.templates/Snippets/CSharp/NUnit/ntestfixture.snippet b/nunit.templates/Snippets/CSharp/NUnit/ntestfixture.snippet index eb55127..834c49a 100644 --- a/nunit.templates/Snippets/CSharp/NUnit/ntestfixture.snippet +++ b/nunit.templates/Snippets/CSharp/NUnit/ntestfixture.snippet @@ -41,12 +41,15 @@ SimpleTypeName(global::NUnit.Framework.Test) - + diff --git a/nunit.templates/nunit.templates.csproj b/nunit.templates/nunit.templates.csproj index 90ff2ee..bd7b89a 100644 --- a/nunit.templates/nunit.templates.csproj +++ b/nunit.templates/nunit.templates.csproj @@ -1,6 +1,8 @@  - + + + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -66,9 +68,10 @@ TRACE prompt 4 + False - $([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\..\packages\TemplateBuilder.1.1.3\tools\ligershark.templates.targets )) + $([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\..\packages\TemplateBuilder.1.1.6.1\tools\ligershark.templates.targets )) @@ -96,11 +99,9 @@ PreserveNewest true - - - Always - true - + + Designer + Always true @@ -143,6 +144,9 @@ Always true + + Designer + Designer @@ -152,9 +156,12 @@ + + ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll + - - ..\packages\TemplateBuilder.1.1.3\lib\TemplateBuilder.dll + + ..\packages\TemplateBuilder.1.1.6.1\lib\TemplateBuilder.dll @@ -193,10 +200,12 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + + + - +