diff options
author | Bob Arnson <bob@firegiant.com> | 2025-02-14 23:49:12 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2025-03-03 14:25:07 -0500 |
commit | ae96ff06cadd0141f48d88a7e9983ca81dace613 (patch) | |
tree | 692c21c53be97e30e60a515b215342b27a7087d0 /src/tools/test/WixToolsetTest.Heat | |
parent | ca6e44d496b0c589fdaabad69a00643f539c47cd (diff) | |
download | wix-ae96ff06cadd0141f48d88a7e9983ca81dace613.tar.gz wix-ae96ff06cadd0141f48d88a7e9983ca81dace613.tar.bz2 wix-ae96ff06cadd0141f48d88a7e9983ca81dace613.zip |
Convert tools\ to MSTest and traversal projects.
Diffstat (limited to 'src/tools/test/WixToolsetTest.Heat')
4 files changed, 19 insertions, 17 deletions
diff --git a/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs b/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs index 9ca84936..db71c4cd 100644 --- a/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs +++ b/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs | |||
@@ -5,12 +5,13 @@ namespace WixToolsetTest.Heat | |||
5 | using System; | 5 | using System; |
6 | using System.IO; | 6 | using System.IO; |
7 | using System.Linq; | 7 | using System.Linq; |
8 | using WixInternal.TestSupport; | 8 | using Microsoft.VisualStudio.TestTools.UnitTesting; |
9 | using Xunit; | 9 | using WixInternal.MSTestSupport; |
10 | 10 | ||
11 | [TestClass] | ||
11 | public class DirectoryToPayloadGroupFixture | 12 | public class DirectoryToPayloadGroupFixture |
12 | { | 13 | { |
13 | [Fact] | 14 | [TestMethod] |
14 | public void CanHarvestSimpleDirectory() | 15 | public void CanHarvestSimpleDirectory() |
15 | { | 16 | { |
16 | var folder = TestData.Get("TestData", "SingleFile"); | 17 | var folder = TestData.Get("TestData", "SingleFile"); |
@@ -43,7 +44,7 @@ namespace WixToolsetTest.Heat | |||
43 | } | 44 | } |
44 | } | 45 | } |
45 | 46 | ||
46 | [Fact] | 47 | [TestMethod] |
47 | public void CanHarvestSimpleDirectoryWithSourceDirSubstitution() | 48 | public void CanHarvestSimpleDirectoryWithSourceDirSubstitution() |
48 | { | 49 | { |
49 | var folder = TestData.Get("TestData", "SingleFile"); | 50 | var folder = TestData.Get("TestData", "SingleFile"); |
@@ -77,7 +78,7 @@ namespace WixToolsetTest.Heat | |||
77 | } | 78 | } |
78 | } | 79 | } |
79 | 80 | ||
80 | [Fact] | 81 | [TestMethod] |
81 | public void CanHarvestNestedFiles() | 82 | public void CanHarvestNestedFiles() |
82 | { | 83 | { |
83 | var folder = TestData.Get("TestData", "NestedFiles"); | 84 | var folder = TestData.Get("TestData", "NestedFiles"); |
diff --git a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs index d517e209..c5f3df74 100644 --- a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs +++ b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs | |||
@@ -4,12 +4,13 @@ namespace WixToolsetTest.Heat | |||
4 | { | 4 | { |
5 | using System.IO; | 5 | using System.IO; |
6 | using System.Linq; | 6 | using System.Linq; |
7 | using WixInternal.TestSupport; | 7 | using Microsoft.VisualStudio.TestTools.UnitTesting; |
8 | using Xunit; | 8 | using WixInternal.MSTestSupport; |
9 | 9 | ||
10 | [TestClass] | ||
10 | public class HeatFixture | 11 | public class HeatFixture |
11 | { | 12 | { |
12 | [Fact] | 13 | [TestMethod] |
13 | public void CanHarvestSimpleDirectory() | 14 | public void CanHarvestSimpleDirectory() |
14 | { | 15 | { |
15 | var folder = TestData.Get("TestData", "SingleFile"); | 16 | var folder = TestData.Get("TestData", "SingleFile"); |
@@ -48,7 +49,7 @@ namespace WixToolsetTest.Heat | |||
48 | } | 49 | } |
49 | } | 50 | } |
50 | 51 | ||
51 | [Fact] | 52 | [TestMethod] |
52 | public void CanHarvestSimpleDirectoryToComponentGroup() | 53 | public void CanHarvestSimpleDirectoryToComponentGroup() |
53 | { | 54 | { |
54 | var folder = TestData.Get("TestData", "SingleFile"); | 55 | var folder = TestData.Get("TestData", "SingleFile"); |
@@ -88,7 +89,7 @@ namespace WixToolsetTest.Heat | |||
88 | } | 89 | } |
89 | } | 90 | } |
90 | 91 | ||
91 | [Fact] | 92 | [TestMethod] |
92 | public void CanHarvestSimpleDirectoryToInstallFolder() | 93 | public void CanHarvestSimpleDirectoryToInstallFolder() |
93 | { | 94 | { |
94 | var folder = TestData.Get("TestData", "SingleFile"); | 95 | var folder = TestData.Get("TestData", "SingleFile"); |
@@ -129,7 +130,7 @@ namespace WixToolsetTest.Heat | |||
129 | } | 130 | } |
130 | } | 131 | } |
131 | 132 | ||
132 | [Fact] | 133 | [TestMethod] |
133 | public void CanHarvestFile() | 134 | public void CanHarvestFile() |
134 | { | 135 | { |
135 | var folder = TestData.Get("TestData", "SingleFile"); | 136 | var folder = TestData.Get("TestData", "SingleFile"); |
@@ -171,7 +172,7 @@ namespace WixToolsetTest.Heat | |||
171 | } | 172 | } |
172 | } | 173 | } |
173 | 174 | ||
174 | [Fact] | 175 | [TestMethod] |
175 | public void CanHarvestRegistry() | 176 | public void CanHarvestRegistry() |
176 | { | 177 | { |
177 | var folder = TestData.Get("TestData", "RegFile"); | 178 | var folder = TestData.Get("TestData", "RegFile"); |
@@ -195,7 +196,7 @@ namespace WixToolsetTest.Heat | |||
195 | } | 196 | } |
196 | } | 197 | } |
197 | 198 | ||
198 | [Fact] | 199 | [TestMethod] |
199 | public void CanHarvestRegistryIntoComponentGroup() | 200 | public void CanHarvestRegistryIntoComponentGroup() |
200 | { | 201 | { |
201 | var folder = TestData.Get("TestData", "RegFile"); | 202 | var folder = TestData.Get("TestData", "RegFile"); |
diff --git a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs index 0f6c4f66..d8dec06f 100644 --- a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs +++ b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs | |||
@@ -5,7 +5,7 @@ namespace WixToolsetTest.Heat | |||
5 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading.Tasks; | 6 | using System.Threading.Tasks; |
7 | using WixToolset.Core; | 7 | using WixToolset.Core; |
8 | using WixInternal.Core.TestPackage; | 8 | using WixInternal.Core.MSTestPackage; |
9 | using WixToolset.Data; | 9 | using WixToolset.Data; |
10 | using WixToolset.Extensibility.Services; | 10 | using WixToolset.Extensibility.Services; |
11 | using WixToolset.Tools.Heat; | 11 | using WixToolset.Tools.Heat; |
diff --git a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj index fb86ecdf..660dca3b 100644 --- a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj +++ b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj | |||
@@ -1,11 +1,11 @@ | |||
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>net472</TargetFramework> | 6 | <TargetFramework>net472</TargetFramework> |
7 | <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> | 7 | <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> |
8 | <IsWixTestProject>true</IsWixTestProject> | 8 | <IsWixMSTestProject>true</IsWixMSTestProject> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
10 | 10 | ||
11 | <ItemGroup> | 11 | <ItemGroup> |
@@ -17,6 +17,6 @@ | |||
17 | </ItemGroup> | 17 | </ItemGroup> |
18 | 18 | ||
19 | <ItemGroup> | 19 | <ItemGroup> |
20 | <PackageReference Include="WixInternal.Core.TestPackage" /> | 20 | <PackageReference Include="WixInternal.Core.MSTestPackage" /> |
21 | </ItemGroup> | 21 | </ItemGroup> |
22 | </Project> | 22 | </Project> |