Use dynamic to fix string_interpolate_test
Change-Id: I48f7b1127e5c61f9c399ac32d7118adc110a6519
Reviewed-on: https://dart-review.googlesource.com/60846
Reviewed-by: Lasse R.H. Nielsen <lrn@google.com>
Commit-Queue: Peter von der Ahé <ahe@google.com>
diff --git a/tests/language_2/language_2_analyzer.status b/tests/language_2/language_2_analyzer.status
index 671b37d..a8deafd 100644
--- a/tests/language_2/language_2_analyzer.status
+++ b/tests/language_2/language_2_analyzer.status
@@ -582,7 +582,6 @@
static_getter_no_setter3_test/01: MissingCompileTimeError
static_initializer_type_error_test: MissingCompileTimeError
static_setter_get_test/01: MissingCompileTimeError
-string_interpolate_test: StaticWarning
string_test/01: MissingCompileTimeError
string_unicode1_negative_test: CompileTimeError
string_unicode2_negative_test: CompileTimeError
@@ -1026,7 +1025,6 @@
static_getter_no_setter3_test/01: MissingCompileTimeError
static_initializer_type_error_test: MissingCompileTimeError
static_setter_get_test/01: MissingCompileTimeError
-string_interpolate_test: StaticWarning
string_test/01: MissingCompileTimeError
string_unicode1_negative_test: CompileTimeError
string_unicode2_negative_test: CompileTimeError
@@ -1165,7 +1163,6 @@
regress_30339_test: CompileTimeError
reify_typevar_static_test/00: MissingCompileTimeError # Issue 28823
setter_override2_test/02: MissingCompileTimeError # Issue 14736
-string_interpolate_test: CompileTimeError
string_split_test: CompileTimeError
string_supertype_checked_test: CompileTimeError
string_unicode1_negative_test: CompileTimeError
diff --git a/tests/language_2/language_2_dart2js.status b/tests/language_2/language_2_dart2js.status
index fae79c4..954e2fc 100644
--- a/tests/language_2/language_2_dart2js.status
+++ b/tests/language_2/language_2_dart2js.status
@@ -796,7 +796,6 @@
stacktrace_rethrow_error_test/withtraceparameter: RuntimeError # Issue 12698
stacktrace_rethrow_nonerror_test: RuntimeError # Issue 12698
stacktrace_test: RuntimeError # Issue 12698
-string_interpolate_test: CompileTimeError
string_interpolation_and_buffer_test: RuntimeError
string_split_test: CompileTimeError
string_supertype_checked_test: CompileTimeError
@@ -1263,7 +1262,6 @@
stacktrace_rethrow_error_test/withtraceparameter: RuntimeError # Issue 12698
stacktrace_rethrow_nonerror_test: RuntimeError # Issue 12698
stacktrace_test: RuntimeError # Issue 12698
-string_interpolate_test: CompileTimeError
string_interpolation_and_buffer_test: RuntimeError
string_split_test: CompileTimeError
string_supertype_checked_test: CompileTimeError
@@ -1779,7 +1777,6 @@
stacktrace_rethrow_error_test/withtraceparameter: RuntimeError # Issue 12698
stacktrace_rethrow_nonerror_test: RuntimeError # Issue 12698
stacktrace_test: RuntimeError # Issue 12698
-string_interpolate_test: CompileTimeError
string_interpolation_and_buffer_test: RuntimeError
string_split_test: CompileTimeError
string_supertype_checked_test: CompileTimeError
diff --git a/tests/language_2/language_2_dartdevc.status b/tests/language_2/language_2_dartdevc.status
index 8486271..278d7f4 100644
--- a/tests/language_2/language_2_dartdevc.status
+++ b/tests/language_2/language_2_dartdevc.status
@@ -158,7 +158,6 @@
reify_typevar_static_test/00: MissingCompileTimeError # Issue 29920
setter_override2_test/02: MissingCompileTimeError # Issue 14736
stacktrace_test: RuntimeError # Issue 29920
-string_interpolate_test: CompileTimeError
string_split_test: CompileTimeError
string_supertype_checked_test: CompileTimeError
super_bound_closure_test/none: CompileTimeError
@@ -550,7 +549,6 @@
setter_override_test/01: MissingCompileTimeError
setter_override_test/02: MissingCompileTimeError
setter_override_test/03: MissingCompileTimeError
-string_interpolate_test: CompileTimeError # Issue 31533
string_split_test: CompileTimeError # Issue 31616
string_supertype_checked_test: CompileTimeError # Issue 31616
super_bound_closure_test/none: CompileTimeError # Issue 31533
diff --git a/tests/language_2/language_2_kernel.status b/tests/language_2/language_2_kernel.status
index d5c998a..1ee5b90 100644
--- a/tests/language_2/language_2_kernel.status
+++ b/tests/language_2/language_2_kernel.status
@@ -146,7 +146,6 @@
regress_29025_test: CompileTimeError
regress_29405_test: CompileTimeError
regress_30339_test: CompileTimeError
-string_interpolate_test: CompileTimeError
string_interpolation_and_buffer_test: RuntimeError
string_split_test: CompileTimeError
string_supertype_checked_test: CompileTimeError
@@ -830,7 +829,6 @@
regress_29025_test: CompileTimeError # Issue 31402 (Variable declaration)
regress_29405_test: CompileTimeError # Issue 31402 (Invocation arguments)
regress_30339_test: CompileTimeError # Issue 31402 (Variable declaration)
-string_interpolate_test: CompileTimeError # Issue 31533
string_interpolation_and_buffer_test: RuntimeError # Issue 31402 (Return and yield statements)
string_split_test: CompileTimeError # Issue 31616
string_supertype_checked_test: CompileTimeError # Issue 31616
@@ -1191,7 +1189,6 @@
setter_override_test/00: MissingCompileTimeError # Issue 32613: override check is missing in CFE.
setter_override_test/03: MissingCompileTimeError # Issue 32613: override check is missing in CFE.
stacktrace_demangle_ctors_test: RuntimeError
-string_interpolate_test: CompileTimeError # Issue 31533
string_interpolation_and_buffer_test: RuntimeError # Issue 31402 (Return and yield statements)
string_split_test: CompileTimeError # Issue 31616
string_supertype_checked_test: CompileTimeError # Issue 31616
@@ -1387,7 +1384,6 @@
setter_no_getter_test/01: CompileTimeError
setter_override_test/00: MissingCompileTimeError
setter_override_test/03: MissingCompileTimeError
-string_interpolate_test: CompileTimeError
string_split_test: CompileTimeError
string_supertype_checked_test: CompileTimeError
super_bound_closure_test/none: CompileTimeError
diff --git a/tests/language_2/string_interpolate_test.dart b/tests/language_2/string_interpolate_test.dart
index 563a434..769ee94 100644
--- a/tests/language_2/string_interpolate_test.dart
+++ b/tests/language_2/string_interpolate_test.dart
@@ -6,13 +6,12 @@
import "package:expect/expect.dart";
class WhatchamaCallIt {
-
- String get name => "";
-
WhatchamaCallIt() {}
String foo() {
// Test $this and Field name is defined in subclass.
+ dynamic self = this;
+ dynamic name = self.name;
return "$this and $name";
}
}
@@ -20,7 +19,7 @@
class ThingamaBob extends WhatchamaCallIt {
ThingamaBob(String s)
: name = s,
- super() {}
+ super();
String name;
toString() => "Hansel";
}
@@ -56,7 +55,7 @@
print(s);
Expect.equals(r"eins und 1 macht zwei.", s);
- var t = new ThingamaBob("Gretel");
+ dynamic t = new ThingamaBob("Gretel");
print(t.foo());
Expect.equals(t.foo(), "Hansel and Gretel");
@@ -73,8 +72,8 @@
void testStringVariants() {
String latin = "ab\x00\xff";
String nonLatin = "\u2000\u{10000}\ufeff";
- Object oLatin = new Stringable(latin);
- Object oNonLatin = new Stringable(nonLatin);
+ dynamic oLatin = new Stringable(latin);
+ dynamic oNonLatin = new Stringable(nonLatin);
// ASCII.
Expect.equals(latin * 3, "$latin$latin$latin");
