@@ -26,7 +26,8 @@ void main() {
2626 await testBuilder (builder, srcs,
2727 generateFor: new Set .from (['$pkgName |lib/test_lib.dart' ]),
2828 outputs: {
29- '$pkgName |lib/test_lib.g.dart' : contains ('not valid code!' ),
29+ '$pkgName |lib/test_lib.g.dart' :
30+ decodedMatches (contains ('not valid code!' )),
3031 });
3132 });
3233
@@ -48,7 +49,7 @@ void main() {
4849 generateFor: new Set .from (['$pkgName |lib/test_lib.dart' ]),
4950 outputs: {
5051 '$pkgName |lib/test_lib.g.dart' :
51- startsWith (_customHeader + '\n\n // ***' )
52+ decodedMatches ( startsWith (_customHeader + '\n\n // ***' ) )
5253 });
5354 });
5455
@@ -57,7 +58,9 @@ void main() {
5758 var builder = new LibraryBuilder (const CommentGenerator (), header: '' );
5859 await testBuilder (builder, srcs,
5960 generateFor: new Set .from (['$pkgName |lib/test_lib.dart' ]),
60- outputs: {'$pkgName |lib/test_lib.g.dart' : startsWith ('// ***' )});
61+ outputs: {
62+ '$pkgName |lib/test_lib.g.dart' : decodedMatches (startsWith ('// ***' ))
63+ });
6164 });
6265
6366 test ('Expect no error when multiple generators used on nonstandalone builder' ,
@@ -142,7 +145,7 @@ void main() {
142145 generateFor: new Set .from (['$pkgName |lib/a.dart' ]),
143146 outputs: {
144147 '$pkgName |lib/a.g.dart' :
145- contains (UnformattedCodeGenerator .formattedCode),
148+ decodedMatches ( contains (UnformattedCodeGenerator .formattedCode) ),
146149 });
147150 });
148151
@@ -153,7 +156,8 @@ void main() {
153156 {'$pkgName |lib/a.dart' : 'library a; part "a.part.dart";' },
154157 generateFor: new Set .from (['$pkgName |lib/a.dart' ]),
155158 outputs: {
156- '$pkgName |lib/a.g.dart' : startsWith (_customHeader + '\n part of' ),
159+ '$pkgName |lib/a.g.dart' :
160+ decodedMatches (startsWith (_customHeader + '\n part of' )),
157161 });
158162 });
159163
@@ -163,7 +167,7 @@ void main() {
163167 {'$pkgName |lib/a.dart' : 'library a; part "a.part.dart";' },
164168 generateFor: new Set .from (['$pkgName |lib/a.dart' ]),
165169 outputs: {
166- '$pkgName |lib/a.g.dart' : startsWith ('part of' ),
170+ '$pkgName |lib/a.g.dart' : decodedMatches ( startsWith ('part of' ) ),
167171 });
168172 });
169173
@@ -174,8 +178,8 @@ void main() {
174178 {'$pkgName |lib/a.dart' : 'library a; part "a.part.dart";' },
175179 generateFor: new Set .from (['$pkgName |lib/a.dart' ]),
176180 outputs: {
177- '$pkgName |lib/a.g.dart' :
178- contains (UnformattedCodeGenerator .unformattedCode),
181+ '$pkgName |lib/a.g.dart' : decodedMatches (
182+ contains (UnformattedCodeGenerator .unformattedCode)) ,
179183 });
180184 });
181185
@@ -187,7 +191,7 @@ void main() {
187191 {'$pkgName |lib/a.dart' : 'library a; part "a.part.dart";' },
188192 generateFor: new Set .from (['$pkgName |lib/a.dart' ]),
189193 outputs: {
190- '$pkgName |lib/a.g.dart' : contains (customOutput),
194+ '$pkgName |lib/a.g.dart' : decodedMatches ( contains (customOutput) ),
191195 });
192196 });
193197
@@ -209,7 +213,7 @@ Future _generateTest(CommentGenerator gen, String expectedContent) async {
209213 await testBuilder (builder, srcs,
210214 generateFor: new Set .from (['$pkgName |lib/test_lib.dart' ]),
211215 outputs: {
212- '$pkgName |lib/test_lib.g.dart' : expectedContent,
216+ '$pkgName |lib/test_lib.g.dart' : decodedMatches ( expectedContent) ,
213217 },
214218 onLog: (log) => fail ('Unexpected log message: ${log .message }' ));
215219}
0 commit comments