diff options
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs index 2d6e4802..56f8ba82 100644 --- a/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs | |||
| @@ -7,6 +7,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 7 | using WixBuildTools.TestSupport; | 7 | using WixBuildTools.TestSupport; |
| 8 | using WixToolset.Core.TestPackage; | 8 | using WixToolset.Core.TestPackage; |
| 9 | using WixToolset.Data; | 9 | using WixToolset.Data; |
| 10 | using WixToolset.Data.WindowsInstaller; | ||
| 10 | using Xunit; | 11 | using Xunit; |
| 11 | 12 | ||
| 12 | public class DirectoryFixture | 13 | public class DirectoryFixture |
| @@ -40,11 +41,11 @@ namespace WixToolsetTest.CoreIntegration | |||
| 40 | var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList(); | 41 | var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList(); |
| 41 | Assert.Equal(new[] | 42 | Assert.Equal(new[] |
| 42 | { | 43 | { |
| 43 | "INSTALLFOLDER", | 44 | "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage", |
| 44 | "ProgramFiles6432Folder", | 45 | "ProgramFiles6432Folder:ProgramFilesFolder:.", |
| 45 | "ProgramFilesFolder", | 46 | "ProgramFilesFolder:TARGETDIR:PFiles", |
| 46 | "TARGETDIR" | 47 | "TARGETDIR::SourceDir" |
| 47 | }, dirSymbols.Select(d => d.Id.Id).ToArray()); | 48 | }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray()); |
| 48 | } | 49 | } |
| 49 | } | 50 | } |
| 50 | 51 | ||
| @@ -78,11 +79,11 @@ namespace WixToolsetTest.CoreIntegration | |||
| 78 | var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList(); | 79 | var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList(); |
| 79 | Assert.Equal(new[] | 80 | Assert.Equal(new[] |
| 80 | { | 81 | { |
| 81 | "INSTALLFOLDER", | 82 | "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage", |
| 82 | "ProgramFiles6432Folder", | 83 | "ProgramFiles6432Folder:ProgramFiles64Folder:.", |
| 83 | "ProgramFiles64Folder", | 84 | "ProgramFiles64Folder:TARGETDIR:PFiles64", |
| 84 | "TARGETDIR" | 85 | "TARGETDIR::SourceDir" |
| 85 | }, dirSymbols.Select(d => d.Id.Id).ToArray()); | 86 | }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray()); |
| 86 | } | 87 | } |
| 87 | } | 88 | } |
| 88 | 89 | ||
| @@ -116,12 +117,14 @@ namespace WixToolsetTest.CoreIntegration | |||
| 116 | var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList(); | 117 | var dirSymbols = section.Symbols.OfType<WixToolset.Data.Symbols.DirectorySymbol>().ToList(); |
| 117 | Assert.Equal(new[] | 118 | Assert.Equal(new[] |
| 118 | { | 119 | { |
| 119 | "dirZsSsu81KcG46xXTwc4mTSZO5Zx4", | 120 | "dZsSsu81KcG46xXTwc4mTSZO5Zx4:INSTALLFOLDER:dupe", |
| 120 | "INSTALLFOLDER", | 121 | "INSTALLFOLDER:ProgramFiles6432Folder:MsiPackage", |
| 121 | "ProgramFiles6432Folder", | 122 | "ProgramFiles6432Folder:ProgramFiles64Folder:.", |
| 122 | "ProgramFiles64Folder", | 123 | "ProgramFiles64Folder:TARGETDIR:PFiles64", |
| 123 | "TARGETDIR" | 124 | "TARGETDIR::SourceDir" |
| 124 | }, dirSymbols.Select(d => d.Id.Id).ToArray()); | 125 | }, dirSymbols.OrderBy(d => d.Id.Id).Select(d => d.Id.Id + ":" + d.ParentDirectoryRef + ":" + d.Name).ToArray()); |
| 126 | } | ||
| 127 | } | ||
| 125 | } | 128 | } |
| 126 | } | 129 | } |
| 127 | } | 130 | } |