pkg/analyzer/test/generated/engine_test.dart - Issue 725143004: Format and sort analyzer and analysis_server packages.

Unified Diff: pkg/analyzer/test/generated/engine_test.dart

Issue 725143004: Format and sort analyzer and analysis_server packages. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 1 month 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/generated/engine_test.dart

diff --git a/pkg/analyzer/test/generated/engine_test.dart b/pkg/analyzer/test/generated/engine_test.dart

index 1363afb892d1139637745579bea42e8849e02fce..04fc0d2c77002e8c223b0d0bb760255e5aad9e55 100644

--- a/pkg/analyzer/test/generated/engine_test.dart

+++ b/pkg/analyzer/test/generated/engine_test.dart

@@ -31,10 +31,10 @@ import 'package:analyzer/src/task/task_dart.dart';

import 'package:typed_mock/typed_mock.dart';

import 'package:unittest/unittest.dart';

+import '../reflective_tests.dart';

import 'all_the_rest.dart';

import 'resolver_test.dart';

import 'test_support.dart';

-import '../reflective_tests.dart';

main() {

@@ -166,24 +166,37 @@ class AnalysisContextImplTest extends EngineTestCase {

}

void fail_performAnalysisTask_importedLibraryDelete_html() {

- Source htmlSource = _addSource(

- "/page.html",

- r'''

+ Source htmlSource = _addSource("/page.html", r'''

import 'libB.dart';

main() {print('hello dart');}

</script></body></html>''');

Source libBSource = _addSource("/libB.dart", "library libB;");

_analyzeAll_assertFinished();

- expect(_context.getResolvedHtmlUnit(htmlSource), isNotNull, reason: "htmlUnit resolved 1");

- expect(_context.getResolvedCompilationUnit2(libBSource, libBSource), isNotNull, reason: "libB resolved 1");

- expect(!_hasAnalysisErrorWithErrorSeverity(_context.getErrors(htmlSource)), isTrue, reason: "htmlSource doesn't have errors");

+ expect(

+ _context.getResolvedHtmlUnit(htmlSource),

+ isNotNull,

+ reason: "htmlUnit resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(libBSource, libBSource),

+ isNotNull,

+ reason: "libB resolved 1");

+ expect(

+ !_hasAnalysisErrorWithErrorSeverity(_context.getErrors(htmlSource)),

+ isTrue,

+ reason: "htmlSource doesn't have errors");

// remove libB.dart content and analyze

_context.setContents(libBSource, null);

_analyzeAll_assertFinished();

- expect(_context.getResolvedHtmlUnit(htmlSource), isNotNull, reason: "htmlUnit resolved 1");

+ expect(

+ _context.getResolvedHtmlUnit(htmlSource),

+ isNotNull,

+ reason: "htmlUnit resolved 1");

AnalysisErrorInfo errors = _context.getErrors(htmlSource);

- expect(_hasAnalysisErrorWithErrorSeverity(errors), isTrue, reason: "htmlSource has an error");

+ expect(

+ _hasAnalysisErrorWithErrorSeverity(errors),

+ isTrue,

+ reason: "htmlSource has an error");

}

void fail_recordLibraryElements() {

@@ -220,15 +233,11 @@ class AnalysisContextImplTest extends EngineTestCase {

void test_applyChanges_change_flush_element() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source librarySource = _addSource(

- "/lib.dart",

- r'''

+ Source librarySource = _addSource("/lib.dart", r'''

library lib;

int a = 0;''');

expect(_context.computeLibraryElement(librarySource), isNotNull);

- _context.setContents(

- librarySource,

- r'''

+ _context.setContents(librarySource, r'''

library lib;

int aa = 0;''');

expect(_context.getLibraryElement(librarySource), isNull);

@@ -237,27 +246,19 @@ int aa = 0;''');

void test_applyChanges_change_multiple() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source librarySource = _addSource(

- "/lib.dart",

- r'''

+ Source librarySource = _addSource("/lib.dart", r'''

library lib;

part 'part.dart';

int a = 0;''');

- Source partSource = _addSource(

- "/part.dart",

- r'''

+ Source partSource = _addSource("/part.dart", r'''

part of lib;

int b = a;''');

_context.computeLibraryElement(librarySource);

- _context.setContents(

- librarySource,

- r'''

+ _context.setContents(librarySource, r'''

library lib;

part 'part.dart';

int aa = 0;''');

- _context.setContents(

- partSource,

- r'''

+ _context.setContents(partSource, r'''

part of lib;

int b = aa;''');

_context.computeLibraryElement(librarySource);

@@ -272,7 +273,9 @@ int b = aa;''');

partUnit.declarations[0] as TopLevelVariableDeclaration;

Element useElement =

(use.variables.variables[0].initializer as SimpleIdentifier).staticElement;

- expect((useElement as PropertyAccessorElement).variable, same(declarationElement));

+ expect(

+ (useElement as PropertyAccessorElement).variable,

+ same(declarationElement));

}

void test_applyChanges_empty() {

@@ -298,13 +301,10 @@ int b = aa;''');

void test_applyChanges_remove() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source libA = _addSource(

- "/libA.dart",

- r'''

+ Source libA = _addSource("/libA.dart", r'''

library libA;

import 'libB.dart';''');

- Source libB =

- _addSource("/libB.dart", "library libB;");

+ Source libB = _addSource("/libB.dart", "library libB;");

LibraryElement libAElement = _context.computeLibraryElement(libA);

List<LibraryElement> importedLibraries = libAElement.importedLibraries;

expect(importedLibraries, hasLength(2));

@@ -324,13 +324,10 @@ import 'libB.dart';''');

void test_applyChanges_removeContainer() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source libA = _addSource(

- "/libA.dart",

- r'''

+ Source libA = _addSource("/libA.dart", r'''

library libA;

import 'libB.dart';''');

- Source libB =

- _addSource("/libB.dart", "library libB;");

+ Source libB = _addSource("/libB.dart", "library libB;");

_context.computeLibraryElement(libA);

_context.computeErrors(libA);

_context.computeErrors(libB);

@@ -348,8 +345,7 @@ import 'libB.dart';''');

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

String comment = "/** Comment */";

- Source source =

- _addSource("/test.dart", """

+ Source source = _addSource("/test.dart", """

$comment

class A {}""");

LibraryElement libraryElement = _context.computeLibraryElement(source);

@@ -362,8 +358,7 @@ class A {}""");

void test_computeDocumentationComment_none() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source source =

- _addSource("/test.dart", "class A {}");

+ Source source = _addSource("/test.dart", "class A {}");

LibraryElement libraryElement = _context.computeLibraryElement(source);

expect(libraryElement, isNotNull);

ClassElement classElement = libraryElement.definingCompilationUnit.types[0];

@@ -499,9 +494,7 @@ class A {}""");

}

void test_computeLineInfo_dart() {

- Source source = _addSource(

- "/test.dart",

- r'''

+ Source source = _addSource("/test.dart", r'''

library lib;

main() {}''');

@@ -510,9 +503,7 @@ main() {}''');

}

void test_computeLineInfo_html() {

- Source source = _addSource(

- "/test.html",

- r'''

+ Source source = _addSource("/test.html", r'''

<html>

<body>

@@ -575,7 +566,9 @@ main() {}''');

}

void test_exists_true() {

- expect(_context.exists(new AnalysisContextImplTest_Source_exists_true()), isTrue);

+ expect(

+ _context.exists(new AnalysisContextImplTest_Source_exists_true()),

+ isTrue);

}

void test_getAnalysisOptions() {

@@ -626,9 +619,7 @@ main() {}''');

}

void test_getElement_constructor_named() {

- Source source = _addSource(

- "/lib.dart",

- r'''

+ Source source = _addSource("/lib.dart", r'''

class A {

A.named() {}

}''');

@@ -642,9 +633,7 @@ class A {

}

void test_getElement_constructor_unnamed() {

- Source source = _addSource(

- "/lib.dart",

- r'''

+ Source source = _addSource("/lib.dart", r'''

class A {

A() {}

}''');

@@ -695,9 +684,7 @@ class A {

}

void test_getErrors_html_some() {

- Source source = _addSource(

- "/test.html",

- r'''

+ Source source = _addSource("/test.html", r'''

</head></html>''');

@@ -727,9 +714,7 @@ class A {

void test_getHtmlFilesReferencing_html() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source htmlSource = _addSource(

- "/test.html",

- r'''

+ Source htmlSource = _addSource("/test.html", r'''

@@ -745,9 +730,7 @@ class A {

}

void test_getHtmlFilesReferencing_library() {

- Source htmlSource = _addSource(

- "/test.html",

- r'''

+ Source htmlSource = _addSource("/test.html", r'''

@@ -764,9 +747,7 @@ class A {

void test_getHtmlFilesReferencing_part() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source htmlSource = _addSource(

- "/test.html",

- r'''

+ Source htmlSource = _addSource("/test.html", r'''

@@ -822,9 +803,7 @@ class A {

_sourceFactory = _context.sourceFactory;

List<Source> sources = _context.launchableClientLibrarySources;

expect(sources, hasLength(0));

- Source source = _addSource(

- "/test.dart",

- r'''

+ Source source = _addSource("/test.dart", r'''

import 'dart:html';

main() {}''');

_context.computeLibraryElement(source);

@@ -846,9 +825,7 @@ main() {}''');

void test_getLibrariesContaining() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source librarySource = _addSource(

- "/lib.dart",

- r'''

+ Source librarySource = _addSource("/lib.dart", r'''

library lib;

part 'part.dart';''');

Source partSource = _addSource("/part.dart", "part of lib;");

@@ -866,15 +843,11 @@ part 'part.dart';''');

_sourceFactory = _context.sourceFactory;

Source libASource = _addSource("/libA.dart", "library libA;");

_addSource("/libB.dart", "library libB;");

- Source lib1Source = _addSource(

- "/lib1.dart",

- r'''

+ Source lib1Source = _addSource("/lib1.dart", r'''

library lib1;

import 'libA.dart';

export 'libB.dart';''');

- Source lib2Source = _addSource(

- "/lib2.dart",

- r'''

+ Source lib2Source = _addSource("/lib2.dart", r'''

library lib2;

import 'libB.dart';

export 'libA.dart';''');

@@ -887,9 +860,7 @@ export 'libA.dart';''');

void test_getLibrariesReferencedFromHtml() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source htmlSource = _addSource(

- "/test.html",

- r'''

+ Source htmlSource = _addSource("/test.html", r'''

@@ -905,9 +876,7 @@ export 'libA.dart';''');

void test_getLibrariesReferencedFromHtml_no() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source htmlSource = _addSource(

- "/test.html",

- r'''

+ Source htmlSource = _addSource("/test.html", r'''

</head></html>''');

@@ -944,9 +913,7 @@ export 'libA.dart';''');

}

void test_getLineInfo() {

- Source source = _addSource(

- "/test.dart",

- r'''

+ Source source = _addSource("/test.dart", r'''

library lib;

main() {}''');

@@ -959,8 +926,10 @@ main() {}''');

void test_getModificationStamp_fromSource() {

int stamp = 42;

- expect(_context.getModificationStamp(

- new AnalysisContextImplTest_Source_getModificationStamp_fromSource(stamp)), stamp);

+ expect(

+ _context.getModificationStamp(

+ new AnalysisContextImplTest_Source_getModificationStamp_fromSource(stamp)),

+ stamp);

}

void test_getModificationStamp_overridden() {

@@ -1060,9 +1029,7 @@ main() {}''');

void test_isClientLibrary_dart() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source source = _addSource(

- "/test.dart",

- r'''

+ Source source = _addSource("/test.dart", r'''

import 'dart:html';

main() {}''');

@@ -1081,9 +1048,7 @@ main() {}''');

void test_isServerLibrary_dart() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source source = _addSource(

- "/test.dart",

- r'''

+ Source source = _addSource("/test.dart", r'''

library lib;

main() {}''');

@@ -1148,14 +1113,10 @@ main() {}''');

}

void test_parseHtmlUnit_resolveDirectives() {

- Source libSource = _addSource(

- "/lib.dart",

- r'''

+ Source libSource = _addSource("/lib.dart", r'''

library lib;

class ClassA {}''');

- Source source = _addSource(

- "/lib.html",

- r'''

+ Source source = _addSource("/lib.html", r'''

<html>

<head>

@@ -1177,33 +1138,14 @@ class ClassA {}''');

expect(importNode.source, libSource);

}

- void test_performAnalysisTask_IOException() {

- TestSource source = _addSourceWithException2("/test.dart", "library test;");

- int oldTimestamp = _context.getModificationStamp(source);

- source.generateExceptionOnRead = false;

- _analyzeAll_assertFinished();

- expect(source.readCount, 1);

- source.generateExceptionOnRead = true;

- do {

- _changeSource(source, "");

- // Ensure that the timestamp differs,

- // so that analysis engine notices the change

- } while (oldTimestamp == _context.getModificationStamp(source));

- _analyzeAll_assertFinished();

- expect(source.readCount, 2);

- }

void test_performAnalysisTask_addPart() {

- Source libSource = _addSource(

- "/lib.dart",

- r'''

+ Source libSource = _addSource("/lib.dart", r'''

library lib;

part 'part.dart';''');

// run all tasks without part

_analyzeAll_assertFinished();

// add part and run all tasks

- Source partSource =

- _addSource("/part.dart", r'''

+ Source partSource = _addSource("/part.dart", r'''

part of lib;

''');

_analyzeAll_assertFinished();

@@ -1218,22 +1160,52 @@ part of lib;

_addSource("/test.dart", "library lib; part 'test-part.dart';");

Source partSource = _addSource("/test-part.dart", "part of lib;");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 1");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 1");

// update and analyze #1

_context.setContents(libSource, "library lib;");

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNull, reason: "library changed 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNull,

+ reason: "library changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part changed 2");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part resolved 2");

// update and analyze #2

_context.setContents(libSource, "library lib; part 'test-part.dart';");

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNull, reason: "library changed 3");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part changed 3");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNull,

+ reason: "library changed 3");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part changed 3");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 3");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 3");

}

void test_performAnalysisTask_changeLibraryThenPartContents() {

@@ -1241,50 +1213,92 @@ part of lib;

_addSource("/test.dart", "library lib; part 'test-part.dart';");

Source partSource = _addSource("/test-part.dart", "part of lib;");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 1");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 1");

// update and analyze #1

_context.setContents(libSource, "library lib;");

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNull, reason: "library changed 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNull,

+ reason: "library changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part changed 2");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part resolved 2");

// update and analyze #2

_context.setContents(partSource, "part of lib; // 1");

// Assert that changing the part's content does not effect the library

// now that it is no longer part of that library

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library changed 3");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part changed 3");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library changed 3");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part changed 3");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 3");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part resolved 3");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 3");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part resolved 3");

}

void test_performAnalysisTask_changePartContents_makeItAPart() {

- Source libSource = _addSource(

- "/lib.dart",

- r'''

+ Source libSource = _addSource("/lib.dart", r'''

library lib;

part 'part.dart';

void f(x) {}''');

- Source partSource = _addSource(

- "/part.dart",

- "void g() { f(null); }");

+ Source partSource = _addSource("/part.dart", "void g() { f(null); }");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 1");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 1");

// update and analyze

- _context.setContents(

- partSource,

- r'''

+ _context.setContents(partSource, r'''

part of lib;

void g() { f(null); }''');

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNull, reason: "library changed 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNull,

+ reason: "library changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part changed 2");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 2");

expect(_context.getErrors(libSource).errors, hasLength(0));

expect(_context.getErrors(partSource).errors, hasLength(0));

}

@@ -1293,24 +1307,18 @@ void g() { f(null); }''');

* https://code.google.com/p/dart/issues/detail?id=12424

void test_performAnalysisTask_changePartContents_makeItNotPart() {

- Source libSource = _addSource(

- "/lib.dart",

- r'''

+ Source libSource = _addSource("/lib.dart", r'''

library lib;

part 'part.dart';

void f(x) {}''');

- Source partSource = _addSource(

- "/part.dart",

- r'''

+ Source partSource = _addSource("/part.dart", r'''

part of lib;

void g() { f(null); }''');

_analyzeAll_assertFinished();

expect(_context.getErrors(libSource).errors, hasLength(0));

expect(_context.getErrors(partSource).errors, hasLength(0));

// Remove 'part' directive, which should make "f(null)" an error.

- _context.setContents(

- partSource,

- r'''

+ _context.setContents(partSource, r'''

//part of lib;

void g() { f(null); }''');

_analyzeAll_assertFinished();

@@ -1322,56 +1330,114 @@ void g() { f(null); }''');

_addSource("/test.dart", "library lib; part 'test-part.dart';");

Source partSource = _addSource("/test-part.dart", "part of lib;");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 1");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 1");

// update and analyze #1

_context.setContents(partSource, "part of lib; // 1");

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNull, reason: "library changed 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNull,

+ reason: "library changed 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part changed 2");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 2");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 2");

// update and analyze #2

_context.setContents(partSource, "part of lib; // 12");

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNull, reason: "library changed 3");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNull, reason: "part changed 3");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNull,

+ reason: "library changed 3");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNull,

+ reason: "part changed 3");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libSource, libSource), isNotNull, reason: "library resolved 3");

- expect(_context.getResolvedCompilationUnit2(partSource, libSource), isNotNull, reason: "part resolved 3");

+ expect(

+ _context.getResolvedCompilationUnit2(libSource, libSource),

+ isNotNull,

+ reason: "library resolved 3");

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, libSource),

+ isNotNull,

+ reason: "part resolved 3");

}

void test_performAnalysisTask_importedLibraryAdd() {

Source libASource =

_addSource("/libA.dart", "library libA; import 'libB.dart';");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libASource, libASource), isNotNull, reason: "libA resolved 1");

- expect(_hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)), isTrue, reason: "libA has an error");

+ expect(

+ _context.getResolvedCompilationUnit2(libASource, libASource),

+ isNotNull,

+ reason: "libA resolved 1");

+ expect(

+ _hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)),

+ isTrue,

+ reason: "libA has an error");

// add libB.dart and analyze

Source libBSource = _addSource("/libB.dart", "library libB;");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libASource, libASource), isNotNull, reason: "libA resolved 2");

- expect(_context.getResolvedCompilationUnit2(libBSource, libBSource), isNotNull, reason: "libB resolved 2");

- expect(!_hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)), isTrue, reason: "libA doesn't have errors");

+ expect(

+ _context.getResolvedCompilationUnit2(libASource, libASource),

+ isNotNull,

+ reason: "libA resolved 2");

+ expect(

+ _context.getResolvedCompilationUnit2(libBSource, libBSource),

+ isNotNull,

+ reason: "libB resolved 2");

+ expect(

+ !_hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)),

+ isTrue,

+ reason: "libA doesn't have errors");

}

void test_performAnalysisTask_importedLibraryAdd_html() {

- Source htmlSource = _addSource(

- "/page.html",

- r'''

+ Source htmlSource = _addSource("/page.html", r'''

import '/libB.dart';

main() {print('hello dart');}

</script></body></html>''');

_analyzeAll_assertFinished();

- expect(_context.getResolvedHtmlUnit(htmlSource), isNotNull, reason: "htmlUnit resolved 1");

- expect(_hasAnalysisErrorWithErrorSeverity(_context.getErrors(htmlSource)), isTrue, reason: "htmlSource has an error");

+ expect(

+ _context.getResolvedHtmlUnit(htmlSource),

+ isNotNull,

+ reason: "htmlUnit resolved 1");

+ expect(

+ _hasAnalysisErrorWithErrorSeverity(_context.getErrors(htmlSource)),

+ isTrue,

+ reason: "htmlSource has an error");

// add libB.dart and analyze

Source libBSource = _addSource("/libB.dart", "library libB;");

_analyzeAll_assertFinished();

- expect(_context.getResolvedHtmlUnit(htmlSource), isNotNull, reason: "htmlUnit resolved 1");

- expect(_context.getResolvedCompilationUnit2(libBSource, libBSource), isNotNull, reason: "libB resolved 2");

+ expect(

+ _context.getResolvedHtmlUnit(htmlSource),

+ isNotNull,

+ reason: "htmlUnit resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(libBSource, libBSource),

+ isNotNull,

+ reason: "libB resolved 2");

AnalysisErrorInfo errors = _context.getErrors(htmlSource);

- expect(!_hasAnalysisErrorWithErrorSeverity(errors), isTrue, reason: "htmlSource doesn't have errors");

+ expect(

+ !_hasAnalysisErrorWithErrorSeverity(errors),

+ isTrue,

+ reason: "htmlSource doesn't have errors");

}

void test_performAnalysisTask_importedLibraryDelete() {

@@ -1379,21 +1445,55 @@ void g() { f(null); }''');

_addSource("/libA.dart", "library libA; import 'libB.dart';");

Source libBSource = _addSource("/libB.dart", "library libB;");

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libASource, libASource), isNotNull, reason: "libA resolved 1");

- expect(_context.getResolvedCompilationUnit2(libBSource, libBSource), isNotNull, reason: "libB resolved 1");

- expect(!_hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)), isTrue, reason: "libA doesn't have errors");

+ expect(

+ _context.getResolvedCompilationUnit2(libASource, libASource),

+ isNotNull,

+ reason: "libA resolved 1");

+ expect(

+ _context.getResolvedCompilationUnit2(libBSource, libBSource),

+ isNotNull,

+ reason: "libB resolved 1");

+ expect(

+ !_hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)),

+ isTrue,

+ reason: "libA doesn't have errors");

// remove libB.dart content and analyze

_context.setContents(libBSource, null);

_analyzeAll_assertFinished();

- expect(_context.getResolvedCompilationUnit2(libASource, libASource), isNotNull, reason: "libA resolved 2");

- expect(_hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)), isTrue, reason: "libA has an error");

+ expect(

+ _context.getResolvedCompilationUnit2(libASource, libASource),

+ isNotNull,

+ reason: "libA resolved 2");

+ expect(

+ _hasAnalysisErrorWithErrorSeverity(_context.getErrors(libASource)),

+ isTrue,

+ reason: "libA has an error");

+ }

+ void test_performAnalysisTask_IOException() {

+ TestSource source = _addSourceWithException2("/test.dart", "library test;");

+ int oldTimestamp = _context.getModificationStamp(source);

+ source.generateExceptionOnRead = false;

+ _analyzeAll_assertFinished();

+ expect(source.readCount, 1);

+ source.generateExceptionOnRead = true;

+ do {

+ _changeSource(source, "");

+ // Ensure that the timestamp differs,

+ // so that analysis engine notices the change

+ } while (oldTimestamp == _context.getModificationStamp(source));

+ _analyzeAll_assertFinished();

+ expect(source.readCount, 2);

}

void test_performAnalysisTask_missingPart() {

Source source =

_addSource("/test.dart", "library lib; part 'no-such-file.dart';");

_analyzeAll_assertFinished();

- expect(_context.getLibraryElement(source), isNotNull, reason: "performAnalysisTask failed to compute an element model");

+ expect(

+ _context.getLibraryElement(source),

+ isNotNull,

+ reason: "performAnalysisTask failed to compute an element model");

}

void test_performAnalysisTask_modifiedAfterParse() {

@@ -1535,9 +1635,7 @@ library lib;

part 'part.dart';

int a = 0;''';

Source librarySource = _addSource("/lib.dart", oldCode);

- Source partSource = _addSource(

- "/part.dart",

- r'''

+ Source partSource = _addSource("/part.dart", r'''

part of lib;

int b = a;''');

LibraryElement element = _context.computeLibraryElement(librarySource);

@@ -1556,7 +1654,9 @@ int ya = 0;''';

_getIncrementalAnalysisCache(_context);

expect(incrementalCache.librarySource, librarySource);

expect(incrementalCache.resolvedUnit, same(unit));

- expect(_context.getResolvedCompilationUnit2(partSource, librarySource), isNull);

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, librarySource),

+ isNull);

expect(incrementalCache.newContents, newCode);

}

@@ -1567,14 +1667,12 @@ int ya = 0;''';

options.incremental = true;

_context.analysisOptions = options;

_sourceFactory = _context.sourceFactory;

- String oldCode =

- r'''

+ String oldCode = r'''

library lib;

int a = 0;''';

Source librarySource = _addSource("/lib.dart", oldCode);

int offset = oldCode.indexOf("int a") + 4;

- String newCode =

- r'''

+ String newCode = r'''

library lib;

int ya = 0;''';

_context.setChangedContents(librarySource, newCode, offset, 0, 1);

@@ -1585,15 +1683,11 @@ int ya = 0;''';

void test_setContents_libraryWithPart() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source librarySource = _addSource(

- "/lib.dart",

- r'''

+ Source librarySource = _addSource("/lib.dart", r'''

library lib;

part 'part.dart';

int a = 0;''');

- Source partSource = _addSource(

- "/part.dart",

- r'''

+ Source partSource = _addSource("/part.dart", r'''

part of lib;

int b = a;''');

_context.computeLibraryElement(librarySource);

@@ -1608,22 +1702,20 @@ int b = a;''');

0);

_setIncrementalAnalysisCache(_context, incrementalCache);

expect(_getIncrementalAnalysisCache(_context), same(incrementalCache));

- _context.setContents(

- librarySource,

- r'''

+ _context.setContents(librarySource, r'''

library lib;

part 'part.dart';

int aa = 0;''');

- expect(_context.getResolvedCompilationUnit2(partSource, librarySource), isNull);

+ expect(

+ _context.getResolvedCompilationUnit2(partSource, librarySource),

+ isNull);

expect(_getIncrementalAnalysisCache(_context), isNull);

}

void test_setContents_null() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source librarySource = _addSource(

- "/lib.dart",

- r'''

+ Source librarySource = _addSource("/lib.dart", r'''

library lib;

int a = 0;''');

_context.computeLibraryElement(librarySource);

@@ -1639,7 +1731,9 @@ int a = 0;''');

_setIncrementalAnalysisCache(_context, incrementalCache);

expect(_getIncrementalAnalysisCache(_context), same(incrementalCache));

_context.setContents(librarySource, null);

- expect(_context.getResolvedCompilationUnit2(librarySource, librarySource), isNull);

+ expect(

+ _context.getResolvedCompilationUnit2(librarySource, librarySource),

+ isNull);

expect(_getIncrementalAnalysisCache(_context), isNull);

}

@@ -1653,14 +1747,10 @@ int a = 0;''');

void test_unreadableSource() {

_context = AnalysisContextFactory.contextWithCore();

_sourceFactory = _context.sourceFactory;

- Source test1 = _addSource(

- "/test1.dart",

- r'''

+ Source test1 = _addSource("/test1.dart", r'''

import 'test2.dart';

library test1;''');

- Source test2 = _addSource(

- "/test2.dart",

- r'''

+ Source test2 = _addSource("/test2.dart", r'''

import 'test1.dart';

import 'test3.dart';

library test2;''');

@@ -1712,7 +1802,8 @@ library test2;''');

}

List<ChangeNotice> notice = _context.performAnalysisTask().changeNotices;

if (notice != null) {

- fail("performAnalysisTask failed to terminate after analyzing all sources");

+ fail(

+ "performAnalysisTask failed to terminate after analyzing all sources");

}

@@ -1922,7 +2013,9 @@ class AnalysisOptionsImplTest extends EngineTestCase {

void test_getEnableDeferredLoading() {

AnalysisOptionsImpl options = new AnalysisOptionsImpl();

- expect(options.enableDeferredLoading, AnalysisOptionsImpl.DEFAULT_ENABLE_DEFERRED_LOADING);

+ expect(

+ options.enableDeferredLoading,

+ AnalysisOptionsImpl.DEFAULT_ENABLE_DEFERRED_LOADING);

bool value = !options.enableDeferredLoading;

options.enableDeferredLoading = value;

expect(options.enableDeferredLoading, value);

@@ -1966,16 +2059,6 @@ class AnalysisOptionsImplTest extends EngineTestCase {

}

-class AnalysisTaskTest extends EngineTestCase {

- void test_perform_exception() {

- InternalAnalysisContext context = new AnalysisContextImpl();

- context.sourceFactory = new SourceFactory([new FileUriResolver()]);

- AnalysisTask task = new AnalysisTask_test_perform_exception(context);

- task.perform(new TestTaskVisitor<Object>());

- }

class AnalysisTask_test_perform_exception extends AnalysisTask {

AnalysisTask_test_perform_exception(InternalAnalysisContext arg0)

: super(arg0);

@@ -1993,6 +2076,16 @@ class AnalysisTask_test_perform_exception extends AnalysisTask {

}

+class AnalysisTaskTest extends EngineTestCase {

+ void test_perform_exception() {

+ InternalAnalysisContext context = new AnalysisContextImpl();

+ context.sourceFactory = new SourceFactory([new FileUriResolver()]);

+ AnalysisTask task = new AnalysisTask_test_perform_exception(context);

+ task.perform(new TestTaskVisitor<Object>());

+ }

class CompilationUnitMock extends TypedMock implements CompilationUnit {

noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);

}

@@ -2006,9 +2099,7 @@ class DartEntryTest extends EngineTestCase {

entry.setValue(

DartEntry.SCAN_ERRORS,

<AnalysisError>[

- new AnalysisError.con1(

- source,

- ScannerErrorCode.UNTERMINATED_STRING_LITERAL)]);

+ new AnalysisError.con1(source, ScannerErrorCode.UNTERMINATED_STRING_LITERAL)]);

entry.setValue(

DartEntry.PARSE_ERRORS,

<AnalysisError>[

@@ -2024,9 +2115,7 @@ class DartEntryTest extends EngineTestCase {

DartEntry.VERIFICATION_ERRORS,

source,

<AnalysisError>[

- new AnalysisError.con1(

- source,

- StaticWarningCode.CASE_BLOCK_NOT_TERMINATED)]);

+ new AnalysisError.con1(source, StaticWarningCode.CASE_BLOCK_NOT_TERMINATED)]);

entry.setValueInLibrary(

DartEntry.ANGULAR_ERRORS,

source,

@@ -2043,27 +2132,49 @@ class DartEntryTest extends EngineTestCase {

DartEntry entry = new DartEntry();

expect(entry.getState(SourceEntry.CONTENT), same(CacheState.INVALID));

expect(entry.getState(SourceEntry.LINE_INFO), same(CacheState.INVALID));

- expect(entry.getState(DartEntry.CONTAINING_LIBRARIES), same(CacheState.INVALID));

+ expect(

+ entry.getState(DartEntry.CONTAINING_LIBRARIES),

+ same(CacheState.INVALID));

expect(entry.getState(DartEntry.ELEMENT), same(CacheState.INVALID));

- expect(entry.getState(DartEntry.EXPORTED_LIBRARIES), same(CacheState.INVALID));

- expect(entry.getState(DartEntry.IMPORTED_LIBRARIES), same(CacheState.INVALID));

+ expect(

+ entry.getState(DartEntry.EXPORTED_LIBRARIES),

+ same(CacheState.INVALID));

+ expect(

+ entry.getState(DartEntry.IMPORTED_LIBRARIES),

+ same(CacheState.INVALID));

expect(entry.getState(DartEntry.INCLUDED_PARTS), same(CacheState.INVALID));

expect(entry.getState(DartEntry.IS_CLIENT), same(CacheState.INVALID));

expect(entry.getState(DartEntry.IS_LAUNCHABLE), same(CacheState.INVALID));

expect(entry.getState(DartEntry.PARSE_ERRORS), same(CacheState.INVALID));

expect(entry.getState(DartEntry.PARSED_UNIT), same(CacheState.INVALID));

- expect(entry.getState(DartEntry.PUBLIC_NAMESPACE), same(CacheState.INVALID));

+ expect(

+ entry.getState(DartEntry.PUBLIC_NAMESPACE),

+ same(CacheState.INVALID));

expect(entry.getState(DartEntry.SCAN_ERRORS), same(CacheState.INVALID));

expect(entry.getState(DartEntry.SOURCE_KIND), same(CacheState.INVALID));

expect(entry.getState(DartEntry.TOKEN_STREAM), same(CacheState.INVALID));

- expect(entry.getStateInLibrary(DartEntry.ANGULAR_ERRORS, librarySource), same(CacheState.INVALID));

- expect(entry.getStateInLibrary(DartEntry.BUILT_ELEMENT, librarySource), same(CacheState.INVALID));

- expect(entry.getStateInLibrary(DartEntry.BUILT_UNIT, librarySource), same(CacheState.INVALID));

- expect(entry.getStateInLibrary(DartEntry.HINTS, librarySource), same(CacheState.INVALID));

- expect(entry.getStateInLibrary(DartEntry.RESOLUTION_ERRORS, librarySource), same(CacheState.INVALID));

- expect(entry.getStateInLibrary(DartEntry.RESOLVED_UNIT, librarySource), same(CacheState.INVALID));

- expect(entry.getStateInLibrary(DartEntry.VERIFICATION_ERRORS, librarySource), same(CacheState.INVALID));

+ expect(

+ entry.getStateInLibrary(DartEntry.ANGULAR_ERRORS, librarySource),

+ same(CacheState.INVALID));

+ expect(

+ entry.getStateInLibrary(DartEntry.BUILT_ELEMENT, librarySource),

+ same(CacheState.INVALID));

+ expect(

+ entry.getStateInLibrary(DartEntry.BUILT_UNIT, librarySource),

+ same(CacheState.INVALID));

+ expect(

+ entry.getStateInLibrary(DartEntry.HINTS, librarySource),

+ same(CacheState.INVALID));

+ expect(

+ entry.getStateInLibrary(DartEntry.RESOLUTION_ERRORS, librarySource),

+ same(CacheState.INVALID));

+ expect(

+ entry.getStateInLibrary(DartEntry.RESOLVED_UNIT, librarySource),

+ same(CacheState.INVALID));

+ expect(

+ entry.getStateInLibrary(DartEntry.VERIFICATION_ERRORS, librarySource),

+ same(CacheState.INVALID));

}

void test_getResolvableCompilationUnit_none() {

@@ -2081,8 +2192,7 @@ class DartEntryTest extends EngineTestCase {

importDirective.uriContent = importUri;

String exportUri = "/f2.dart";

Source exportSource = new TestSource(exportUri);

- ExportDirective exportDirective =

- AstFactory.exportDirective2(exportUri);

+ ExportDirective exportDirective = AstFactory.exportDirective2(exportUri);

exportDirective.source = exportSource;

exportDirective.uriContent = exportUri;

String partUri = "/f3.dart";

@@ -2128,8 +2238,7 @@ class DartEntryTest extends EngineTestCase {

importDirective.uriContent = importUri;

String exportUri = "f2.dart";

Source exportSource = new TestSource(exportUri);

- ExportDirective exportDirective =

- AstFactory.exportDirective2(exportUri);

+ ExportDirective exportDirective = AstFactory.exportDirective2(exportUri);

exportDirective.source = exportSource;

exportDirective.uriContent = exportUri;

String partUri = "f3.dart";

@@ -2158,31 +2267,31 @@ class DartEntryTest extends EngineTestCase {

expect(resultPartDirective.source, same(partSource));

}

- void test_getStateInLibrary_invalid_element() {

+ void test_getState_invalid_resolutionErrors() {

DartEntry entry = new DartEntry();

try {

- entry.getStateInLibrary(DartEntry.ELEMENT, new TestSource());

- fail("Expected IllegalArgumentException for ELEMENT");

+ entry.getState(DartEntry.RESOLUTION_ERRORS);

+ fail("Expected IllegalArgumentException for RESOLUTION_ERRORS");

} on ArgumentError catch (exception) {

// Expected

}

- void test_getState_invalid_resolutionErrors() {

+ void test_getState_invalid_verificationErrors() {

DartEntry entry = new DartEntry();

try {

- entry.getState(DartEntry.RESOLUTION_ERRORS);

- fail("Expected IllegalArgumentException for RESOLUTION_ERRORS");

+ entry.getState(DartEntry.VERIFICATION_ERRORS);

+ fail("Expected IllegalArgumentException for VERIFICATION_ERRORS");

} on ArgumentError catch (exception) {

// Expected

}

- void test_getState_invalid_verificationErrors() {

+ void test_getStateInLibrary_invalid_element() {

DartEntry entry = new DartEntry();

try {

- entry.getState(DartEntry.VERIFICATION_ERRORS);

- fail("Expected IllegalArgumentException for VERIFICATION_ERRORS");

+ entry.getStateInLibrary(DartEntry.ELEMENT, new TestSource());

+ fail("Expected IllegalArgumentException for ELEMENT");

} on ArgumentError catch (exception) {

// Expected

}

@@ -2202,6 +2311,25 @@ class DartEntryTest extends EngineTestCase {

expect(value, hasLength(0));

}

+ void test_getValue_invalid_resolutionErrors() {

+ DartEntry entry = new DartEntry();

+ try {

+ entry.getValue(DartEntry.RESOLUTION_ERRORS);

+ fail("Expected IllegalArgumentException for RESOLUTION_ERRORS");

+ } on ArgumentError catch (exception) {

+ }

+ void test_getValue_invalid_verificationErrors() {

+ DartEntry entry = new DartEntry();

+ try {

+ entry.getValue(DartEntry.VERIFICATION_ERRORS);

+ fail("Expected IllegalArgumentException for VERIFICATION_ERRORS");

+ } on ArgumentError catch (exception) {

+ // Expected

+ }

void test_getValueInLibrary_invalid_element() {

DartEntry entry = new DartEntry();

try {

@@ -2237,25 +2365,6 @@ class DartEntryTest extends EngineTestCase {

}

- void test_getValue_invalid_resolutionErrors() {

- DartEntry entry = new DartEntry();

- try {

- entry.getValue(DartEntry.RESOLUTION_ERRORS);

- fail("Expected IllegalArgumentException for RESOLUTION_ERRORS");

- } on ArgumentError catch (exception) {

- }

- void test_getValue_invalid_verificationErrors() {

- DartEntry entry = new DartEntry();

- try {

- entry.getValue(DartEntry.VERIFICATION_ERRORS);

- fail("Expected IllegalArgumentException for VERIFICATION_ERRORS");

- } on ArgumentError catch (exception) {

- // Expected

- }

void test_hasInvalidData_false() {

DartEntry entry = new DartEntry();

entry.recordScanError(new CaughtException(new AnalysisException(), null));

@@ -2301,27 +2410,49 @@ class DartEntryTest extends EngineTestCase {

entry.invalidateAllInformation();

expect(entry.getState(SourceEntry.CONTENT), same(CacheState.INVALID));

expect(entry.getState(SourceEntry.LINE_INFO), same(CacheState.INVALID));

- expect(entry.getState(DartEntry.CONTAINING_LIBRARIES), same(CacheState.VALID));

+ expect(

+ entry.getState(DartEntry.CONTAINING_LIBRARIES),

+ same(CacheState.VALID));