From 56ca547c8c90f2802e522e189284e46e1b40e1c1 Mon Sep 17 00:00:00 2001 From: Robert Nystrom Date: Tue, 4 Feb 2020 09:52:03 +0000 Subject: [PATCH] Migrate language_2/accessor_conflict to NNBD. Change-Id: I136befc5fa77bfa2a118f9bd032250abcde2da68 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134222 Auto-Submit: Bob Nystrom Commit-Queue: Erik Ernst Reviewed-by: Erik Ernst --- .../accessor_conflict/export2_helper.dart | 6 ++++++ .../accessor_conflict/export2_test.dart | 18 ++++++++++++++++++ .../accessor_conflict/export_helper.dart | 6 ++++++ .../accessor_conflict/export_test.dart | 18 ++++++++++++++++++ tests/language/accessor_conflict/getter.dart | 7 +++++++ .../accessor_conflict/import2_test.dart | 18 ++++++++++++++++++ .../import_prefixed2_test.dart | 18 ++++++++++++++++++ .../import_prefixed_test.dart | 18 ++++++++++++++++++ .../accessor_conflict/import_test.dart | 18 ++++++++++++++++++ tests/language/accessor_conflict/setter.dart | 9 +++++++++ 10 files changed, 136 insertions(+) create mode 100644 tests/language/accessor_conflict/export2_helper.dart create mode 100644 tests/language/accessor_conflict/export2_test.dart create mode 100644 tests/language/accessor_conflict/export_helper.dart create mode 100644 tests/language/accessor_conflict/export_test.dart create mode 100644 tests/language/accessor_conflict/getter.dart create mode 100644 tests/language/accessor_conflict/import2_test.dart create mode 100644 tests/language/accessor_conflict/import_prefixed2_test.dart create mode 100644 tests/language/accessor_conflict/import_prefixed_test.dart create mode 100644 tests/language/accessor_conflict/import_test.dart create mode 100644 tests/language/accessor_conflict/setter.dart diff --git a/tests/language/accessor_conflict/export2_helper.dart b/tests/language/accessor_conflict/export2_helper.dart new file mode 100644 index 00000000000..78278214a6c --- /dev/null +++ b/tests/language/accessor_conflict/export2_helper.dart @@ -0,0 +1,6 @@ +// Copyright (c) 2016, 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. + +export "setter.dart"; +export "getter.dart"; diff --git a/tests/language/accessor_conflict/export2_test.dart b/tests/language/accessor_conflict/export2_test.dart new file mode 100644 index 00000000000..58a1a771b34 --- /dev/null +++ b/tests/language/accessor_conflict/export2_test.dart @@ -0,0 +1,18 @@ +// Copyright (c) 2016, 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. + +// Verify that a getter and its corresponding setter can be imported from two +// different files via a common export. In this test the setter is imported +// first. + +import "package:expect/expect.dart"; + +import "export2_helper.dart"; + +main() { + getValue = 123; + Expect.equals(x, 123); + x = 456; + Expect.equals(setValue, 456); +} diff --git a/tests/language/accessor_conflict/export_helper.dart b/tests/language/accessor_conflict/export_helper.dart new file mode 100644 index 00000000000..ef024375936 --- /dev/null +++ b/tests/language/accessor_conflict/export_helper.dart @@ -0,0 +1,6 @@ +// Copyright (c) 2016, 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. + +export "getter.dart"; +export "setter.dart"; diff --git a/tests/language/accessor_conflict/export_test.dart b/tests/language/accessor_conflict/export_test.dart new file mode 100644 index 00000000000..babde007887 --- /dev/null +++ b/tests/language/accessor_conflict/export_test.dart @@ -0,0 +1,18 @@ +// Copyright (c) 2016, 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. + +// Verify that a getter and its corresponding setter can be imported from two +// different files via a common export. In this test the getter is imported +// first. + +import "package:expect/expect.dart"; + +import "export_helper.dart"; + +main() { + getValue = 123; + Expect.equals(x, 123); + x = 456; + Expect.equals(setValue, 456); +} diff --git a/tests/language/accessor_conflict/getter.dart b/tests/language/accessor_conflict/getter.dart new file mode 100644 index 00000000000..5b8d72fad77 --- /dev/null +++ b/tests/language/accessor_conflict/getter.dart @@ -0,0 +1,7 @@ +// Copyright (c) 2016, 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. + +var getValue; + +get x => getValue; diff --git a/tests/language/accessor_conflict/import2_test.dart b/tests/language/accessor_conflict/import2_test.dart new file mode 100644 index 00000000000..874b3210aaf --- /dev/null +++ b/tests/language/accessor_conflict/import2_test.dart @@ -0,0 +1,18 @@ +// Copyright (c) 2016, 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. + +// Verify that a getter and its corresponding setter can be imported from two +// different files. In this test the setter is imported first. + +import "package:expect/expect.dart"; + +import "setter.dart"; +import "getter.dart"; + +main() { + getValue = 123; + Expect.equals(x, 123); + x = 456; + Expect.equals(setValue, 456); +} diff --git a/tests/language/accessor_conflict/import_prefixed2_test.dart b/tests/language/accessor_conflict/import_prefixed2_test.dart new file mode 100644 index 00000000000..283decf07c1 --- /dev/null +++ b/tests/language/accessor_conflict/import_prefixed2_test.dart @@ -0,0 +1,18 @@ +// Copyright (c) 2016, 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. + +// Verify that a getter and its corresponding setter can be imported from two +// different files. In this test the setter is imported first. + +import "package:expect/expect.dart"; + +import "setter.dart" as p; +import "getter.dart" as p; + +main() { + p.getValue = 123; + Expect.equals(p.x, 123); + p.x = 456; + Expect.equals(p.setValue, 456); +} diff --git a/tests/language/accessor_conflict/import_prefixed_test.dart b/tests/language/accessor_conflict/import_prefixed_test.dart new file mode 100644 index 00000000000..fdb3ca85f86 --- /dev/null +++ b/tests/language/accessor_conflict/import_prefixed_test.dart @@ -0,0 +1,18 @@ +// Copyright (c) 2016, 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. + +// Verify that a getter and its corresponding setter can be imported from two +// different files. In this test the getter is imported first. + +import "package:expect/expect.dart"; + +import "getter.dart" as p; +import "setter.dart" as p; + +main() { + p.getValue = 123; + Expect.equals(p.x, 123); + p.x = 456; + Expect.equals(p.setValue, 456); +} diff --git a/tests/language/accessor_conflict/import_test.dart b/tests/language/accessor_conflict/import_test.dart new file mode 100644 index 00000000000..49be4e5ae01 --- /dev/null +++ b/tests/language/accessor_conflict/import_test.dart @@ -0,0 +1,18 @@ +// Copyright (c) 2016, 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. + +// Verify that a getter and its corresponding setter can be imported from two +// different files. In this test the getter is imported first. + +import "package:expect/expect.dart"; + +import "getter.dart"; +import "setter.dart"; + +main() { + getValue = 123; + Expect.equals(x, 123); + x = 456; + Expect.equals(setValue, 456); +} diff --git a/tests/language/accessor_conflict/setter.dart b/tests/language/accessor_conflict/setter.dart new file mode 100644 index 00000000000..c3d383b29db --- /dev/null +++ b/tests/language/accessor_conflict/setter.dart @@ -0,0 +1,9 @@ +// Copyright (c) 2016, 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. + +var setValue; + +set x(value) { + setValue = value; +}