From 62dd878b5fd6d7d354034178584710ecb903985e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 31 Mar 2021 11:50:36 -0500 Subject: Add failing tests for bundles with uncompressed payloads. --- src/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 34 ++++++++++++++++++ .../SimpleMsiPackage/UncompressedBundle/Bundle.wxs | 11 ++++++ .../UncompressedBundle/UncompressedBundle.wixproj | 42 ++++++++++++++++++++++ .../WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj | 2 ++ 4 files changed, 89 insertions(+) create mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs create mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj diff --git a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs index 034f5b0b..3c8e79e7 100644 --- a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs @@ -44,6 +44,40 @@ namespace WixToolsetTest.Sdk } } + [Theory(Skip = "Test demonstrates failure")] + [InlineData(BuildSystem.DotNetCoreSdk)] + [InlineData(BuildSystem.MSBuild)] + [InlineData(BuildSystem.MSBuild64)] + public void CanBuildUncompressedBundle(BuildSystem buildSystem) + { + var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage"); + + using (var fs = new TestDataFolderFileSystem()) + { + fs.Initialize(sourceFolder); + var baseFolder = Path.Combine(fs.BaseFolder, "UncompressedBundle"); + var binFolder = Path.Combine(baseFolder, @"bin\"); + var projectPath = Path.Combine(baseFolder, "UncompressedBundle.wixproj"); + + var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); + result.AssertSuccess(); + + var warnings = result.Output.Where(line => line.Contains(": warning")); + Assert.Empty(warnings); + + var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) + .Select(s => s.Substring(baseFolder.Length + 1)) + .OrderBy(s => s) + .ToArray(); + WixAssert.CompareLineByLine(new[] + { + @"bin\x86\Release\SimpleBundle.exe", + @"bin\x86\Release\SimpleBundle.wixpdb", + @"bin\x86\Release\test.txt", + }, paths); + } + } + [Theory] [InlineData(BuildSystem.DotNetCoreSdk)] [InlineData(BuildSystem.MSBuild)] diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs new file mode 100644 index 00000000..6ab9a016 --- /dev/null +++ b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj new file mode 100644 index 00000000..199eb6d9 --- /dev/null +++ b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj @@ -0,0 +1,42 @@ + + + + + Debug + x86 + + + + 6670d5c9-bbec-4828-ab60-4a1c0ffeb97d + Bundle + + + + $(Platform) + bin\$(Platform)\$(Configuration)\ + Debug + + + $(Platform) + bin\$(Platform)\$(Configuration)\ + + + $(Platform) + bin\$(Platform)\$(Configuration)\ + Debug + + + $(Platform) + bin\$(Platform)\$(Configuration)\ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj index 45c38996..35ed053a 100644 --- a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj +++ b/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj @@ -40,6 +40,8 @@ + + -- cgit v1.2.3-55-g6feb