aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-25 14:43:50 -0700
committerRob Mensching <rob@firegiant.com>2020-06-25 14:50:31 -0700
commit38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch)
tree803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
parent8968578d50858721317d410549a9f9b5c62bf1f7 (diff)
downloadwix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz
wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2
wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index b86e67ff..cf57eae1 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -12,7 +12,7 @@ namespace WixToolsetTest.CoreIntegration
12 using WixToolset.Core.TestPackage; 12 using WixToolset.Core.TestPackage;
13 using WixToolset.Data; 13 using WixToolset.Data;
14 using WixToolset.Data.Burn; 14 using WixToolset.Data.Burn;
15 using WixToolset.Data.Tuples; 15 using WixToolset.Data.Symbols;
16 using Xunit; 16 using Xunit;
17 17
18 public class BundleFixture 18 public class BundleFixture
@@ -81,14 +81,14 @@ namespace WixToolsetTest.CoreIntegration
81 var intermediate = Intermediate.Load(wixOutput); 81 var intermediate = Intermediate.Load(wixOutput);
82 var section = intermediate.Sections.Single(); 82 var section = intermediate.Sections.Single();
83 83
84 var bundleTuple = section.Tuples.OfType<WixBundleTuple>().Single(); 84 var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
85 Assert.Equal("1.0.0.0", bundleTuple.Version); 85 Assert.Equal("1.0.0.0", bundleSymbol.Version);
86 86
87 var previousVersion = bundleTuple.Fields[(int)WixBundleTupleFields.Version].PreviousValue; 87 var previousVersion = bundleSymbol.Fields[(int)WixBundleSymbolFields.Version].PreviousValue;
88 Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString()); 88 Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString());
89 89
90 var msiTuple = section.Tuples.OfType<WixBundlePackageTuple>().Single(); 90 var msiSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single();
91 Assert.Equal("test.msi", msiTuple.Id.Id); 91 Assert.Equal("test.msi", msiSymbol.Id.Id);
92 92
93 var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath); 93 var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath);
94 extractResult.AssertSuccess(); 94 extractResult.AssertSuccess();
@@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration
111 111
112 var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration"); 112 var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration");
113 var registrationElement = (XmlNode)Assert.Single(registrationElements); 113 var registrationElement = (XmlNode)Assert.Single(registrationElements);
114 Assert.Equal($"<Registration Id='{bundleTuple.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleTuple.BundleId}'>" + 114 Assert.Equal($"<Registration Id='{bundleSymbol.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleId}'>" +
115 "<Arp Register='yes' DisplayName='~TestBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' />" + 115 "<Arp Register='yes' DisplayName='~TestBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' />" +
116 "</Registration>", registrationElement.GetTestXml()); 116 "</Registration>", registrationElement.GetTestXml());
117 } 117 }