aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs6
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs2
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
index 6acf3472..bd4b70da 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -44,13 +44,13 @@ namespace WixToolsetTest.CoreIntegration
44 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\example.txt"))); 44 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\example.txt")));
45 45
46 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wir")); 46 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wir"));
47 Assert.Single(intermediate.Sections); 47 var section = intermediate.Sections.Single();
48 48
49 var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single(); 49 var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
50 Assert.Equal(Path.Combine(folder, @"data\example.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 50 Assert.Equal(Path.Combine(folder, @"data\example.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
51 Assert.Equal(@"example.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 51 Assert.Equal(@"example.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
52 52
53 var example = intermediate.Sections.SelectMany(s => s.Tuples).Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); 53 var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single();
54 Assert.Equal("Foo", example.Id.Id); 54 Assert.Equal("Foo", example.Id.Id);
55 Assert.Equal("Foo", example[0].AsString()); 55 Assert.Equal("Foo", example[0].AsString());
56 Assert.Equal("Bar", example[1].AsString()); 56 Assert.Equal("Bar", example[1].AsString());
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
index 9fd42214..bff5f609 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ExampleExtension/Package.wxs
@@ -8,6 +8,8 @@
8 8
9 <Property Id="ExampleProperty" Value="$(ex.Test)" /> 9 <Property Id="ExampleProperty" Value="$(ex.Test)" />
10 10
11 <PropertyRef Id="PropertyFromExampleWir" />
12
11 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 13 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
12 <ComponentGroupRef Id="ProductComponents" /> 14 <ComponentGroupRef Id="ProductComponents" />
13 </Feature> 15 </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index ed0d5f5e..af520116 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -31,7 +31,7 @@
31 31
32 <ItemGroup> 32 <ItemGroup>
33 <ProjectReference Include="..\..\wix\wix.csproj" /> 33 <ProjectReference Include="..\..\wix\wix.csproj" />
34 <ProjectReference Include="..\Example.Extension\Example.Extension.csproj" /> 34 <ProjectReference Include="..\TestData\Example.Extension\Example.Extension.csproj" />
35 </ItemGroup> 35 </ItemGroup>
36 36
37 <ItemGroup> 37 <ItemGroup>