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

Unified Diff: compiler/javatests/com/google/dart/compiler/type/TypeTestCase.java

Issue 8948001: Updates dartc to recognize 'default' keyword on interface and updated factory method syntax (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Got rid of some problems. Created 9 years 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: compiler/javatests/com/google/dart/compiler/type/TypeTestCase.java
diff --git a/compiler/javatests/com/google/dart/compiler/type/TypeTestCase.java b/compiler/javatests/com/google/dart/compiler/type/TypeTestCase.java
index fe9c9419581cbb7ff87f7a155a4cc06954e4981b..c2af9ec776053445c35754896085db4cd4b0aae4 100644
--- a/compiler/javatests/com/google/dart/compiler/type/TypeTestCase.java
+++ b/compiler/javatests/com/google/dart/compiler/type/TypeTestCase.java
@@ -8,7 +8,6 @@ import com.google.dart.compiler.DartCompilationError;
import com.google.dart.compiler.DartCompilerListener;
import com.google.dart.compiler.ErrorCode;
import com.google.dart.compiler.SubSystem;
-import com.google.dart.compiler.ast.DartUnit;
import com.google.dart.compiler.ast.DartBlock;
import com.google.dart.compiler.ast.DartFunction;
import com.google.dart.compiler.ast.DartIdentifier;
@@ -17,7 +16,7 @@ import com.google.dart.compiler.ast.DartMethodDefinition;
import com.google.dart.compiler.ast.DartParameter;
import com.google.dart.compiler.ast.DartStatement;
import com.google.dart.compiler.ast.DartTypeNode;
-import com.google.dart.compiler.ast.DartTypeParameter;
+import com.google.dart.compiler.ast.DartUnit;
import com.google.dart.compiler.ast.Modifiers;
import com.google.dart.compiler.resolver.ClassElement;
import com.google.dart.compiler.resolver.Elements;
@@ -76,24 +75,23 @@ abstract class TypeTestCase extends TestCase {
ClassElement makeListElement() {
final TypeVariable typeVar = typeVar("E", itype(object));
final ClassElement element = element("List", itype(object), typeVar);
- DartTypeNode returnTypeNode = new DartTypeNode(new DartIdentifier("Iterator"),
+ DartTypeNode returnTypeNode = new DartTypeNode(new DartIdentifier("Iterator"),
Arrays.asList(new DartTypeNode(new DartIdentifier("E"))));
-
+
DartMethodDefinition iteratorMethod = DartMethodDefinition.create(
- new DartIdentifier("iterator"), new DartFunction(Collections.<DartParameter>emptyList(),
+ new DartIdentifier("iterator"), new DartFunction(Collections.<DartParameter>emptyList(),
new DartBlock(Collections.<DartStatement>emptyList()), returnTypeNode),
Modifiers.NONE,
- Collections.<DartInitializer>emptyList(),
- Collections.<DartTypeParameter>emptyList());
+ Collections.<DartInitializer>emptyList());
MethodElement iteratorMethodElement = Elements.methodFromMethodNode(iteratorMethod, element);
Type returnType = Types.interfaceType(iterElement, Arrays.asList(typeVar));
- FunctionType functionType = ftype(function, returnType, Collections.<String,Type>emptyMap(),
+ FunctionType functionType = ftype(function, returnType, Collections.<String,Type>emptyMap(),
null);
Elements.setType(iteratorMethodElement, functionType);
Elements.addMethod(element, iteratorMethodElement);
return element;
}
-
+
protected void setExpectedTypeErrorCount(int count) {
checkExpectedTypeErrorCount();
expectedTypeErrors = count;
@@ -126,7 +124,7 @@ abstract class TypeTestCase extends TestCase {
static FunctionType ftype(ClassElement element, Type returnType,
Map<String, Type> namedParameterTypes, Type rest, Type... arguments) {
return FunctionTypeImplementation.of(element, Arrays.asList(arguments), namedParameterTypes,
- rest, returnType, null);
+ rest, returnType);
}
static Map<String, Type> named(Object... pairs) {
@@ -177,6 +175,7 @@ abstract class TypeTestCase extends TestCase {
};
final TestCompilerContext context = new TestCompilerContext() {
+ @Override
public void onError(DartCompilationError event) {
if (event.getErrorCode().getSubSystem() == SubSystem.STATIC_TYPE) {
getErrorCodes().add(event.getErrorCode());

Powered by Google App Engine
This is Rietveld 408576698