From 1d86b12d6a2f0c6b3f53bf81c3eb5585e2c1d05f Mon Sep 17 00:00:00 2001 From: "angelov.st.anton" Date: Sat, 15 Sep 2018 12:42:06 +0300 Subject: [PATCH] ignore NU1605 error in all projects fix problem with new background worker in API add new mstest small test project upgrade 3rd party nugets --- .gitignore | 3 + .../LoadTestsProject.NUnit.csproj | 4 +- LoadTestsProject.NUnit/packages.config | 4 +- Meissa.API.Tests/Meissa.API.Tests.csproj | 2 +- .../Controllers/TestCaseRunController.cs | 8 +- Meissa.API/Meissa.API.csproj | 7 +- Meissa.API/Services/BackgroundTaskQueue.cs | 13 +++ Meissa.API/Services/IBackgroundTaskQueue.cs | 3 + .../Meissa.Core.Services.UnitTests.csproj | 4 +- .../Meissa.Core.Services.csproj | 4 +- .../Meissa.Infrastructure.UnitTests.csproj | 4 +- .../Meissa.Infrastructure.csproj | 21 ++++- Meissa.Model/Meissa.Model.csproj | 6 +- .../Meissa.Plugins.MSTest.csproj | 5 ++ .../Meissa.Plugins.NUnit.csproj | 5 ++ .../Meissa.Plugins.Protractor.csproj | 5 ++ .../Meissa.Tests.Factories.csproj | 2 +- Meissa.sln | 88 ++----------------- Meissa/Meissa.csproj | 19 +++- Meissa/Properties/launchSettings.json | 2 +- NUnitLoadTest/NUnitLoadTest.csproj | 4 +- NUnitLoadTest/packages.config | 4 +- SmallMSTestTestProject/ChromeTests.cs | 39 ++++++++ SmallMSTestTestProject/FirefoxTests.cs | 39 ++++++++ .../SmallMSTestTestProject.csproj | 15 ++++ 25 files changed, 194 insertions(+), 116 deletions(-) create mode 100644 SmallMSTestTestProject/ChromeTests.cs create mode 100644 SmallMSTestTestProject/FirefoxTests.cs create mode 100644 SmallMSTestTestProject/SmallMSTestTestProject.csproj diff --git a/.gitignore b/.gitignore index 82b7291..346dd2d 100644 --- a/.gitignore +++ b/.gitignore @@ -299,3 +299,6 @@ __pycache__/ *.btm.cs *.odx.cs *.xsd.cs +/installers/Meissa.Windows64/content +/installers/Meissa.MacOS64/content +/installers/Meissa.Linux64/content diff --git a/LoadTestsProject.NUnit/LoadTestsProject.NUnit.csproj b/LoadTestsProject.NUnit/LoadTestsProject.NUnit.csproj index db6f7b3..a6996da 100644 --- a/LoadTestsProject.NUnit/LoadTestsProject.NUnit.csproj +++ b/LoadTestsProject.NUnit/LoadTestsProject.NUnit.csproj @@ -88,8 +88,8 @@ - + - + \ No newline at end of file diff --git a/LoadTestsProject.NUnit/packages.config b/LoadTestsProject.NUnit/packages.config index 9ec110e..d8fe5f2 100644 --- a/LoadTestsProject.NUnit/packages.config +++ b/LoadTestsProject.NUnit/packages.config @@ -14,8 +14,8 @@ limitations under the License. - + - + \ No newline at end of file diff --git a/Meissa.API.Tests/Meissa.API.Tests.csproj b/Meissa.API.Tests/Meissa.API.Tests.csproj index fa6753f..4155618 100644 --- a/Meissa.API.Tests/Meissa.API.Tests.csproj +++ b/Meissa.API.Tests/Meissa.API.Tests.csproj @@ -24,7 +24,7 @@ - + diff --git a/Meissa.API/Controllers/TestCaseRunController.cs b/Meissa.API/Controllers/TestCaseRunController.cs index 178a34c..00a9425 100644 --- a/Meissa.API/Controllers/TestCaseRunController.cs +++ b/Meissa.API/Controllers/TestCaseRunController.cs @@ -29,12 +29,10 @@ namespace Meissa.API.Controllers public class TestCaseRunsController : Controller { private readonly IBackgroundTaskQueue _backgroundTaskQueue; - private readonly IServiceProvider _serviceProvider; - public TestCaseRunsController(IBackgroundTaskQueue backgroundTaskQueue, IServiceProvider serviceProvider) + public TestCaseRunsController(IBackgroundTaskQueue backgroundTaskQueue) { _backgroundTaskQueue = backgroundTaskQueue; - _serviceProvider = serviceProvider; } [HttpDelete] @@ -42,7 +40,7 @@ public async Task DeleteOlderTestCasesHistoryAsync() { _backgroundTaskQueue.QueueBackgroundWorkItem(async token => { - using (var scope = _serviceProvider.CreateScope()) + using (var scope = _backgroundTaskQueue.CreateScope()) { var meissaRepository = scope.ServiceProvider.GetRequiredService(); var logger = scope.ServiceProvider.GetRequiredService>(); @@ -79,7 +77,7 @@ public async Task UpdateTestCaseExecutionHistoryAsync([FromBody] { _backgroundTaskQueue.QueueBackgroundWorkItem(async token => { - using (var scope = _serviceProvider.CreateScope()) + using (var scope = _backgroundTaskQueue.CreateScope()) { var meissaRepository = scope.ServiceProvider.GetRequiredService(); var logger = scope.ServiceProvider.GetRequiredService>(); diff --git a/Meissa.API/Meissa.API.csproj b/Meissa.API/Meissa.API.csproj index 91f5151..f72fba2 100644 --- a/Meissa.API/Meissa.API.csproj +++ b/Meissa.API/Meissa.API.csproj @@ -18,13 +18,14 @@ - 1701;1702;1705;NU1603 + 1701;1702;1705;NU1603;NU1605 bin\Debug\netcoreapp2.0\Meissa.API.xml false 0 + 1701;1702;1705;NU1603;NU1605 bin\Release\netcoreapp2.0\Meissa.API.xml @@ -34,9 +35,9 @@ - + - + diff --git a/Meissa.API/Services/BackgroundTaskQueue.cs b/Meissa.API/Services/BackgroundTaskQueue.cs index 30dccc2..440ab36 100644 --- a/Meissa.API/Services/BackgroundTaskQueue.cs +++ b/Meissa.API/Services/BackgroundTaskQueue.cs @@ -17,6 +17,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; namespace Meissa.API.Services { @@ -24,6 +25,18 @@ public class BackgroundTaskQueue : IBackgroundTaskQueue { private ConcurrentQueue> _workItems = new ConcurrentQueue>(); private SemaphoreSlim _signal = new SemaphoreSlim(0); + private readonly IServiceProvider _serviceProvider; + public BackgroundTaskQueue(IServiceProvider serviceProvider) + { + _serviceProvider = serviceProvider; + } + + public IServiceProvider ServiceProvider { get; set; } + + public IServiceScope CreateScope() + { + return _serviceProvider.CreateScope(); + } public void QueueBackgroundWorkItem(Func workItem) { diff --git a/Meissa.API/Services/IBackgroundTaskQueue.cs b/Meissa.API/Services/IBackgroundTaskQueue.cs index ffcef69..0701745 100644 --- a/Meissa.API/Services/IBackgroundTaskQueue.cs +++ b/Meissa.API/Services/IBackgroundTaskQueue.cs @@ -16,6 +16,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; namespace Meissa.API.Services { @@ -24,5 +25,7 @@ public interface IBackgroundTaskQueue void QueueBackgroundWorkItem(Func workItem); Task> DequeueAsync(CancellationToken cancellationToken); + + IServiceScope CreateScope(); } } diff --git a/Meissa.Core.Services.UnitTests/Meissa.Core.Services.UnitTests.csproj b/Meissa.Core.Services.UnitTests/Meissa.Core.Services.UnitTests.csproj index 6a97c00..f452d6f 100644 --- a/Meissa.Core.Services.UnitTests/Meissa.Core.Services.UnitTests.csproj +++ b/Meissa.Core.Services.UnitTests/Meissa.Core.Services.UnitTests.csproj @@ -20,10 +20,10 @@ - + - + diff --git a/Meissa.Core.Services/Meissa.Core.Services.csproj b/Meissa.Core.Services/Meissa.Core.Services.csproj index 4d8511f..97da322 100644 --- a/Meissa.Core.Services/Meissa.Core.Services.csproj +++ b/Meissa.Core.Services/Meissa.Core.Services.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/Meissa.Infrastructure.UnitTests/Meissa.Infrastructure.UnitTests.csproj b/Meissa.Infrastructure.UnitTests/Meissa.Infrastructure.UnitTests.csproj index abf5650..c890985 100644 --- a/Meissa.Infrastructure.UnitTests/Meissa.Infrastructure.UnitTests.csproj +++ b/Meissa.Infrastructure.UnitTests/Meissa.Infrastructure.UnitTests.csproj @@ -19,13 +19,13 @@ - + - + diff --git a/Meissa.Infrastructure/Meissa.Infrastructure.csproj b/Meissa.Infrastructure/Meissa.Infrastructure.csproj index c1d2ee6..bc05f9a 100644 --- a/Meissa.Infrastructure/Meissa.Infrastructure.csproj +++ b/Meissa.Infrastructure/Meissa.Infrastructure.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -9,6 +9,20 @@ $(SolutionDir)\StyleCopeRules.ruleset + + + false + 1701;1702;1705;NU1603;NU1605 + + + + + false + 1701;1702;1705;NU1603;NU1605 + false + 0 + + @@ -26,14 +40,15 @@ + - + - + diff --git a/Meissa.Model/Meissa.Model.csproj b/Meissa.Model/Meissa.Model.csproj index a37c76e..8053ff2 100644 --- a/Meissa.Model/Meissa.Model.csproj +++ b/Meissa.Model/Meissa.Model.csproj @@ -19,13 +19,13 @@ - + - - + + diff --git a/Meissa.Plugins.MSTest/Meissa.Plugins.MSTest.csproj b/Meissa.Plugins.MSTest/Meissa.Plugins.MSTest.csproj index 33526f1..ccc84a9 100644 --- a/Meissa.Plugins.MSTest/Meissa.Plugins.MSTest.csproj +++ b/Meissa.Plugins.MSTest/Meissa.Plugins.MSTest.csproj @@ -10,6 +10,11 @@ $(SolutionDir)\StyleCopeRules.ruleset + + + false + + diff --git a/Meissa.Plugins.NUnit/Meissa.Plugins.NUnit.csproj b/Meissa.Plugins.NUnit/Meissa.Plugins.NUnit.csproj index 1f720f0..94ab031 100644 --- a/Meissa.Plugins.NUnit/Meissa.Plugins.NUnit.csproj +++ b/Meissa.Plugins.NUnit/Meissa.Plugins.NUnit.csproj @@ -11,6 +11,11 @@ $(SolutionDir)\StyleCopeRules.ruleset + + false + + + diff --git a/Meissa.Plugins.Protractor/Meissa.Plugins.Protractor.csproj b/Meissa.Plugins.Protractor/Meissa.Plugins.Protractor.csproj index 14b20af..047c85a 100644 --- a/Meissa.Plugins.Protractor/Meissa.Plugins.Protractor.csproj +++ b/Meissa.Plugins.Protractor/Meissa.Plugins.Protractor.csproj @@ -10,6 +10,11 @@ $(SolutionDir)\StyleCopeRules.ruleset + + false + + + diff --git a/Meissa.Tests.Factories/Meissa.Tests.Factories.csproj b/Meissa.Tests.Factories/Meissa.Tests.Factories.csproj index 11d0b63..10625a4 100644 --- a/Meissa.Tests.Factories/Meissa.Tests.Factories.csproj +++ b/Meissa.Tests.Factories/Meissa.Tests.Factories.csproj @@ -20,7 +20,7 @@ - + diff --git a/Meissa.sln b/Meissa.sln index 5d00baf..33f4941 100644 --- a/Meissa.sln +++ b/Meissa.sln @@ -9,17 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.API", "Meissa.API\Me EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.API.Client", "Meissa.API.Client\Meissa.API.Client.csproj", "{632A710B-AE2F-4F4F-A221-68BFE972C117}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9015E1C-61A0-419C-90AD-68CE140C2DA7}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .gitignore = .gitignore - .tfignore = .tfignore - create-distributions-instructions.txt = create-distributions-instructions.txt - SharedAssemblyInfo.targets = SharedAssemblyInfo.targets - stylecop.json = stylecop.json - StyleCopeRules.ruleset = StyleCopeRules.ruleset - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Core.Contracts", "Meissa.Core.Contracts\Meissa.Core.Contracts.csproj", "{38C1FF46-BBDC-4D04-BB2F-AE7C271D0735}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Core.Model", "Meissa.Core.Model\Meissa.Core.Model.csproj", "{84BF7153-AED5-46E7-AED9-967A7209A9BC}" @@ -30,16 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Infrastructure", "Me EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Core.Services", "Meissa.Core.Services\Meissa.Core.Services.csproj", "{5CDAB2E0-48AE-4F2A-86AC-6DB01E43D4B1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A1A254E-ED74-46CB-B564-AE16BE7C3E7E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Core.Services.UnitTests", "Meissa.Core.Services.UnitTests\Meissa.Core.Services.UnitTests.csproj", "{3C85767B-B94A-4961-B812-EF834E663FCE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Tests.Factories", "Meissa.Tests.Factories\Meissa.Tests.Factories.csproj", "{8CEBFCDE-C7F4-467A-A7D7-34E883B10E2D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Infrastructure.UnitTests", "Meissa.Infrastructure.UnitTests\Meissa.Infrastructure.UnitTests.csproj", "{2BD4340C-663C-4CA0-B887-CD3440F45656}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.API.Tests", "Meissa.API.Tests\Meissa.API.Tests.csproj", "{6F7371BC-D50B-4147-8338-4F5D52DD1BBA}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0230A84D-7F7E-4C9A-BF57-5DC311106345}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Plugins.Contracts", "Meissa.Plugins.Contracts\Meissa.Plugins.Contracts.csproj", "{EA3E79AA-F906-4CA4-9DBE-BC5C3D081416}" @@ -50,21 +29,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Plugins.MSTest", "Me EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Plugins.NUnit", "Meissa.Plugins.NUnit\Meissa.Plugins.NUnit.csproj", "{C5791008-DD10-4C98-832C-C68C1CD2A0E7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTestsProject", "LoadTestsProject\LoadTestsProject.csproj", "{38C29C37-FA78-4D32-8092-D84A99ACA6A3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadTestsProject.NUnit", "LoadTestsProject.NUnit\LoadTestsProject.NUnit.csproj", "{B8DEA08C-41BE-473C-91AC-8AE4733AA88A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenerateLoadTestProjects", "GenerateLoadTestProjects\GenerateLoadTestProjects.csproj", "{467EB9F7-DF48-43B3-80B9-BC630BB5B59D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitLoadTest", "NUnitLoadTest\NUnitLoadTest.csproj", "{FAB8ECAE-5356-4EB8-9B8A-5F71B5C3B7A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnitReportMerge.Spike", "NUnitReportMerge.Spike\NUnitReportMerge.Spike.csproj", "{51717A40-1C27-4FEC-B1A5-4E5E07DDC3E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Plugins.Protractor", "Meissa.Plugins.Protractor\Meissa.Plugins.Protractor.csproj", "{F3218A75-25FE-481E-A6EA-11B0AD31F57F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meissa.Spikes", "Meissa.Spikes\Meissa.Spikes.csproj", "{20685E96-9949-4B07-A0B0-2ABCB6B863BA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A4938590-6875-45A5-972A-CDEA1CFF5E59}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadAssemblySpike", "LoadAssemblySpike\LoadAssemblySpike.csproj", "{9EE203DA-2034-4E3E-9BFB-DDB1AA318B73}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmallMSTestTestProject", "SmallMSTestTestProject\SmallMSTestTestProject.csproj", "{283023A3-CCCA-466F-A182-E0DBE1AEF83F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -104,22 +75,6 @@ Global {5CDAB2E0-48AE-4F2A-86AC-6DB01E43D4B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {5CDAB2E0-48AE-4F2A-86AC-6DB01E43D4B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {5CDAB2E0-48AE-4F2A-86AC-6DB01E43D4B1}.Release|Any CPU.Build.0 = Release|Any CPU - {3C85767B-B94A-4961-B812-EF834E663FCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C85767B-B94A-4961-B812-EF834E663FCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C85767B-B94A-4961-B812-EF834E663FCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C85767B-B94A-4961-B812-EF834E663FCE}.Release|Any CPU.Build.0 = Release|Any CPU - {8CEBFCDE-C7F4-467A-A7D7-34E883B10E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CEBFCDE-C7F4-467A-A7D7-34E883B10E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CEBFCDE-C7F4-467A-A7D7-34E883B10E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CEBFCDE-C7F4-467A-A7D7-34E883B10E2D}.Release|Any CPU.Build.0 = Release|Any CPU - {2BD4340C-663C-4CA0-B887-CD3440F45656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BD4340C-663C-4CA0-B887-CD3440F45656}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BD4340C-663C-4CA0-B887-CD3440F45656}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BD4340C-663C-4CA0-B887-CD3440F45656}.Release|Any CPU.Build.0 = Release|Any CPU - {6F7371BC-D50B-4147-8338-4F5D52DD1BBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F7371BC-D50B-4147-8338-4F5D52DD1BBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F7371BC-D50B-4147-8338-4F5D52DD1BBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F7371BC-D50B-4147-8338-4F5D52DD1BBA}.Release|Any CPU.Build.0 = Release|Any CPU {EA3E79AA-F906-4CA4-9DBE-BC5C3D081416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EA3E79AA-F906-4CA4-9DBE-BC5C3D081416}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA3E79AA-F906-4CA4-9DBE-BC5C3D081416}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -136,38 +91,18 @@ Global {C5791008-DD10-4C98-832C-C68C1CD2A0E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {C5791008-DD10-4C98-832C-C68C1CD2A0E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {C5791008-DD10-4C98-832C-C68C1CD2A0E7}.Release|Any CPU.Build.0 = Release|Any CPU - {38C29C37-FA78-4D32-8092-D84A99ACA6A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38C29C37-FA78-4D32-8092-D84A99ACA6A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38C29C37-FA78-4D32-8092-D84A99ACA6A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38C29C37-FA78-4D32-8092-D84A99ACA6A3}.Release|Any CPU.Build.0 = Release|Any CPU - {B8DEA08C-41BE-473C-91AC-8AE4733AA88A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8DEA08C-41BE-473C-91AC-8AE4733AA88A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8DEA08C-41BE-473C-91AC-8AE4733AA88A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8DEA08C-41BE-473C-91AC-8AE4733AA88A}.Release|Any CPU.Build.0 = Release|Any CPU - {467EB9F7-DF48-43B3-80B9-BC630BB5B59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {467EB9F7-DF48-43B3-80B9-BC630BB5B59D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {467EB9F7-DF48-43B3-80B9-BC630BB5B59D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {467EB9F7-DF48-43B3-80B9-BC630BB5B59D}.Release|Any CPU.Build.0 = Release|Any CPU {FAB8ECAE-5356-4EB8-9B8A-5F71B5C3B7A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FAB8ECAE-5356-4EB8-9B8A-5F71B5C3B7A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {FAB8ECAE-5356-4EB8-9B8A-5F71B5C3B7A3}.Release|Any CPU.ActiveCfg = Release|Any CPU {FAB8ECAE-5356-4EB8-9B8A-5F71B5C3B7A3}.Release|Any CPU.Build.0 = Release|Any CPU - {51717A40-1C27-4FEC-B1A5-4E5E07DDC3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51717A40-1C27-4FEC-B1A5-4E5E07DDC3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51717A40-1C27-4FEC-B1A5-4E5E07DDC3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51717A40-1C27-4FEC-B1A5-4E5E07DDC3E1}.Release|Any CPU.Build.0 = Release|Any CPU {F3218A75-25FE-481E-A6EA-11B0AD31F57F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F3218A75-25FE-481E-A6EA-11B0AD31F57F}.Debug|Any CPU.Build.0 = Debug|Any CPU {F3218A75-25FE-481E-A6EA-11B0AD31F57F}.Release|Any CPU.ActiveCfg = Release|Any CPU {F3218A75-25FE-481E-A6EA-11B0AD31F57F}.Release|Any CPU.Build.0 = Release|Any CPU - {20685E96-9949-4B07-A0B0-2ABCB6B863BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20685E96-9949-4B07-A0B0-2ABCB6B863BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20685E96-9949-4B07-A0B0-2ABCB6B863BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20685E96-9949-4B07-A0B0-2ABCB6B863BA}.Release|Any CPU.Build.0 = Release|Any CPU - {9EE203DA-2034-4E3E-9BFB-DDB1AA318B73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EE203DA-2034-4E3E-9BFB-DDB1AA318B73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EE203DA-2034-4E3E-9BFB-DDB1AA318B73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EE203DA-2034-4E3E-9BFB-DDB1AA318B73}.Release|Any CPU.Build.0 = Release|Any CPU + {283023A3-CCCA-466F-A182-E0DBE1AEF83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {283023A3-CCCA-466F-A182-E0DBE1AEF83F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {283023A3-CCCA-466F-A182-E0DBE1AEF83F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {283023A3-CCCA-466F-A182-E0DBE1AEF83F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -181,21 +116,12 @@ Global {A03123D7-835D-4F88-BDAD-A1DCFF760C6D} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} {5B8D215F-9DC5-485A-98A4-933054B17461} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} {5CDAB2E0-48AE-4F2A-86AC-6DB01E43D4B1} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} - {3C85767B-B94A-4961-B812-EF834E663FCE} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} - {8CEBFCDE-C7F4-467A-A7D7-34E883B10E2D} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} - {2BD4340C-663C-4CA0-B887-CD3440F45656} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} - {6F7371BC-D50B-4147-8338-4F5D52DD1BBA} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} {EA3E79AA-F906-4CA4-9DBE-BC5C3D081416} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} {91A44004-4490-4481-810F-19DB2242A7C5} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} {650411A3-0F43-4FF3-8A36-9F0328F84420} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} {C5791008-DD10-4C98-832C-C68C1CD2A0E7} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} - {38C29C37-FA78-4D32-8092-D84A99ACA6A3} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} - {B8DEA08C-41BE-473C-91AC-8AE4733AA88A} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} - {467EB9F7-DF48-43B3-80B9-BC630BB5B59D} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} - {51717A40-1C27-4FEC-B1A5-4E5E07DDC3E1} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} {F3218A75-25FE-481E-A6EA-11B0AD31F57F} = {0230A84D-7F7E-4C9A-BF57-5DC311106345} - {20685E96-9949-4B07-A0B0-2ABCB6B863BA} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} - {9EE203DA-2034-4E3E-9BFB-DDB1AA318B73} = {4A1A254E-ED74-46CB-B564-AE16BE7C3E7E} + {283023A3-CCCA-466F-A182-E0DBE1AEF83F} = {A4938590-6875-45A5-972A-CDEA1CFF5E59} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {547D0377-2E1C-4635-9CCA-FDC4AD0A2300} diff --git a/Meissa/Meissa.csproj b/Meissa/Meissa.csproj index 0474a9e..cb5bb6a 100644 --- a/Meissa/Meissa.csproj +++ b/Meissa/Meissa.csproj @@ -35,7 +35,13 @@ false full true - 1701;1702;1705;NU1603 + 1701;1702;1705;NU1603;NU1605 + + + + false + 1701;1702;1705;NU1603;NU1605 + @@ -48,9 +54,9 @@ - + - + @@ -58,7 +64,12 @@ - + + + + + + diff --git a/Meissa/Properties/launchSettings.json b/Meissa/Properties/launchSettings.json index 81d842e..4de6be4 100644 --- a/Meissa/Properties/launchSettings.json +++ b/Meissa/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Meissa": { "commandName": "Project", - "commandLineArgs": "testAgent --testAgentTag=\"Agent1\" --testServerUrl=\"http://127.0.0.1:5000\"" + "commandLineArgs": "runner --outputFilesLocation=\"C:\\meissa-tests\" --testLibraryPath=\"C:\\meissa-tests\\SmallMSTestTestProject.dll\" --agentTag=\"Agent1\" --testTechnology=\"MSTest\" --resultsFilePath=\"C:\\meissa-tests-results\\all.trx\" --testServerUrl=\"http://127.0.0.1:5000\"" } } } \ No newline at end of file diff --git a/NUnitLoadTest/NUnitLoadTest.csproj b/NUnitLoadTest/NUnitLoadTest.csproj index c696098..000c813 100644 --- a/NUnitLoadTest/NUnitLoadTest.csproj +++ b/NUnitLoadTest/NUnitLoadTest.csproj @@ -90,9 +90,9 @@ - + - + \ No newline at end of file diff --git a/NUnitLoadTest/packages.config b/NUnitLoadTest/packages.config index f39bde0..26c1977 100644 --- a/NUnitLoadTest/packages.config +++ b/NUnitLoadTest/packages.config @@ -3,8 +3,8 @@ - + - + \ No newline at end of file diff --git a/SmallMSTestTestProject/ChromeTests.cs b/SmallMSTestTestProject/ChromeTests.cs new file mode 100644 index 0000000..d253b23 --- /dev/null +++ b/SmallMSTestTestProject/ChromeTests.cs @@ -0,0 +1,39 @@ +using System.Threading; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace SmallMSTestTestProject +{ + [TestClass] + public class ChromeTests + { + [TestMethod] + public void ChromeTest1() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void ChromeTest2() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void ChromeTest3() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void ChromeTest4() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void ChromeTest5() + { + Thread.Sleep(1000); + } + } +} diff --git a/SmallMSTestTestProject/FirefoxTests.cs b/SmallMSTestTestProject/FirefoxTests.cs new file mode 100644 index 0000000..e80ab29 --- /dev/null +++ b/SmallMSTestTestProject/FirefoxTests.cs @@ -0,0 +1,39 @@ +using System.Threading; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace SmallMSTestTestProject +{ + [TestClass] + public class FirefoxTests + { + [TestMethod] + public void FirefoxTest1() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void FirefoxTest2() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void FirefoxTestt3() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void FirefoxTest4() + { + Thread.Sleep(1000); + } + + [TestMethod] + public void FirefoxTest5() + { + Thread.Sleep(1000); + } + } +} diff --git a/SmallMSTestTestProject/SmallMSTestTestProject.csproj b/SmallMSTestTestProject/SmallMSTestTestProject.csproj new file mode 100644 index 0000000..3482ba1 --- /dev/null +++ b/SmallMSTestTestProject/SmallMSTestTestProject.csproj @@ -0,0 +1,15 @@ + + + + netcoreapp2.1 + + false + + + + + + + + +