Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

Unified Diff: pkg/analyzer/test/src/summary/resynthesize_test.dart

Issue 1683813005: Fix summarization of generic redirecting constructors (again). (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analyzer/test/src/summary/resynthesize_test.dart
diff --git a/pkg/analyzer/test/src/summary/resynthesize_test.dart b/pkg/analyzer/test/src/summary/resynthesize_test.dart
index 521284d2ecc12bb54cc551d233636af9cfdadf07..f30b3f68db69409ccc8c96030289cbbec04c854e 100644
--- a/pkg/analyzer/test/src/summary/resynthesize_test.dart
+++ b/pkg/analyzer/test/src/summary/resynthesize_test.dart
@@ -425,18 +425,46 @@ class ResynthTest extends ResolverTestCase {
}
}
- void compareConstructorElements(ConstructorElementImpl resynthesized,
- ConstructorElementImpl original, String desc) {
+ void compareConstructorElements(ConstructorElement resynthesized,
+ ConstructorElement original, String desc) {
compareExecutableElements(resynthesized, original, desc);
if (original.isConst) {
- compareConstAstLists(resynthesized.constantInitializers,
- original.constantInitializers, desc);
+ ConstructorElementImpl resynthesizedImpl =
+ getActualElement(resynthesized, desc);
+ ConstructorElementImpl originalImpl = getActualElement(original, desc);
+ compareConstAstLists(resynthesizedImpl.constantInitializers,
+ originalImpl.constantInitializers, desc);
}
if (original.redirectedConstructor == null) {
expect(resynthesized.redirectedConstructor, isNull, reason: desc);
} else {
- compareElements(resynthesized.redirectedConstructor,
- original.redirectedConstructor, desc);
+ compareConstructorElements(resynthesized.redirectedConstructor,
+ original.redirectedConstructor, '$desc redirectedConstructor');
+ }
+ ConstructorElement resynthesizedNonHandle =
+ resynthesized is ConstructorElementHandle
+ ? resynthesized.actualElement
+ : resynthesized;
+ if (original is ConstructorMember) {
+ expect(resynthesizedNonHandle, new isInstanceOf<ConstructorMember>(),
+ reason: desc);
+ if (resynthesizedNonHandle is ConstructorMember) {
+ List<DartType> resynthesizedTypeArguments =
+ resynthesizedNonHandle.definingType.typeArguments;
+ List<DartType> originalTypeArguments =
+ original.definingType.typeArguments;
+ expect(
+ resynthesizedTypeArguments, hasLength(originalTypeArguments.length),
+ reason: desc);
+ for (int i = 0; i < originalTypeArguments.length; i++) {
+ compareTypeImpls(resynthesizedTypeArguments[i],
+ originalTypeArguments[i], '$desc type argument $i');
+ }
+ }
+ } else {
+ expect(
+ resynthesizedNonHandle, isNot(new isInstanceOf<ConstructorMember>()),
+ reason: desc);
}
}

Powered by Google App Engine
This is Rietveld 408576698