dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix a couple of things causing bot redness:

Browse Source 
- Migrate over built_in_identifier_test since it imports a helper
  library that was migrated.
- Fix some status file entries.

Also:

- Removed some old commented out status entries.
- Fix a bug in migration script.

R=jcollins@google.com

Review-Url: https://codereview.chromium.org/2992903002 .
This commit is contained in:
Bob Nystrom
2017-08-02 14:54:06 -07:00
parent 4f7cfa9a97
commit dbd48de07d
6 changed files with 39 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/language/language_dart2js.status
-2
View File
@@ -587,8 +587,6 @@ bound_closure_equality_test: Crash
bound_closure_primitives_test: Crash
branch_canonicalization_test: RuntimeError
break_test: Crash
built_in_identifier_test/01: Crash
built_in_identifier_test/none: Crash
call_closurization_test: Crash
call_constructor_on_unresolvable_class_test/07: Crash
call_function_apply_test: Crash
tests/language_strong/built_in_identifier_prefix_test.dart → tests/language_2/built_in_identifier_prefix_test.dart
View File
tests/language/built_in_identifier_test.dart → tests/language_2/built_in_identifier_test.dart
+24 -24
View File
@@ -10,11 +10,11 @@ class PseudoKWTest {
// This is a list of built-in identifiers from the Dart spec.
// It sanity checks that these pseudo-keywords are legal identifiers.
var abstract = 0; // //# 01: ok
var abstract = 0; //# 01: ok
var as = 0;
var dynamic = 0;
var export = 0;
var external = 0; // //# 01: ok
var external = 0; //# 01: ok
var factory = 0;
var get = 0;
var implements = 0;
@@ -23,7 +23,7 @@ class PseudoKWTest {
var operator = 0;
var part = 0;
var set = 0;
var static = 0; // //# 01: ok
var static = 0; //# 01: ok
var typedef = 0;
// "native" is a per-implementation extension that is not a part of the
@@ -35,7 +35,7 @@ class PseudoKWTest {
// attempt at complete coverage.
{
void factory(set) {
return; // //# 01: ok
return; //# 01: ok
}
}
@@ -45,16 +45,16 @@ class PseudoKWTest {
}
return
static + // //# 01: ok
static + //# 01: ok
library * operator;
}
}
typedef(x) => "typedef $x"; // //# 01: ok
typedef(x) => "typedef $x"; //# 01: ok
static(abstract) { // //# 01: ok
return abstract == true; // //# 01: ok
} // //# 01: ok
static(abstract) { //# 01: ok
return abstract == true; //# 01: ok
} //# 01: ok
class A {
var typedef = 0;
@@ -66,14 +66,14 @@ class A {
get() => typedef - 5;
static static() { // //# 01: ok
return 1; // //# 01: ok
} // //# 01: ok
static static() { //# 01: ok
return 1; //# 01: ok
} //# 01: ok
static check() {
var o = new A();
o.set(55);
Expect.equals(50, o.get());
static(); // //# 01: ok
static(); //# 01: ok
}
}
@@ -82,11 +82,11 @@ class B {
get get => set;
set get(get) => set = 2 * get.get;
static() { // //# 01: ok
var set = new B(); // //# 01: ok
set.get = set; // //# 01: ok
Expect.equals(200, set.get); // //# 01: ok
} // //# 01: ok
static() { //# 01: ok
var set = new B(); //# 01: ok
set.get = set; //# 01: ok
Expect.equals(200, set.get); //# 01: ok
} //# 01: ok
int operator() {
return 1;
}
@@ -102,13 +102,13 @@ class C {
main() {
PseudoKWTest.testMain();
A.check();
new B().static(); // //# 01: ok
new B().static(); //# 01: ok
Expect.equals(1, new B().operator());
Expect.equals(1, A.static()); // //# 01: ok
typedef("T"); // //# 01: ok
Expect.equals("typedef T", typedef("T")); // //# 01: ok
static("true"); // //# 01: ok
Expect.equals(false, static("true")); // //# 01: ok
Expect.equals(1, A.static()); //# 01: ok
typedef("T"); //# 01: ok
Expect.equals("typedef T", typedef("T")); //# 01: ok
static("true"); //# 01: ok
Expect.equals(false, static("true")); //# 01: ok
Expect.equals(5, C.operator);
Expect.equals(null, C.get);
C.set = 0;
tests/language_2/language_2.status
+14 -10
View File
@@ -566,6 +566,8 @@ bound_closure_equality_test: Crash
bound_closure_primitives_test: Crash
branch_canonicalization_test: RuntimeError
break_test: Crash
built_in_identifier_test/01: Crash
built_in_identifier_test/none: Crash
[ $compiler == dart2js && $runtime != none && $checked ]
assert_with_message_test: RuntimeError
@@ -686,20 +688,22 @@ async_star_no_cancel_test: Skip # Flutter Issue 9110
bool_check_test: RuntimeError # Issue 29647
bool_condition_check_test: RuntimeError
[ $compiler == precompiler && $runtime == dart_precompiled ]
bool_check_test: RuntimeError
[ $compiler == dart2analyzer ]
bad_initializer2_negative_test: fail # Issue 14880
black_listed_test/none: fail # Issue 14228
bad_initializer1_negative_test: CompileTimeError # Issue 14529
bad_named_constructor_negative_test: CompileTimeError # Issue 18693
body_less_constructor_wrong_arg_negative_test: CompileTimeError # Issue 18695
built_in_identifier_prefix_test: CompileTimeError
[ $strong ]
#bad_constructor_test: Skip
#bad_initializer1_negative_test: Skip
#bad_initializer2_negative_test: Skip
#bad_named_constructor_negative_test: Skip
#bad_named_parameters2_test: Skip
#bad_named_parameters_test: Skip
#bad_override_test: Skip
#black_listed_test: Skip
#body_less_constructor_wrong_arg_negative_test: Skip
[ $runtime == vm ]
built_in_identifier_prefix_test: CompileTimeError
[ $compiler == dart2js ]
built_in_identifier_prefix_test: CompileTimeError
[ $compiler == dartdevc ]
built_in_identifier_prefix_test: CompileTimeError
tests/language_strong/built_in_identifier_test.dart
-116
View File
@@ -1,116 +0,0 @@
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// Check that we can use pseudo keywords as names in function level code.
import "package:expect/expect.dart";
class PseudoKWTest {
static testMain() {
// This is a list of built-in identifiers from the Dart spec.
// It sanity checks that these pseudo-keywords are legal identifiers.
var abstract = 0; // //# 01: ok
var as = 0;
var dynamic = 0;
var export = 0;
var external = 0; // //# 01: ok
var factory = 0;
var get = 0;
var implements = 0;
var import = 0;
var library = 0;
var operator = 0;
var part = 0;
var set = 0;
var static = 0; // //# 01: ok
var typedef = 0;
// "native" is a per-implementation extension that is not a part of the
// Dart language. While it is not an official built-in identifier, it
// is useful to ensure that it remains a legal identifier.
var native = 0;
// The code below adds a few additional variants of usage without any
// attempt at complete coverage.
{
void factory(set) {
return; // //# 01: ok
}
}
get:
while (import > 0) {
break get;
}
return
static + // //# 01: ok
library * operator;
}
}
typedef(x) => "typedef $x"; // //# 01: ok
static(abstract) { // //# 01: ok
return abstract == true; // //# 01: ok
} // //# 01: ok
class A {
var typedef = 0;
final operator = "smooth";
set(x) {
typedef = x;
}
get() => typedef - 5;
static static() { // //# 01: ok
return 1; // //# 01: ok
} // //# 01: ok
static check() {
var o = new A();
o.set(55);
Expect.equals(50, o.get());
static(); // //# 01: ok
}
}
class B {
var set = 100;
get get => set;
set get(get) => set = 2 * get.get;
static() { // //# 01: ok
var set = new B(); // //# 01: ok
set.get = set; // //# 01: ok
Expect.equals(200, set.get); // //# 01: ok
} // //# 01: ok
int operator() {
return 1;
}
}
class C {
static int operator = (5);
static var get;
static get set => 111;
static set set(set) {}
}
main() {
PseudoKWTest.testMain();
A.check();
new B().static(); // //# 01: ok
Expect.equals(1, new B().operator());
Expect.equals(1, A.static()); // //# 01: ok
typedef("T"); // //# 01: ok
Expect.equals("typedef T", typedef("T")); // //# 01: ok
static("true"); // //# 01: ok
Expect.equals(false, static("true")); // //# 01: ok
Expect.equals(5, C.operator);
Expect.equals(null, C.get);
C.set = 0;
Expect.equals(111, C.set);
}
tools/migration/lib/src/fork.dart
+1 -1
View File
@@ -113,7 +113,7 @@ class Fork {
var todos = <String>[];
if (!oneExists && !twoExists) {
if (!oneExists && !strongExists) {
// It's already been migrated, so there's nothing to move.
note("Is already migrated.");
} else if (twoExists) {