aboutsummaryrefslogtreecommitdiff
path: root/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs')
-rw-r--r--src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index 184b291b..484e5dc1 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -182,8 +182,8 @@ namespace WixToolsetTest.CoreIntegration
182 var section = intermediate.Sections.Single(); 182 var section = intermediate.Sections.Single();
183 183
184 var wixFile = section.Symbols.OfType<FileSymbol>().First(); 184 var wixFile = section.Symbols.OfType<FileSymbol>().First();
185 Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path); 185 WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path);
186 Assert.Equal(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path); 186 WixAssert.StringEqual(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path);
187 } 187 }
188 } 188 }
189 189
@@ -240,7 +240,7 @@ namespace WixToolsetTest.CoreIntegration
240 var section = intermediate.Sections.Single(); 240 var section = intermediate.Sections.Single();
241 241
242 var wixFile = section.Symbols.OfType<BinarySymbol>().First(); 242 var wixFile = section.Symbols.OfType<BinarySymbol>().First();
243 Assert.Equal(Path.Combine(folder, @"data\test2.txt"), wixFile.Data.Path); 243 WixAssert.StringEqual(Path.Combine(folder, @"data\test2.txt"), wixFile.Data.Path);
244 } 244 }
245 } 245 }
246 246
@@ -284,12 +284,12 @@ namespace WixToolsetTest.CoreIntegration
284 var section = intermediate.Sections.Single(); 284 var section = intermediate.Sections.Single();
285 285
286 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); 286 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
287 Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); 287 WixAssert.StringEqual(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
288 Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); 288 WixAssert.StringEqual(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
289 289
290 var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single(); 290 var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single();
291 Assert.Equal("Foo", example.Id?.Id); 291 WixAssert.StringEqual("Foo", example.Id?.Id);
292 Assert.Equal("Bar", example[1].AsString()); 292 WixAssert.StringEqual("Bar", example[1].AsString());
293 } 293 }
294 } 294 }
295 295
@@ -345,13 +345,13 @@ namespace WixToolsetTest.CoreIntegration
345 var section = intermediate.Sections.Single(); 345 var section = intermediate.Sections.Single();
346 346
347 var fileSymbols = section.Symbols.OfType<FileSymbol>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray(); 347 var fileSymbols = section.Symbols.OfType<FileSymbol>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray();
348 Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path); 348 WixAssert.StringEqual(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path);
349 Assert.Equal(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path); 349 WixAssert.StringEqual(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path);
350 Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path); 350 WixAssert.StringEqual(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path);
351 Assert.Equal(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path); 351 WixAssert.StringEqual(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path);
352 352
353 var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray(); 353 var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray();
354 WixAssert.CompareLineByLine(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); 354 WixAssert.CompareLineByLine(new[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray());
355 WixAssert.CompareLineByLine(new[] { "filF5_pLhBuF5b4N9XEo52g_hUM5Lo", "filvxdStJhRE_M5kbpLsTZJXbs34Sg" }, examples.Select(t => t[0].AsString()).ToArray()); 355 WixAssert.CompareLineByLine(new[] { "filF5_pLhBuF5b4N9XEo52g_hUM5Lo", "filvxdStJhRE_M5kbpLsTZJXbs34Sg" }, examples.Select(t => t[0].AsString()).ToArray());
356 WixAssert.CompareLineByLine(new[] { "Bar", "Value" }, examples.Select(t => t[1].AsString()).ToArray()); 356 WixAssert.CompareLineByLine(new[] { "Bar", "Value" }, examples.Select(t => t[1].AsString()).ToArray());
357 } 357 }