diff options
author | Bob Arnson <bob@firegiant.com> | 2025-02-14 22:29:39 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2025-03-03 14:25:07 -0500 |
commit | ca6e44d496b0c589fdaabad69a00643f539c47cd (patch) | |
tree | edf84727cecfc03092a2851b465d97622c5048eb /src/ext/PowerShell/test | |
parent | ba7fd5837ea149b2e319cc577fad27ce1162a064 (diff) | |
download | wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.tar.gz wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.tar.bz2 wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.zip |
Convert ext\ to MSTest and traversal projects.
- Move ext\ unit tests to MSTest.
- MSBuildify ext projects with MSTest execution.
- Fork test support projects for MSTest:
- WixInternal.TestSupport
- WixInternal.Core.TestPackage
Diffstat (limited to 'src/ext/PowerShell/test')
-rw-r--r-- | src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs | 13 | ||||
-rw-r--r-- | src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs index eafda99f..a1dc3282 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs | |||
@@ -2,14 +2,15 @@ | |||
2 | 2 | ||
3 | namespace WixToolsetTest.PowerShell | 3 | namespace WixToolsetTest.PowerShell |
4 | { | 4 | { |
5 | using WixInternal.TestSupport; | 5 | using Microsoft.VisualStudio.TestTools.UnitTesting; |
6 | using WixInternal.Core.TestPackage; | 6 | using WixInternal.MSTestSupport; |
7 | using WixInternal.Core.MSTestPackage; | ||
7 | using WixToolset.PowerShell; | 8 | using WixToolset.PowerShell; |
8 | using Xunit; | ||
9 | 9 | ||
10 | [TestClass] | ||
10 | public class PowerShellExtensionFixture | 11 | public class PowerShellExtensionFixture |
11 | { | 12 | { |
12 | [Fact] | 13 | [TestMethod] |
13 | public void CantBuildUsingTypesFileWithoutSnapIn() | 14 | public void CantBuildUsingTypesFileWithoutSnapIn() |
14 | { | 15 | { |
15 | var folder = TestData.Get(@"TestData\TypesFile"); | 16 | var folder = TestData.Get(@"TestData\TypesFile"); |
@@ -19,8 +20,8 @@ namespace WixToolsetTest.PowerShell | |||
19 | var results = build.BuildAndQuery(args => { | 20 | var results = build.BuildAndQuery(args => { |
20 | wixRunnerResult = WixRunner.Execute(args); | 21 | wixRunnerResult = WixRunner.Execute(args); |
21 | }); | 22 | }); |
22 | Assert.NotNull(wixRunnerResult); | 23 | Assert.IsNotNull(wixRunnerResult); |
23 | Assert.Equal((int)PSErrors.Ids.NeitherIdSpecified, wixRunnerResult.ExitCode); | 24 | Assert.AreEqual((int)PSErrors.Ids.NeitherIdSpecified, wixRunnerResult.ExitCode); |
24 | } | 25 | } |
25 | } | 26 | } |
26 | } | 27 | } |
diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index 347ca1ed..cff13cb7 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj | |||
@@ -1,10 +1,10 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
10 | <ItemGroup> | 10 | <ItemGroup> |
@@ -16,6 +16,7 @@ | |||
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | 17 | ||
18 | <ItemGroup> | 18 | <ItemGroup> |
19 | <PackageReference Include="WixInternal.Core.TestPackage" /> | 19 | <PackageReference Include="WixInternal.MSTestSupport" /> |
20 | <PackageReference Include="WixInternal.Core.MSTestPackage" /> | ||
20 | </ItemGroup> | 21 | </ItemGroup> |
21 | </Project> | 22 | </Project> |