languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 16:59:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify ResolutionTest.assertParsedNodeText()

Browse source 
Change-Id: Icdc7f5edd9a133d95083995860732815085471ee
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/345343
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Konstantin Shcheglov 2024-01-08 21:39:52 +00:00 committed by Commit Queue
parent 5391dda614
commit 0a1e59738d
2 changed files with 27 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/analyzer/test/src/dart/analysis/driver_test.dart
View file

@ -2662,7 +2662,7 @@ class A {}
// Pending changes are no applied yes, so `a` is empty.
{
final result = driver.parseFileSync2(a) as ParsedUnitResult;
assertParsedNodeText(result.unit, selfUriStr: '', r'''
assertParsedNodeText(result.unit, r'''
CompilationUnit
''');
}
@ -2687,7 +2687,7 @@ CompilationUnit
// So, now `class A {}` is declared.
{
final result = driver.parseFileSync2(a) as ParsedUnitResult;
assertParsedNodeText(result.unit, selfUriStr: '', r'''
assertParsedNodeText(result.unit, r'''
CompilationUnit
declarations
ClassDeclaration
@ -2734,7 +2734,7 @@ class A {}
final driver = driverFor(testFile);
final result = driver.parseFileSync2(a) as ParsedUnitResult;
assertParsedNodeText(result.unit, selfUriStr: '', r'''
assertParsedNodeText(result.unit, r'''
CompilationUnit
declarations
ClassDeclaration

63
pkg/analyzer/test/src/dart/resolution/resolution.dart
View file

@ -281,19 +281,32 @@ mixin ResolutionTest implements ResourceProviderMixin {
assertErrorsInResult(const []);
}
void assertParsedNodeText(
AstNode node,
String expected, {
String? selfUriStr,
bool skipArgumentList = false,
}) {
var actual = _parsedNodeText(
node,
selfUriStr: selfUriStr,
skipArgumentList: skipArgumentList,
void assertParsedNodeText(AstNode node, String expected) {
final buffer = StringBuffer();
final sink = TreeStringSink(
sink: buffer,
indent: '',
);
final elementPrinter = ElementPrinter(
sink: sink,
configuration: ElementPrinterConfiguration(),
selfUriStr: null,
);
node.accept(
ResolvedAstPrinter(
sink: sink,
elementPrinter: elementPrinter,
configuration: ResolvedNodeTextConfiguration(),
withResolution: false,
),
);
final actual = buffer.toString();
if (actual != expected) {
print(actual);
print('-------- Actual --------');
print('$actual------------------------');
NodeTextExpectationsCollector.add(actual);
}
expect(actual, expected);
@ -543,34 +556,6 @@ mixin ResolutionTest implements ResourceProviderMixin {
}
}
String _parsedNodeText(
AstNode node, {
String? selfUriStr,
bool skipArgumentList = false,
}) {
selfUriStr ??= '${result.libraryElement.source.uri}';
final buffer = StringBuffer();
final sink = TreeStringSink(
sink: buffer,
indent: '',
);
final elementPrinter = ElementPrinter(
sink: sink,
configuration: ElementPrinterConfiguration(),
selfUriStr: selfUriStr,
);
node.accept(
ResolvedAstPrinter(
sink: sink,
elementPrinter: elementPrinter,
configuration: ResolvedNodeTextConfiguration()
..skipArgumentList = skipArgumentList,
withResolution: false,
),
);
return buffer.toString();
}
String _resolvedNodeText(AstNode node) {
final buffer = StringBuffer();
final sink = TreeStringSink(