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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java

Issue 10825346: Fix bugs in parser and update tests to use new directive syntax (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « compiler/javatests/com/google/dart/compiler/common/ApplicationSourceFileTest.dart ('k') | compiler/javatests/com/google/dart/compiler/end2end/inc/my.app.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java
===================================================================
--- compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java (revision 10652)
+++ compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java (working copy)
@@ -86,10 +86,10 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#source('A.dart');",
- "#source('B.dart');",
- "#source('C.dart');",
+ "library application;",
+ "part 'A.dart';",
+ "part 'B.dart';",
+ "part 'C.dart';",
""));
appSource.setContent("A.dart", "");
appSource.setContent("B.dart", "");
@@ -448,8 +448,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('app');",
- "#source('B.dart');",
+ "library app;",
+ "part 'B.dart';",
""));
compile();
// Now there is top-level declarations conflict between A and B.
@@ -521,7 +521,7 @@
}
/**
- * Test that invalid "#import" is reported as any other error between "unitAboutToCompile" and
+ * Test that invalid "import" is reported as any other error between "unitAboutToCompile" and
* "unitCompiled".
*/
public void test_reportMissingImport() throws Exception {
@@ -529,8 +529,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('app');",
- "#import('dart:noSuchLib.dart');",
+ "library app;",
+ "import 'dart:noSuchLib.dart';",
""));
// Remember errors only between unitAboutToCompile/unitCompiled.
errors.clear();
@@ -556,7 +556,7 @@
};
DartCompiler.compileLib(appSource, config, provider, listener);
// Check that errors where reported (and in correct time).
- assertErrors(errors, errEx(DartCompilerErrorCode.MISSING_SOURCE, 3, 1, 31));
+ assertErrors(errors, errEx(DartCompilerErrorCode.MISSING_SOURCE, 3, 1, 29));
}
/**
@@ -567,9 +567,9 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart', prefix: 'p');",
- "#import('B.dart', prefix: 'p');",
+ "library application;",
+ "import 'A.dart' as p;",
+ "import 'B.dart' as p;",
"f() {",
" p.a = 1;",
" p.b = 2;",
@@ -579,14 +579,14 @@
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
+ "library A;",
"var a;",
""));
appSource.setContent(
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('B');",
+ "library B;",
"var b;",
""));
// do compile, no errors expected
@@ -603,24 +603,24 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart', prefix: 'p');",
- "#import('B.dart', prefix: 'p');",
-// "#import('A.dart');",
-// "#import('B.dart');",
+ "library application;",
+ "import 'A.dart' as p;",
+ "import 'B.dart' as p;",
+// "import 'A.dart';",
+// "import 'B.dart';",
""));
appSource.setContent(
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
+ "library A;",
"var someVar;",
""));
appSource.setContent(
"B.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('B');",
+ "library B;",
"var someVar;",
""));
// do compile
@@ -636,12 +636,12 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('app');",
- "#source('noSuchUnit.dart');",
+ "library app;",
+ "part 'noSuchUnit.dart';",
""));
compile();
// Check that errors where reported (and in correct time).
- assertErrors(errors, errEx(DartCompilerErrorCode.MISSING_SOURCE, 3, 1, 27));
+ assertErrors(errors, errEx(DartCompilerErrorCode.MISSING_SOURCE, 3, 1, 23));
}
public void test_reportMissingSource_withSchema_file() throws Exception {
@@ -681,13 +681,13 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#source('A.dart');",
- "#source('A.dart');",
+ "library application;",
+ "part 'A.dart';",
+ "part 'A.dart';",
""));
// do compile, no errors expected
compile();
- assertErrors(errors, errEx(DartCompilerErrorCode.UNIT_WAS_ALREADY_INCLUDED, 4, 1, 18));
+ assertErrors(errors, errEx(DartCompilerErrorCode.UNIT_WAS_ALREADY_INCLUDED, 4, 1, 14));
}
/**
@@ -702,8 +702,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('app');",
- "#import('canNotRead.dart');",
+ "library app;",
+ "import 'canNotRead.dart';",
""));
// use same config as Editor - resolve despite of errors
config = new DefaultCompilerConfiguration() {
@@ -725,7 +725,7 @@
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
+ "library A;",
"class A {",
" static _privateStatic() {}",
"}",
@@ -734,8 +734,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart');",
+ "library application;",
+ "import 'A.dart';",
"main() {",
" A._privateStatic();",
"}",
@@ -756,7 +756,7 @@
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
+ "library A;",
"class A {",
" _privateInstance() {}",
"}",
@@ -765,8 +765,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart');",
+ "library application;",
+ "import 'A.dart';",
"main() {",
" A a = new A();",
" a._privateInstance();",
@@ -788,7 +788,7 @@
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
+ "library A;",
"class A {",
" _method() {}",
"}",
@@ -797,8 +797,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart');",
+ "library application;",
+ "import 'A.dart';",
"class B extends A {",
" test1() {",
" _method();",
@@ -827,8 +827,8 @@
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
- "#import('" + APP + "');",
+ "library A;",
+ "import '" + APP + "';",
"interface I default A {",
" I();",
" I.named();",
@@ -838,8 +838,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart', prefix: 'lib');",
+ "library applicatioN;",
+ "import 'A.dart' as lib;",
"class A {",
" factory lib.I() {}",
" factory lib.I.named() {}",
@@ -859,14 +859,14 @@
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
+ "library A;",
""));
appSource.setContent(
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart', prefix: 'prf');",
+ "library application;",
+ "import 'A.dart' as prf;",
"main() {",
" var prf;",
"}",
@@ -885,8 +885,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('dart:html');",
+ "library application;",
+ "import 'dart:html';",
"main() {",
" var v1 = query('a');",
" var v2 = query('A');",
@@ -932,9 +932,9 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('dart:io');",
- "#import('dart:html');",
+ "library application;",
+ "import 'dart:io';",
+ "import 'dart:html';",
""));
// do compiled
compile();
@@ -955,27 +955,27 @@
"A.dart",
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('A');",
+ "library A;",
""));
appSource.setContent(
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('A.dart', prefix: 'abstract');",
- "#import('A.dart', prefix: 'as');",
- "#import('A.dart', prefix: 'assert');",
- "#import('A.dart', prefix: 'Dynamic');",
- "#import('A.dart', prefix: 'equals');",
- "#import('A.dart', prefix: 'factory');",
- "#import('A.dart', prefix: 'get');",
- "#import('A.dart', prefix: 'implements');",
- "#import('A.dart', prefix: 'interface');",
- "#import('A.dart', prefix: 'negate');",
- "#import('A.dart', prefix: 'operator');",
- "#import('A.dart', prefix: 'set');",
- "#import('A.dart', prefix: 'static');",
- "#import('A.dart', prefix: 'typedef');",
+ "library application;",
+ "import 'A.dart' as abstract;",
+ "import 'A.dart' as as;",
+ "import 'A.dart' as assert;",
+ "import 'A.dart' as Dynamic;",
+ "import 'A.dart' as equals;",
+ "import 'A.dart' as factory;",
+ "import 'A.dart' as get;",
+ "import 'A.dart' as implements;",
+ "import 'A.dart' as interface;",
+ "import 'A.dart' as negate;",
+ "import 'A.dart' as operator;",
+ "import 'A.dart' as set;",
+ "import 'A.dart' as static;",
+ "import 'A.dart' as typedef;",
"main() {",
" var prf;",
"}",
@@ -983,7 +983,7 @@
// do compile, no errors expected
compile();
{
- assertEquals(14, errors.size());
+ assertEquals(13, errors.size());
for (DartCompilationError error : errors) {
assertEquals(ResolverErrorCode.BUILT_IN_IDENTIFIER_AS_IMPORT_PREFIX, error.getErrorCode());
}
@@ -995,8 +995,8 @@
APP,
makeCode(
"// filler filler filler filler filler filler filler filler filler filler filler",
- "#library('application');",
- "#import('dart:core');",
+ "library application;",
+ "import 'dart:core';",
""));
compile();
ErrorExpectation.assertErrors(errors);
« no previous file with comments | « compiler/javatests/com/google/dart/compiler/common/ApplicationSourceFileTest.dart ('k') | compiler/javatests/com/google/dart/compiler/end2end/inc/my.app.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698