@joebigelow / wix / commits / 6008384f

Add broken test for PE payloads.

Bob Arnson committed Dec 8, 2017 at 14:41 UTC 6008384f4ff8be1fec86861014fc392a6ddd4632
6 files changed +87
src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
+30
@@ -145,6 +145,36 @@ namespace WixToolsetTest.CoreIntegration
145 }
146 }
147
148 + [Fact]
149 + public void CanBuildMultipleFilesCompressed()
150 + {
151 + var folder = TestData.Get(@"TestData\MultiFileCompressed");
152 +
153 + using (var fs = new DisposableFileSystem())
154 + {
155 + var intermediateFolder = fs.GetFolder();
156 +
157 + var program = new Program();
158 + var result = program.Run(new WixToolsetServiceProvider(), new[]
159 + {
160 + "build",
161 + Path.Combine(folder, "Package.wxs"),
162 + Path.Combine(folder, "PackageComponents.wxs"),
163 + "-d", "MediaTemplateCompressionLevel",
164 + "-loc", Path.Combine(folder, "Package.en-us.wxl"),
165 + "-bindpath", Path.Combine(folder, "data"),
166 + "-intermediateFolder", intermediateFolder,
167 + "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
168 + });
169 +
170 + Assert.Equal(0, result);
171 +
172 + Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
173 + Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\cab1.cab")));
174 + Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
175 + }
176 + }
177 +
178 [Fact]
179 public void CanBuildSimpleModule()
180 {
src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.en-us.wxl new
+11
@@ -0,0 +1,11 @@
1 +<?xml version="1.0" encoding="utf-8"?>
2 +
3 +<!--
4 +This file contains the declaration of all the localizable strings.
5 +-->
6 +<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
7 +
8 + <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
9 + <String Id="FeatureTitle">MsiPackage</String>
10 +
11 +</WixLocalization>
src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/Package.wxs new
+28
@@ -0,0 +1,28 @@
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 + <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4 + <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
5 +
6 + <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 +
8 + <?ifndef MediaTemplateCompressionLevel?>
9 + <Media Id="1" Cabinet="example.cab" />
10 + <?elseif $(MediaTemplateCompressionLevel) = ""?>
11 + <MediaTemplate />
12 + <?else?>
13 + <MediaTemplate CabinetTemplate="lowcab{0}.cab" CompressionLevel="$(MediaTemplateCompressionLevel)" />
14 + <?endif?>
15 +
16 + <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
17 + <ComponentGroupRef Id="ProductComponents" />
18 + </Feature>
19 + </Product>
20 +
21 + <Fragment>
22 + <Directory Id="TARGETDIR" Name="SourceDir">
23 + <Directory Id="ProgramFilesFolder">
24 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
25 + </Directory>
26 + </Directory>
27 + </Fragment>
28 +</Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/PackageComponents.wxs new
+13
@@ -0,0 +1,13 @@
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 + <Fragment>
4 + <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
5 + <Component>
6 + <File Source="test.txt" />
7 + </Component>
8 + <Component>
9 + <File Source="$(env.WINDIR)\Notepad.exe" />
10 + </Component>
11 + </ComponentGroup>
12 + </Fragment>
13 +</Wix>
src/test/WixToolsetTest.CoreIntegration/TestData/MultiFileCompressed/data/test.txt new
+1
@@ -0,0 +1 @@
1 +This is test.txt.
\ No newline at end of file
src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+4
@@ -27,6 +27,10 @@
27 <Content Include="TestData\SingleFileCompressed\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
28 <Content Include="TestData\SingleFileCompressed\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
29 <Content Include="TestData\SingleFileCompressed\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
30 + <Content Include="TestData\MultiFileCompressed\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
31 + <Content Include="TestData\MultiFileCompressed\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
32 + <Content Include="TestData\MultiFileCompressed\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
33 + <Content Include="TestData\MultiFileCompressed\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
34 </ItemGroup>
35
36 <ItemGroup>