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

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

Issue 1762663002: Add support for ConstructorElementImpl.isCycleFree to summaries. (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 e163d04138039b2c8e5e67bf263e85f8428b9f24..574cf7a2a3e7d15f7bab6d60b112d97bd89cf8fc 100644
--- a/pkg/analyzer/test/src/summary/resynthesize_test.dart
+++ b/pkg/analyzer/test/src/summary/resynthesize_test.dart
@@ -39,12 +39,6 @@ class ResynthTest extends ResolverTestCase {
Set<Source> otherLibrarySources = new Set<Source>();
bool constantInitializersAreInvalid = false;
- /**
- * Determine the analysis options that should be used for this test.
- */
- AnalysisOptionsImpl createOptions() =>
- new AnalysisOptionsImpl()..enableGenericMethods = true;
-
void addLibrary(String uri) {
otherLibrarySources.add(analysisContext2.sourceFactory.forUri(uri));
}
@@ -458,7 +452,12 @@ class ResynthTest extends ResolverTestCase {
ConstructorName rConstructor = r.constructorName;
expect(oConstructor, isNotNull, reason: desc);
expect(rConstructor, isNotNull, reason: desc);
- compareConstructorElements(
+ // Note: just compare rConstructor.staticElement and
+ // oConstructor.staticElement as elements, because we just want to
+ // check that they're pointing to the correct elements; we don't want
+ // to check that their constructor initializers match, because that
+ // could lead to infinite regress.
+ compareElements(
rConstructor.staticElement, oConstructor.staticElement, desc);
TypeName oType = oConstructor.type;
TypeName rType = rConstructor.type;
@@ -517,10 +516,10 @@ class ResynthTest extends ResolverTestCase {
return;
}
compareExecutableElements(resynthesized, original, desc);
+ ConstructorElementImpl resynthesizedImpl =
+ getActualElement(resynthesized, desc);
+ ConstructorElementImpl originalImpl = getActualElement(original, desc);
if (original.isConst) {
- ConstructorElementImpl resynthesizedImpl =
- getActualElement(resynthesized, desc);
- ConstructorElementImpl originalImpl = getActualElement(original, desc);
compareConstAstLists(resynthesizedImpl.constantInitializers,
originalImpl.constantInitializers, desc);
}
@@ -533,6 +532,8 @@ class ResynthTest extends ResolverTestCase {
checkPossibleMember(resynthesized, original, desc);
expect(resynthesized.nameEnd, original.nameEnd, reason: desc);
expect(resynthesized.periodOffset, original.periodOffset, reason: desc);
+ expect(resynthesizedImpl.isCycleFree, originalImpl.isCycleFree,
+ reason: desc);
}
void compareConstValues(
@@ -1031,6 +1032,12 @@ class ResynthTest extends ResolverTestCase {
}
/**
+ * Determine the analysis options that should be used for this test.
+ */
+ AnalysisOptionsImpl createOptions() =>
+ new AnalysisOptionsImpl()..enableGenericMethods = true;
+
+ /**
* Serialize the given [library] into a summary. Then create a
* [_TestSummaryResynthesizer] which can deserialize it, along with any
* references it makes to `dart:core`.
@@ -2513,6 +2520,32 @@ class C<T> {
''');
}
+ test_constructor_withCycles_const() {
+ checkLibrary('''
+class C {
+ final x;
+ const C() : x = const D();
+}
+class D {
+ final x;
+ const D() : x = const C();
+}
+''');
+ }
+
+ test_constructor_withCycles_nonConst() {
+ checkLibrary('''
+class C {
+ final x;
+ C() : x = new D();
+}
+class D {
+ final x;
+ D() : x = new C();
+}
+''');
+ }
+
test_core() {
if (createOptions().strongMode) {
// The fake `dart:core` library is always in spec mode, so don't bother
« no previous file with comments | « pkg/analyzer/lib/src/summary/summarize_elements.dart ('k') | pkg/analyzer/test/src/summary/summary_common.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698