From 1d2aeaf14709bc653137d010226435c2b36bbc58 Mon Sep 17 00:00:00 2001 From: Mykhailo Pylyp Date: Tue, 16 Mar 2021 17:29:20 +0200 Subject: [PATCH] Tests on pipeline (#10244) --- .../ci/templates/build-powertoys-steps.yml | 53 ++++++++++++------- .../Microsoft.Interop.Tests.csproj | 4 +- .../UnitTest-ColorPickerUI.csproj | 4 +- ...rToys.Run.Plugin.Registry.UnitTests.csproj | 4 +- .../ImageTests.cs | 1 + .../UnitTests-MarkdownPreviewHandler.csproj | 4 +- .../UnitTests-PreviewHandlerCommon.csproj | 4 +- .../SvgPreviewControlTests.cs | 2 +- .../UnitTests-SvgPreviewHandler.csproj | 4 +- .../UnitTests-SvgThumbnailProvider.csproj | 4 +- ...oft.PowerToys.Settings.UI.UnitTests.csproj | 4 +- 11 files changed, 51 insertions(+), 37 deletions(-) diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index 3abec3b0a0..fe149c755f 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -93,40 +93,52 @@ steps: msbuildArgs: ${{ parameters.additionalBuildArguments }} maximumCpuCount: true - # directly not doing WinAppDriver testing - task: VSTest@2 - displayName: 'Run .Net Core Tests 1' + displayName: 'MS Tests' inputs: platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' testSelector: 'testAssemblies' testAssemblyVer2: | - **\Microsoft.Plugin.Folder.UnitTest.dll + **\UnitTests-SvgThumbnailProvider.dll + **\Microsoft.PowerToys.Settings.UI.UnitTests.dll + **\UnitTests-SvgPreviewHandler.dll + **\UnitTests-PreviewHandlerCommon.dll + **\PreviewPaneUnitTests.dll + **\Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.dll + **\UnitTest-ColorPickerUI.dll + **\Microsoft.Interop.Tests.dll + !**\obj\** + +- task: VSTest@2 + displayName: 'XUnit Tests' + inputs: + platform: '$(BuildPlatform)' + configuration: '$(BuildConfiguration)' + testSelector: 'testAssemblies' + testAssemblyVer2: | + **\ImageResizer.Test.dll + !**\obj\** + +- task: VSTest@2 + displayName: 'NUnit Tests' + inputs: + platform: '$(BuildPlatform)' + configuration: '$(BuildConfiguration)' + testSelector: 'testAssemblies' + testAssemblyVer2: | + **\Microsoft.Plugin.Folder.UnitTests.dll **\Microsoft.Plugin.Program.UnitTests.dll **\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.dll **\Microsoft.Plugin.Uri.UnitTests.dll **\Wox.Test.dll - **\Microsoft.PowerToys.Settings.UI.UnitTests.dll - **\UnitTest-ColorPickerUI.dll - **\Microsoft.Interop.Tests.dll - !**\obj\** -- task: VSTest@2 - displayName: 'Run .Net Core Tests 2' - inputs: - platform: '$(BuildPlatform)' - configuration: '$(BuildConfiguration)' - testSelector: 'testAssemblies' - testAssemblyVer2: | - **\PreviewPaneUnitTests.dll #this is the markdown tests - **\UnitTests-PreviewHandlerCommon.dll - **\UnitTests-SvgPreviewHandler.dll - **\ImageResizer.Test.dll - **\powerpreviewTest.dll + **\Microsoft.PowerToys.Run.Plugin.System.UnitTests.dll !**\obj\** + # Native dlls - task: VSTest@2 - displayName: 'Run Native Tests' + displayName: 'Native Tests' inputs: platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' @@ -135,4 +147,5 @@ steps: **\KeyboardManagerTest.dll **\UnitTests-CommonLib.dll **\PowerRenameUnitTests.dll + **\powerpreviewTest.dll !**\obj\** diff --git a/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj b/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj index 3dba484afe..2f07116d1d 100644 --- a/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj +++ b/src/common/interop/interop-tests/Microsoft.Interop.Tests.csproj @@ -53,8 +53,8 @@ - - + + diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj index 598453a504..c03dd465a8 100644 --- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj +++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj @@ -33,8 +33,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj index c93b86dcc8..190eb9baf4 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry.UnitTest/Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/ImageTests.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/ImageTests.cs index 33464e2809..24fd1037ec 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/ImageTests.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/ImageTests.cs @@ -12,6 +12,7 @@ using Wox.Plugin; namespace Microsoft.PowerToys.Run.Plugin.System.UnitTests { + [TestFixture] public class ImageTests { [SetUp] diff --git a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj index d9f77334fc..44d54fcd24 100644 --- a/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj @@ -35,8 +35,8 @@ all - - + + diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index 105efe31a9..9177869175 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs index f81cc1f132..c9e0eef9aa 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs @@ -90,7 +90,7 @@ namespace SvgPreviewHandlerUnitTests } } - [TestMethod] + // ToDo: fix unit test public void SvgPreviewControlShouldSetScrollBarsEnabledPropertyWhenDoPreviewCalled() { // Arrange diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index c42fa64396..ceb7c48469 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -32,8 +32,8 @@ all - - + + diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 802cbe32b8..ed72c5af1c 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -45,8 +45,8 @@ all - - + + all diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj b/src/settings-ui/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj index a9b57204f2..875e95a3f6 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj @@ -26,8 +26,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive