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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11293058: Issue 5157. Introduce TypeQuality. Try to find member in subclasses. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 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
« compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java ('K') | « compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java
diff --git a/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java b/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java
index 2a08cf14f47ef2b07bae20b2acc86ad3f3ce6c93..b2de6fd1ef57a4995cb7f8568804840a65d48379 100644
--- a/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java
+++ b/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java
@@ -4,7 +4,6 @@
package com.google.dart.compiler.type;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.dart.compiler.CommandLineOptions.CompilerOptions;
import com.google.dart.compiler.CompilerTestCase;
@@ -48,6 +47,9 @@ import com.google.dart.compiler.resolver.TypeErrorCode;
import static com.google.dart.compiler.common.ErrorExpectation.assertErrors;
import static com.google.dart.compiler.common.ErrorExpectation.errEx;
+import static com.google.dart.compiler.type.TypeQuality.INFERRED;
+import static com.google.dart.compiler.type.TypeQuality.INFERRED_EXACT;
+import static com.google.dart.compiler.type.TypeQuality.EXACT;
import java.net.URI;
import java.util.List;
@@ -1937,23 +1939,23 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
* http://code.google.com/p/dart/issues/detail?id=4460
*/
public void test_inferredTypes_noMemberWarnings_forInLoop() throws Exception {
- compilerConfiguration = new DefaultCompilerConfiguration(new CompilerOptions() {
- @Override
- public boolean typeChecksForInferredTypes() {
- return false;
- }
- });
- AnalyzeLibraryResult result = analyzeLibrary(
- "// filler filler filler filler filler filler filler filler filler filler",
- "class A {}",
- "foo() {",
- " List<A> values;",
- " for (var v in values) {",
- " v.bar();",
- " }",
- "}",
- "");
- assertErrors(result.getErrors());
+ compilerConfiguration = new DefaultCompilerConfiguration(new CompilerOptions() {
+ @Override
+ public boolean typeChecksForInferredTypes() {
+ return false;
+ }
+ });
+ AnalyzeLibraryResult result = analyzeLibrary(
+ "// filler filler filler filler filler filler filler filler filler filler",
+ "class A {}",
+ "foo() {",
+ " List<A> values;",
+ " for (var v in values) {",
+ " v.bar();",
+ " }",
+ "}",
+ "");
+ assertErrors(result.getErrors());
}
public void test_inferredTypes_whenInvocationArgument_checkAssignable() throws Exception {
@@ -2029,21 +2031,14 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v7 = new Map().length;",
"}",
"");
- // prepare expected results
- List<String> expectedList = Lists.newArrayList();
- expectedList.add("bool");
- expectedList.add("bool");
- expectedList.add("int");
- expectedList.add("int");
- expectedList.add("double");
- expectedList.add("double");
- expectedList.add("Map<String, int>");
- expectedList.add("int");
- // check each "v" type
- for (int i = 0; i < expectedList.size(); i++) {
- String expectedTypeString = expectedList.get(i);
- assertInferredElementTypeString(testUnit, "v" + i, expectedTypeString);
- }
+ assertInferredElementTypeString(testUnit, "v0", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v4", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v5", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v6", "Map<String, int>", INFERRED);
+ assertInferredElementTypeString(testUnit, "v7", "int", INFERRED_EXACT);
}
/**
@@ -2062,8 +2057,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
assertErrors(libraryResult.getErrors());
- assertInferredElementTypeString(testUnit, "v1", "B");
- assertInferredElementTypeString(testUnit, "v2", "B");
+ assertInferredElementTypeString(testUnit, "v1", "B", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "B", INFERRED_EXACT);
}
public void test_typesPropagation_multiAssign() throws Exception {
@@ -2076,8 +2071,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v2 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "bool");
- assertInferredElementTypeString(testUnit, "v2", "int");
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "int", INFERRED_EXACT);
}
public void test_typesPropagation_multiAssign_noInitialValue() throws Exception {
@@ -2089,7 +2084,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "int");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED_EXACT);
}
public void test_typesPropagation_multiAssign_IfThen() throws Exception {
@@ -2105,9 +2100,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v3 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "bool");
- assertInferredElementTypeString(testUnit, "v2", "int");
- assertInferredElementTypeString(testUnit, "v3", "Object");
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "Object", INFERRED);
}
public void test_typesPropagation_multiAssign_IfThenElse() throws Exception {
@@ -2131,10 +2126,10 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var d1 = d;",
"}",
"");
- assertInferredElementTypeString(testUnit, "a1", "int");
- assertInferredElementTypeString(testUnit, "b1", "Object");
- assertInferredElementTypeString(testUnit, "c1", "Object");
- assertInferredElementTypeString(testUnit, "d1", "bool");
+ assertInferredElementTypeString(testUnit, "a1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "b1", "Object", INFERRED);
+ assertInferredElementTypeString(testUnit, "c1", "Object", INFERRED);
+ assertInferredElementTypeString(testUnit, "d1", "bool", INFERRED_EXACT);
}
public void test_typesPropagation_multiAssign_IfThenElse_whenAsTypeCondition() throws Exception {
@@ -2150,9 +2145,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v3 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
- assertInferredElementTypeString(testUnit, "v2", "dynamic");
- assertInferredElementTypeString(testUnit, "v3", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "dynamic", EXACT);
}
public void test_typesPropagation_multiAssign_While() throws Exception {
@@ -2169,10 +2164,10 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v4 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "bool");
- assertInferredElementTypeString(testUnit, "v2", "bool");
- assertInferredElementTypeString(testUnit, "v3", "int");
- assertInferredElementTypeString(testUnit, "v4", "Object");
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v4", "Object", INFERRED);
}
public void test_typesPropagation_multiAssign_DoWhile() throws Exception {
@@ -2189,10 +2184,10 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v4 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "bool");
- assertInferredElementTypeString(testUnit, "v2", "bool");
- assertInferredElementTypeString(testUnit, "v3", "int");
- assertInferredElementTypeString(testUnit, "v4", "int");
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v4", "int", INFERRED_EXACT);
}
public void test_typesPropagation_multiAssign_For() throws Exception {
@@ -2209,10 +2204,10 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v4 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "bool");
- assertInferredElementTypeString(testUnit, "v2", "bool");
- assertInferredElementTypeString(testUnit, "v3", "int");
- assertInferredElementTypeString(testUnit, "v4", "Object");
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v4", "Object", INFERRED);
}
public void test_typesPropagation_multiAssign_ForIn() throws Exception {
@@ -2230,10 +2225,10 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v4 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "bool");
- assertInferredElementTypeString(testUnit, "v2", "bool");
- assertInferredElementTypeString(testUnit, "v3", "int");
- assertInferredElementTypeString(testUnit, "v4", "Object");
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v4", "Object", INFERRED);
}
/**
@@ -2255,8 +2250,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var b1 = b;",
"}",
"");
- assertInferredElementTypeString(testUnit, "a1", "List<Object>");
- assertInferredElementTypeString(testUnit, "b1", "List<Object>");
+ assertInferredElementTypeString(testUnit, "a1", "List<Object>", INFERRED);
+ assertInferredElementTypeString(testUnit, "b1", "List<Object>", INFERRED);
}
/**
@@ -2278,8 +2273,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var b1 = b;",
"}",
"");
- assertInferredElementTypeString(testUnit, "a1", "List<String>");
- assertInferredElementTypeString(testUnit, "b1", "List<String>");
+ assertInferredElementTypeString(testUnit, "a1", "List<String>", INFERRED);
+ assertInferredElementTypeString(testUnit, "b1", "List<String>", INFERRED);
}
/**
@@ -2299,9 +2294,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v3 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
- assertInferredElementTypeString(testUnit, "v2", "String");
- assertInferredElementTypeString(testUnit, "v3", "String");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "String", INFERRED);
}
/**
@@ -2331,8 +2326,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v2 = new Unknown.name();",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
- assertInferredElementTypeString(testUnit, "v2", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "dynamic", EXACT);
}
public void test_typesPropagation_ifAsType() throws Exception {
@@ -2345,8 +2340,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v2 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
- assertInferredElementTypeString(testUnit, "v2", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "dynamic", EXACT);
}
/**
@@ -2363,8 +2358,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v2 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
- assertInferredElementTypeString(testUnit, "v2", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "dynamic", EXACT);
}
public void test_typesPropagation_ifIsType() throws Exception {
@@ -2379,9 +2374,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v3 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "List<String>");
- assertInferredElementTypeString(testUnit, "v2", "Map<int, String>");
- assertInferredElementTypeString(testUnit, "v3", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "List<String>", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "Map<int, String>", INFERRED);
+ assertInferredElementTypeString(testUnit, "v3", "dynamic", EXACT);
}
/**
@@ -2403,9 +2398,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "a1", "int");
- assertInferredElementTypeString(testUnit, "a2", "int");
- assertInferredElementTypeString(testUnit, "b1", "int");
+ assertInferredElementTypeString(testUnit, "a1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "a2", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "b1", "int", INFERRED);
}
/**
@@ -2420,7 +2415,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "[int, String]");
+ assertInferredElementTypeString(testUnit, "v1", "[int, String]", INFERRED);
}
public void test_typesPropagation_ifIsType_negation() throws Exception {
@@ -2437,9 +2432,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
- assertInferredElementTypeString(testUnit, "v2", "dynamic");
- assertInferredElementTypeString(testUnit, "v3", "String");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "String", INFERRED);
}
public void test_typesPropagation_ifIsType_and() throws Exception {
@@ -2452,8 +2447,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "a1", "String");
- assertInferredElementTypeString(testUnit, "b1", "List<String>");
+ assertInferredElementTypeString(testUnit, "a1", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "b1", "List<String>", INFERRED);
}
public void test_typesPropagation_ifIsType_or() throws Exception {
@@ -2468,8 +2463,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
- assertInferredElementTypeString(testUnit, "v2", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "dynamic", EXACT);
}
public void test_typesPropagation_whileIsType() throws Exception {
@@ -2483,8 +2478,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v2 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
- assertInferredElementTypeString(testUnit, "v2", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "dynamic", EXACT);
}
public void test_typesPropagation_forIsType() throws Exception {
@@ -2498,9 +2493,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v3 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
- assertInferredElementTypeString(testUnit, "v2", "String");
- assertInferredElementTypeString(testUnit, "v3", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "v3", "dynamic", EXACT);
}
public void test_typesPropagation_forEach() throws Exception {
@@ -2513,7 +2508,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
}
public void test_typesPropagation_ifIsNotType_withElse() throws Exception {
@@ -2529,11 +2524,11 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
// we don't know type, but not String
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
// we know that String
- assertInferredElementTypeString(testUnit, "v2", "String");
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED);
// again, we don't know after "if"
- assertInferredElementTypeString(testUnit, "v3", "dynamic");
+ assertInferredElementTypeString(testUnit, "v3", "dynamic", EXACT);
}
public void test_typesPropagation_ifIsNotType_hasThenReturn() throws Exception {
@@ -2547,8 +2542,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v2 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
- assertInferredElementTypeString(testUnit, "v2", "String");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED);
}
public void test_typesPropagation_ifIsNotType_hasThenThrow() throws Exception {
@@ -2561,7 +2556,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
}
public void test_typesPropagation_ifIsNotType_emptyThen() throws Exception {
@@ -2573,7 +2568,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
}
public void test_typesPropagation_ifIsNotType_otherThen() throws Exception {
@@ -2586,7 +2581,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
}
public void test_typesPropagation_ifIsNotType_hasThenThrow_withCatch() throws Exception {
@@ -2602,7 +2597,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
}
public void test_typesPropagation_ifIsNotType_hasThenContinue() throws Exception {
@@ -2619,8 +2614,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
assertErrors(libraryResult.getErrors());
- assertInferredElementTypeString(testUnit, "v1", "Object");
- assertInferredElementTypeString(testUnit, "v2", "String");
+ assertInferredElementTypeString(testUnit, "v1", "Object", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED);
}
public void test_typesPropagation_ifIsNotType_hasThenBreak() throws Exception {
@@ -2637,8 +2632,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
assertErrors(libraryResult.getErrors());
- assertInferredElementTypeString(testUnit, "v1", "Object");
- assertInferredElementTypeString(testUnit, "v2", "String");
+ assertInferredElementTypeString(testUnit, "v1", "Object", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED);
}
public void test_typesPropagation_ifIsNotType_or() throws Exception {
@@ -2652,8 +2647,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v2 = p2;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "int");
- assertInferredElementTypeString(testUnit, "v2", "String");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED);
}
public void test_typesPropagation_ifIsNotType_and() throws Exception {
@@ -2666,7 +2661,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
}
public void test_typesPropagation_ifIsNotType_not() throws Exception {
@@ -2679,7 +2674,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
}
public void test_typesPropagation_ifIsNotType_not2() throws Exception {
@@ -2692,7 +2687,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
}
public void test_typesPropagation_ifNotIsType() throws Exception {
@@ -2705,7 +2700,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = v;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "String");
+ assertInferredElementTypeString(testUnit, "v1", "String", INFERRED);
}
/**
@@ -2728,14 +2723,14 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
// we don't know type initially
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
// after "assert" all next statements know type
- assertInferredElementTypeString(testUnit, "v2", "String");
- assertInferredElementTypeString(testUnit, "v3", "String");
+ assertInferredElementTypeString(testUnit, "v2", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "v3", "String", INFERRED);
// type is set to unknown only when we exit control Block, not just any Block
- assertInferredElementTypeString(testUnit, "v4", "String");
+ assertInferredElementTypeString(testUnit, "v4", "String", INFERRED);
// we exited "if" Block, so "assert" may be was not executed, so we don't know type
- assertInferredElementTypeString(testUnit, "v5", "dynamic");
+ assertInferredElementTypeString(testUnit, "v5", "dynamic", EXACT);
}
/**
@@ -2758,14 +2753,14 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
// we don't know type initially
- assertInferredElementTypeString(testUnit, "a1", "dynamic");
- assertInferredElementTypeString(testUnit, "b1", "dynamic");
+ assertInferredElementTypeString(testUnit, "a1", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "b1", "dynamic", EXACT);
// after "assert" all next statements know type
- assertInferredElementTypeString(testUnit, "a2", "String");
- assertInferredElementTypeString(testUnit, "b2", "String");
+ assertInferredElementTypeString(testUnit, "a2", "String", INFERRED);
+ assertInferredElementTypeString(testUnit, "b2", "String", INFERRED);
// we exited "if" Block, so "assert" may be was not executed, so we don't know type
- assertInferredElementTypeString(testUnit, "a3", "dynamic");
- assertInferredElementTypeString(testUnit, "b3", "dynamic");
+ assertInferredElementTypeString(testUnit, "a3", "dynamic", EXACT);
+ assertInferredElementTypeString(testUnit, "b3", "dynamic", EXACT);
}
/**
@@ -2794,10 +2789,10 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "B");
- assertInferredElementTypeString(testUnit, "v2", "B");
- assertInferredElementTypeString(testUnit, "v3", "C");
- assertInferredElementTypeString(testUnit, "v4", "[B, String]");
+ assertInferredElementTypeString(testUnit, "v1", "B", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "B", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "C", INFERRED);
+ assertInferredElementTypeString(testUnit, "v4", "[B, String]", INFERRED);
}
public void test_typesPropagation_field_inClass_final() throws Exception {
@@ -2808,8 +2803,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" final v2 = 1 + 2.0;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "int");
- assertInferredElementTypeString(testUnit, "v2", "double");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "double", INFERRED_EXACT);
}
public void test_typesPropagation_field_inClass_const() throws Exception {
@@ -2820,8 +2815,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" final v2 = 1 + 2.0;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "int");
- assertInferredElementTypeString(testUnit, "v2", "double");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "double", INFERRED_EXACT);
}
/**
@@ -2835,7 +2830,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v1 = 123;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
}
public void test_typesPropagation_field_topLevel_final() throws Exception {
@@ -2844,8 +2839,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"final v1 = 123;",
"final v2 = 1 + 2.0;",
"");
- assertInferredElementTypeString(testUnit, "v1", "int");
- assertInferredElementTypeString(testUnit, "v2", "double");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "double", INFERRED_EXACT);
}
public void test_typesPropagation_field_topLevel_const() throws Exception {
@@ -2854,8 +2849,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"const v1 = 123;",
"const v2 = 1 + 2.0;",
"");
- assertInferredElementTypeString(testUnit, "v1", "int");
- assertInferredElementTypeString(testUnit, "v2", "double");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "double", INFERRED_EXACT);
}
/**
@@ -2867,7 +2862,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"// filler filler filler filler filler filler filler filler filler filler",
"var v1 = 123;",
"");
- assertInferredElementTypeString(testUnit, "v1", "dynamic");
+ assertInferredElementTypeString(testUnit, "v1", "dynamic", EXACT);
}
public void test_typesPropagation_FunctionAliasType() throws Exception {
@@ -2880,7 +2875,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"",
"");
- assertInferredElementTypeString(testUnit, "v", "F");
+ assertInferredElementTypeString(testUnit, "v", "F", INFERRED_EXACT);
}
/**
@@ -2904,7 +2899,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" });",
"}",
"");
- assertInferredElementTypeString(testUnit, "v", "Event");
+ assertInferredElementTypeString(testUnit, "v", "Event", INFERRED);
}
/**
@@ -2924,7 +2919,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" });",
"}",
"");
- assertInferredElementTypeString(testUnit, "v", "Event");
+ assertInferredElementTypeString(testUnit, "v", "Event", INFERRED);
}
/**
@@ -2944,7 +2939,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" });",
"}",
"");
- assertInferredElementTypeString(testUnit, "v", "Event");
+ assertInferredElementTypeString(testUnit, "v", "Event", INFERRED);
}
/**
@@ -2966,7 +2961,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" });",
"}",
"");
- assertInferredElementTypeString(testUnit, "v", "Event");
+ assertInferredElementTypeString(testUnit, "v", "Event", INFERRED);
}
/**
@@ -2988,7 +2983,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" });",
"}",
"");
- assertInferredElementTypeString(testUnit, "v", "Event");
+ assertInferredElementTypeString(testUnit, "v", "Event", INFERRED);
}
public void test_typesPropagation_parameterOfClosure_assignVariable() throws Exception {
@@ -3012,8 +3007,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" }",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "Event");
- assertInferredElementTypeString(testUnit, "v2", "Event");
+ assertInferredElementTypeString(testUnit, "v1", "Event", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "Event", INFERRED);
}
public void test_typesPropagation_parameterOfClosure_assignField() throws Exception {
@@ -3044,9 +3039,9 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v3 = e;",
"};",
"");
- assertInferredElementTypeString(testUnit, "v1", "Event");
- assertInferredElementTypeString(testUnit, "v2", "Event");
- assertInferredElementTypeString(testUnit, "v3", "Event");
+ assertInferredElementTypeString(testUnit, "v1", "Event", INFERRED);
+ assertInferredElementTypeString(testUnit, "v2", "Event", INFERRED);
+ assertInferredElementTypeString(testUnit, "v3", "Event", INFERRED);
}
/**
@@ -3114,23 +3109,23 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v17 = arg as int",
"}",
"");
- assertInferredElementTypeString(testUnit, "v1", "int");
- assertInferredElementTypeString(testUnit, "v2", "int");
- assertInferredElementTypeString(testUnit, "v3", "int");
- assertInferredElementTypeString(testUnit, "v4", "int");
- assertInferredElementTypeString(testUnit, "v5", "int");
- assertInferredElementTypeString(testUnit, "v6", "double");
- assertInferredElementTypeString(testUnit, "v7", "double");
- assertInferredElementTypeString(testUnit, "v8", "double");
- assertInferredElementTypeString(testUnit, "v9", "double");
- assertInferredElementTypeString(testUnit, "v10", "double");
- assertInferredElementTypeString(testUnit, "v11", "double");
- assertInferredElementTypeString(testUnit, "v12", "double");
- assertInferredElementTypeString(testUnit, "v13", "double");
- assertInferredElementTypeString(testUnit, "v14", "double");
- assertInferredElementTypeString(testUnit, "v15", "double");
- assertInferredElementTypeString(testUnit, "v16", "double");
- assertInferredElementTypeString(testUnit, "v17", "int");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v3", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v4", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v5", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v6", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v7", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v8", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v9", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v10", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v11", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v12", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v13", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v14", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v15", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v16", "double", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v17", "int", INFERRED);
}
/**
@@ -3187,8 +3182,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
assertErrors(libraryResult.getErrors());
- assertInferredElementTypeString(testUnit, "v1", "int");
- assertInferredElementTypeString(testUnit, "v2", "bool");
+ assertInferredElementTypeString(testUnit, "v1", "int", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "bool", INFERRED_EXACT);
}
public void test_getType_getterInNegation_generic() throws Exception {
@@ -3212,8 +3207,8 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"}",
"");
assertErrors(libraryResult.getErrors());
- assertInferredElementTypeString(testUnit, "v1", "bool");
- assertInferredElementTypeString(testUnit, "v2", "bool");
+ assertInferredElementTypeString(testUnit, "v1", "bool", INFERRED_EXACT);
+ assertInferredElementTypeString(testUnit, "v2", "bool", INFERRED_EXACT);
}
public void test_getType_getterInSwitch_default() throws Exception {
@@ -4336,7 +4331,7 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
" var v = s..length;",
"}",
"");
- assertInferredElementTypeString(testUnit, "v", "String");
+ assertInferredElementTypeString(testUnit, "v", "String", INFERRED_EXACT);
}
/**
@@ -5406,4 +5401,37 @@ public class TypeAnalyzerCompilerTest extends CompilerTestCase {
"");
assertErrors(result.getErrors());
}
+
+ /**
+ * <p>
+ * http://code.google.com/p/dart/issues/detail?id=5157
+ */
+ public void test_trySubTypeMember_forInferredType() throws Exception {
+ compilerConfiguration = new DefaultCompilerConfiguration(new CompilerOptions() {
+ @Override
+ public boolean typeChecksForInferredTypes() {
+ return true;
+ }
+ });
+ AnalyzeLibraryResult result = analyzeLibrary(
+ "// filler filler filler filler filler filler filler filler filler filler",
+ "class Event {}",
+ "class MouseEvent extends Event {",
+ " int clientX;",
+ " void stop() {}",
+ "}",
+ "typedef Listener(Event event);",
+ "class Button {",
+ " addListener(Listener listener) {}",
+ "}",
+ "main() {",
+ " Button button = new Button();",
+ " button.addListener((event) {",
+ " event.clientX;",
+ " event.stop();",
+ " });",
+ "}",
+ "");
+ assertErrors(result.getErrors());
+ }
}
« compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java ('K') | « compiler/javatests/com/google/dart/compiler/end2end/inc/IncrementalCompilation2Test.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698