aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-05-23 15:37:56 -0700
committerRob Mensching <rob@firegiant.com>2019-05-23 16:02:37 -0700
commit354f6d5b79404544cb7c0e11a0d9212b4780ce09 (patch)
tree1082ce6dd66604f7da315d6a15c85ac3f56b745a /src/test
parent3051bf2fc300df125115c9538a0bfc8256bfde6a (diff)
downloadwix-354f6d5b79404544cb7c0e11a0d9212b4780ce09.tar.gz
wix-354f6d5b79404544cb7c0e11a0d9212b4780ce09.tar.bz2
wix-354f6d5b79404544cb7c0e11a0d9212b4780ce09.zip
Integrate latest Data changes for FileTuple and AssemblyTuple
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs6
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs36
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs18
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs22
4 files changed, 41 insertions, 41 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
index 37ff1839..27256d41 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -58,9 +58,9 @@ namespace WixToolsetTest.CoreIntegration
58 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir")); 58 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir"));
59 var section = intermediate.Sections.Single(); 59 var section = intermediate.Sections.Single();
60 60
61 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 61 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
62 Assert.Equal(Path.Combine(folder, @"data\example.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 62 Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
63 Assert.Equal(@"example.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 63 Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
64 64
65 var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); 65 var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single();
66 Assert.Equal("Foo", example.Id.Id); 66 Assert.Equal("Foo", example.Id.Id);
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index a329c16a..e30441bf 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -43,9 +43,9 @@ namespace WixToolsetTest.CoreIntegration
43 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 43 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
44 var section = intermediate.Sections.Single(); 44 var section = intermediate.Sections.Single();
45 45
46 var wixFile = section.Tuples.OfType<WixFileTuple>().First(); 46 var fileTuple = section.Tuples.OfType<FileTuple>().First();
47 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 47 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
48 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 48 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
49 } 49 }
50 } 50 }
51 51
@@ -78,9 +78,9 @@ namespace WixToolsetTest.CoreIntegration
78 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 78 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
79 var section = intermediate.Sections.Single(); 79 var section = intermediate.Sections.Single();
80 80
81 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 81 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
82 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 82 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
83 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 83 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
84 } 84 }
85 } 85 }
86 86
@@ -309,9 +309,9 @@ namespace WixToolsetTest.CoreIntegration
309 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 309 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
310 var section = intermediate.Sections.Single(); 310 var section = intermediate.Sections.Single();
311 311
312 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 312 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
313 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 313 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
314 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 314 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
315 } 315 }
316 } 316 }
317 317
@@ -344,9 +344,9 @@ namespace WixToolsetTest.CoreIntegration
344 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 344 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
345 var section = intermediate.Sections.Single(); 345 var section = intermediate.Sections.Single();
346 346
347 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 347 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
348 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 348 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
349 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 349 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
350 } 350 }
351 } 351 }
352 352
@@ -444,9 +444,9 @@ namespace WixToolsetTest.CoreIntegration
444 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 444 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
445 var section = intermediate.Sections.Single(); 445 var section = intermediate.Sections.Single();
446 446
447 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 447 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
448 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 448 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
449 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 449 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
450 } 450 }
451 } 451 }
452 452
@@ -480,9 +480,9 @@ namespace WixToolsetTest.CoreIntegration
480 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 480 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
481 var section = intermediate.Sections.Single(); 481 var section = intermediate.Sections.Single();
482 482
483 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 483 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
484 Assert.Equal(Path.Combine(folder, @"data\candle.exe"), wixFile[WixFileTupleFields.Source].AsPath().Path); 484 Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileTuple[FileTupleFields.Source].AsPath().Path);
485 Assert.Equal(@"candle.exe", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 485 Assert.Equal(@"candle.exe", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
486 486
487 var msiAssemblyNameTuples = section.Tuples.OfType<MsiAssemblyNameTuple>(); 487 var msiAssemblyNameTuples = section.Tuples.OfType<MsiAssemblyNameTuple>();
488 Assert.Equal(new[] 488 Assert.Equal(new[]
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
index d915d02b..dd730501 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
@@ -50,9 +50,9 @@ namespace WixToolsetTest.CoreIntegration
50 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir")); 50 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir"));
51 var section = intermediate.Sections.Single(); 51 var section = intermediate.Sections.Single();
52 52
53 var wixFile = section.Tuples.OfType<WixFileTuple>().First(); 53 var fileTuple = section.Tuples.OfType<FileTuple>().First();
54 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 54 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
55 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 55 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
56 } 56 }
57 } 57 }
58 58
@@ -120,9 +120,9 @@ namespace WixToolsetTest.CoreIntegration
120 var section = intermediate.Sections.Single(); 120 var section = intermediate.Sections.Single();
121 121
122 { 122 {
123 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 123 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
124 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 124 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
125 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 125 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
126 } 126 }
127 127
128 { 128 {
@@ -175,9 +175,9 @@ namespace WixToolsetTest.CoreIntegration
175 var section = intermediate.Sections.Single(); 175 var section = intermediate.Sections.Single();
176 176
177 { 177 {
178 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 178 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
179 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 179 Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
180 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 180 Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
181 } 181 }
182 182
183 { 183 {
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index 07044a1f..77daab06 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -50,9 +50,9 @@ namespace WixToolsetTest.CoreIntegration
50 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir")); 50 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir"));
51 var section = intermediate.Sections.Single(); 51 var section = intermediate.Sections.Single();
52 52
53 var wixFile = section.Tuples.OfType<WixFileTuple>().First(); 53 var wixFile = section.Tuples.OfType<FileTuple>().First();
54 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 54 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileTupleFields.Source].AsPath().Path);
55 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 55 Assert.Equal(@"test.txt", wixFile[FileTupleFields.Source].PreviousValue.AsPath().Path);
56 } 56 }
57 } 57 }
58 58
@@ -95,9 +95,9 @@ namespace WixToolsetTest.CoreIntegration
95 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 95 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
96 var section = intermediate.Sections.Single(); 96 var section = intermediate.Sections.Single();
97 97
98 var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); 98 var fileTuple = section.Tuples.OfType<FileTuple>().Single();
99 Assert.Equal(Path.Combine(folder, @"data\example.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); 99 Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
100 Assert.Equal(@"example.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); 100 Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
101 101
102 var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); 102 var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single();
103 Assert.Equal("Foo", example.Id.Id); 103 Assert.Equal("Foo", example.Id.Id);
@@ -157,11 +157,11 @@ namespace WixToolsetTest.CoreIntegration
157 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); 157 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
158 var section = intermediate.Sections.Single(); 158 var section = intermediate.Sections.Single();
159 159
160 var wixFiles = section.Tuples.OfType<WixFileTuple>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray(); 160 var fileTuples = section.Tuples.OfType<FileTuple>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray();
161 Assert.Equal(Path.Combine(folder, @"data\example.txt"), wixFiles[0][WixFileTupleFields.Source].AsPath().Path); 161 Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuples[0][FileTupleFields.Source].AsPath().Path);
162 Assert.Equal(@"example.txt", wixFiles[0][WixFileTupleFields.Source].PreviousValue.AsPath().Path); 162 Assert.Equal(@"example.txt", fileTuples[0][FileTupleFields.Source].PreviousValue.AsPath().Path);
163 Assert.Equal(Path.Combine(folder, @"data\other.txt"), wixFiles[1][WixFileTupleFields.Source].AsPath().Path); 163 Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileTuples[1][FileTupleFields.Source].AsPath().Path);
164 Assert.Equal(@"other.txt", wixFiles[1][WixFileTupleFields.Source].PreviousValue.AsPath().Path); 164 Assert.Equal(@"other.txt", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path);
165 165
166 var examples = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).ToArray(); 166 var examples = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).ToArray();
167 Assert.Equal(new[] { "Foo", "Other" }, examples.Select(t => t.Id.Id).ToArray()); 167 Assert.Equal(new[] { "Foo", "Other" }, examples.Select(t => t.Id.Id).ToArray());
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 12:22:20 +0000