diff options
Diffstat (limited to 'src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs')
-rw-r--r-- | src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs b/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs index 063554db..6f233509 100644 --- a/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs | |||
@@ -45,10 +45,50 @@ namespace WixToolsetTest.Converters | |||
45 | var converter = new WixConverter(messaging, 2, null, null); | 45 | var converter = new WixConverter(messaging, 2, null, null); |
46 | 46 | ||
47 | var errors = converter.ConvertDocument(document); | 47 | var errors = converter.ConvertDocument(document); |
48 | |||
49 | var actualLines = UnformattedDocumentLines(document); | ||
50 | WixAssert.CompareLineByLine(expected, actualLines); | ||
48 | Assert.Equal(3, errors); | 51 | Assert.Equal(3, errors); |
52 | } | ||
53 | |||
54 | [Fact] | ||
55 | public void RemoveTargetDirRef() | ||
56 | { | ||
57 | var parse = String.Join(Environment.NewLine, | ||
58 | "<?xml version=\"1.0\" encoding=\"utf-16\"?>", | ||
59 | "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>", | ||
60 | " <Fragment>", | ||
61 | " <DirectoryRef Id='TARGETDIR'>", | ||
62 | " <!-- Comment -->", | ||
63 | " <Directory Id='RootFolder' Name='Root'>", | ||
64 | " <Directory Id='ChildFolder' Name='Child' />", | ||
65 | " </Directory>", | ||
66 | " </DirectoryRef>", | ||
67 | " </Fragment>", | ||
68 | "</Wix>"); | ||
69 | |||
70 | var expected = new[] | ||
71 | { | ||
72 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", | ||
73 | " <Fragment>", | ||
74 | " <!-- Comment -->", | ||
75 | " <Directory Id=\"RootFolder\" Name=\"Root\">", | ||
76 | " <Directory Id=\"ChildFolder\" Name=\"Child\" />", | ||
77 | " </Directory>", | ||
78 | " </Fragment>", | ||
79 | "</Wix>" | ||
80 | }; | ||
81 | |||
82 | var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); | ||
83 | |||
84 | var messaging = new MockMessaging(); | ||
85 | var converter = new WixConverter(messaging, 2, null, null); | ||
86 | |||
87 | var errors = converter.ConvertDocument(document); | ||
49 | 88 | ||
50 | var actualLines = UnformattedDocumentLines(document); | 89 | var actualLines = UnformattedDocumentLines(document); |
51 | WixAssert.CompareLineByLine(expected, actualLines); | 90 | WixAssert.CompareLineByLine(expected, actualLines); |
91 | Assert.Equal(3, errors); | ||
52 | } | 92 | } |
53 | 93 | ||
54 | [Fact] | 94 | [Fact] |
@@ -83,10 +123,48 @@ namespace WixToolsetTest.Converters | |||
83 | var converter = new WixConverter(messaging, 2, null, null); | 123 | var converter = new WixConverter(messaging, 2, null, null); |
84 | 124 | ||
85 | var errors = converter.ConvertDocument(document); | 125 | var errors = converter.ConvertDocument(document); |
126 | |||
127 | var actualLines = UnformattedDocumentLines(document); | ||
128 | WixAssert.CompareLineByLine(expected, actualLines); | ||
86 | Assert.Equal(4, errors); | 129 | Assert.Equal(4, errors); |
130 | } | ||
131 | |||
132 | [Fact] | ||
133 | public void RemoveTargetDirRefAndFixStandardDirectory() | ||
134 | { | ||
135 | var parse = String.Join(Environment.NewLine, | ||
136 | "<?xml version=\"1.0\" encoding=\"utf-16\"?>", | ||
137 | "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>", | ||
138 | " <Fragment>", | ||
139 | " <DirectoryRef Id='TARGETDIR'>", | ||
140 | " <Directory Id='ProgramFilesFolder' Name='PFiles'>", | ||
141 | " <Directory Id='ChildFolder' Name='Child' />", | ||
142 | " </Directory>", | ||
143 | " </DirectoryRef>", | ||
144 | " </Fragment>", | ||
145 | "</Wix>"); | ||
146 | |||
147 | var expected = new[] | ||
148 | { | ||
149 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", | ||
150 | " <Fragment>", | ||
151 | " <StandardDirectory Id=\"ProgramFilesFolder\">", | ||
152 | " <Directory Id=\"ChildFolder\" Name=\"Child\" />", | ||
153 | " </StandardDirectory>", | ||
154 | " </Fragment>", | ||
155 | "</Wix>" | ||
156 | }; | ||
157 | |||
158 | var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); | ||
159 | |||
160 | var messaging = new MockMessaging(); | ||
161 | var converter = new WixConverter(messaging, 2, null, null); | ||
162 | |||
163 | var errors = converter.ConvertDocument(document); | ||
87 | 164 | ||
88 | var actualLines = UnformattedDocumentLines(document); | 165 | var actualLines = UnformattedDocumentLines(document); |
89 | WixAssert.CompareLineByLine(expected, actualLines); | 166 | WixAssert.CompareLineByLine(expected, actualLines); |
167 | Assert.Equal(4, errors); | ||
90 | } | 168 | } |
91 | } | 169 | } |
92 | } | 170 | } |