pkg/analyzer/test/src/context/context_test.dart - Issue 1200913002: Deprecate old HTML support

Unified Diff: pkg/analyzer/test/src/context/context_test.dart

Issue 1200913002: Deprecate old HTML support (Closed) Base URL: https://github.com/dart-lang/sdk.git@master

Patch Set: Created 5 years, 6 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

Index: pkg/analyzer/test/src/context/context_test.dart

diff --git a/pkg/analyzer/test/src/context/context_test.dart b/pkg/analyzer/test/src/context/context_test.dart

index e6ecc6c12f99b7b677d8acc00f33d5bf54421a56..60e430cdebbd18709aed034158e9a9e32aa2f164 100644

--- a/pkg/analyzer/test/src/context/context_test.dart

+++ b/pkg/analyzer/test/src/context/context_test.dart

@@ -61,33 +61,10 @@ class AnalysisContextImplTest extends AbstractContextTest {

fail('Should have failed');

}

- void fail_computeHtmlElement_valid() {

- Source source = addSource("/test.html", "<html></html>");

- HtmlElement element = context.computeHtmlElement(source);

- expect(element, isNotNull);

- expect(context.computeHtmlElement(source), same(element));

- }

void fail_extractContext() {

fail("Implement this");

}

- void fail_getHtmlElement_html() {

- Source source = addSource("/test.html", "<html></html>");

- HtmlElement element = context.getHtmlElement(source);

- expect(element, isNull);

- context.computeHtmlElement(source);

- element = context.getHtmlElement(source);

- expect(element, isNotNull);

- }

- void fail_getResolvedHtmlUnit() {

- Source source = addSource("/test.html", "<html></html>");

- expect(context.getResolvedHtmlUnit(source), isNull);

- context.resolveHtmlUnit(source);

- expect(context.getResolvedHtmlUnit(source), isNotNull);

- }

void fail_mergeContext() {

fail("Implement this");

}

@@ -108,6 +85,8 @@ class ClassA {}''');

<body>

</body>

</html>''');

+ // TODO(brianwilkerson) Rewrite this. We need a way to get the AST for the

+ // script.

ht.HtmlUnit unit = context.parseHtmlUnit(source);

expect(unit, isNotNull);

// import directive should be resolved

@@ -121,13 +100,7 @@ class ClassA {}''');

}

void fail_performAnalysisTask_getContentException_dart() {

- // add source that throw an exception on "get content"

- Source source = new _Source_getContent_throwException('test.dart');

- {

- ChangeSet changeSet = new ChangeSet();

- changeSet.addedSource(source);

- context.applyChanges(changeSet);

- }

+ Source source = _addSourceWithException('test.dart');

// prepare errors

_analyzeAll_assertFinished();

List<AnalysisError> errors = context.getErrors(source).errors;

@@ -139,13 +112,7 @@ class ClassA {}''');

}

void fail_performAnalysisTask_getContentException_html() {

- // add source that throw an exception on "get content"

- Source source = new _Source_getContent_throwException('test.html');

- {

- ChangeSet changeSet = new ChangeSet();

- changeSet.addedSource(source);

- context.applyChanges(changeSet);

- }

+ Source source = _addSourceWithException('test.html');

// prepare errors

_analyzeAll_assertFinished();

List<AnalysisError> errors = context.getErrors(source).errors;

@@ -156,26 +123,24 @@ class ClassA {}''');

expect(error.errorCode, ScannerErrorCode.UNABLE_GET_CONTENT);

}

- void fail_performAnalysisTask_importedLibraryAdd_html() {

+ void test_performAnalysisTask_importedLibraryAdd_html() {

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");

+ context.computeErrors(htmlSource);

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");

// TODO (danrubel) commented out to fix red bots

+// context.computeErrors(htmlSource);

// AnalysisErrorInfo errors = _context.getErrors(htmlSource);

// expect(

// !_hasAnalysisErrorWithErrorSeverity(errors),

@@ -192,8 +157,7 @@ class ClassA {}''');

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

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

_analyzeAll_assertFinished();

- expect(context.getResolvedHtmlUnit(htmlSource), isNotNull,

- reason: "htmlUnit resolved 1");

+ context.computeErrors(htmlSource);

expect(

context.getResolvedCompilationUnit2(libBSource, libBSource), isNotNull,

reason: "libB resolved 1");

@@ -202,8 +166,7 @@ class ClassA {}''');

// remove libB.dart content and analyze

context.setContents(libBSource, null);

_analyzeAll_assertFinished();

- expect(context.getResolvedHtmlUnit(htmlSource), isNotNull,

- reason: "htmlUnit resolved 1");

+ context.computeErrors(htmlSource);

AnalysisErrorInfo errors = context.getErrors(htmlSource);

expect(_hasAnalysisErrorWithErrorSeverity(errors), isTrue,

reason: "htmlSource has an error");

@@ -229,12 +192,6 @@ class ClassA {}''');

fail("Implement this");

}

- void fail_resolveHtmlUnit() {

- Source source = addSource("/lib.html", "<html></html>");

- ht.HtmlUnit unit = context.resolveHtmlUnit(source);

- expect(unit, isNotNull);

- }

void fail_setAnalysisOptions_reduceAnalysisPriorityOrder() {

AnalysisOptionsImpl options =

new AnalysisOptionsImpl.from(context.analysisOptions);

@@ -628,11 +585,6 @@ class A {}""");

expect(context.computeExportedLibraries(source), hasLength(2));

}

- void test_computeHtmlElement_nonHtml() {

- Source source = addSource("/test.dart", "library test;");

- expect(context.computeHtmlElement(source), isNull);

- }

void test_computeImportedLibraries_none() {

Source source = addSource("/test.dart", "library test;");

expect(context.computeImportedLibraries(source), hasLength(0));

@@ -1043,13 +995,6 @@ class A {

expect(errors, hasLength(3));

}

- void test_getHtmlElement_dart() {

- Source source = addSource("/test.dart", "");

- expect(context.getHtmlElement(source), isNull);

- expect(context.computeHtmlElement(source), isNull);

- expect(context.getHtmlElement(source), isNull);

- }

void test_getHtmlFilesReferencing_html() {

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

@@ -1077,7 +1022,8 @@ class A {

context.computeLibraryElement(librarySource);

List<Source> result = context.getHtmlFilesReferencing(librarySource);

expect(result, hasLength(0));

- context.computeHtmlElement(htmlSource);

+ // Indirectly force the data to be computed.

+ context.computeErrors(htmlSource);

result = context.getHtmlFilesReferencing(librarySource);

expect(result, hasLength(1));

expect(result[0], htmlSource);

@@ -1096,7 +1042,8 @@ class A {

context.computeLibraryElement(librarySource);

List<Source> result = context.getHtmlFilesReferencing(partSource);

expect(result, hasLength(0));

- context.computeHtmlElement(htmlSource);

+ // Indirectly force the data to be computed.

+ context.computeErrors(htmlSource);

result = context.getHtmlFilesReferencing(partSource);

expect(result, hasLength(1));

expect(result[0], htmlSource);

@@ -1255,7 +1202,8 @@ export 'libA.dart';''');

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

Source librarySource = addSource("/test.dart", "library lib;");

context.computeLibraryElement(librarySource);

- context.computeHtmlElement(htmlSource);

+ // Indirectly force the data to be computed.

+ context.computeErrors(htmlSource);

List<Source> result = context.getLibrariesReferencedFromHtml(htmlSource);

expect(result, hasLength(1));

expect(result[0], librarySource);

@@ -2105,31 +2053,6 @@ int a = 0;''');

}

-//class FakeSdk extends DirectoryBasedDartSdk {

-// FakeSdk(JavaFile arg0) : super(arg0);

-//

-// @override

-// LibraryMap initialLibraryMap(bool useDart2jsPaths) {

-// LibraryMap map = new LibraryMap();

-// _addLibrary(map, DartSdk.DART_ASYNC, false, "async.dart");

-// _addLibrary(map, DartSdk.DART_CORE, false, "core.dart");

-// _addLibrary(map, DartSdk.DART_HTML, false, "html_dartium.dart");

-// _addLibrary(map, "dart:math", false, "math.dart");

-// _addLibrary(map, "dart:_interceptors", true, "_interceptors.dart");

-// _addLibrary(map, "dart:_js_helper", true, "_js_helper.dart");

-// return map;

-// }

-//

-// void _addLibrary(LibraryMap map, String uri, bool isInternal, String path) {

-// SdkLibraryImpl library = new SdkLibraryImpl(uri);

-// if (isInternal) {

-// library.category = "Internal";

-// }

-// library.path = path;

-// map.setLibrary(uri, library);

-// }

-//}

class _AnalysisContextImplTest_test_applyChanges_removeContainer

implements SourceContainer {

Source libB;

@@ -2137,16 +2060,3 @@ class _AnalysisContextImplTest_test_applyChanges_removeContainer

@override

bool contains(Source source) => source == libB;

}

-class _Source_getContent_throwException extends NonExistingSource {

- _Source_getContent_throwException(String name)

- : super(name, pathos.toUri(name), UriKind.FILE_URI);

- @override

- TimestampedData<String> get contents {

- throw 'Read error';

- }

- @override

- bool exists() => true;

« no previous file with comments | « pkg/analyzer/test/generated/engine_test.dart ('k') | no next file » | no next file with comments »