From 3d6eb49a0162f2c9ba6cc3fc5401993e39dcbd8b Mon Sep 17 00:00:00 2001 From: sgrekhov Date: Wed, 14 Dec 2022 10:36:59 +0200 Subject: [PATCH] #1586. Remove CyclicInitializationError from co19_2 tests --- .../definition_t02.dart | 8 ++--- .../definition_t05.dart | 13 +++----- ...clicInitializationError.class_A01_t01.dart | 32 ------------------- ...clicInitializationError.class_A01_t02.dart | 22 ------------- .../CyclicInitializationError.lib.dart | 10 ------ .../CyclicInitializationError_A01_t01.dart | 16 ---------- .../CyclicInitializationError_A01_t02.dart | 16 ---------- .../variableName_A01_t01.dart | 32 ------------------- 8 files changed, 8 insertions(+), 141 deletions(-) delete mode 100644 LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t01.dart delete mode 100644 LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t02.dart delete mode 100644 LibTest/core/CyclicInitializationError/CyclicInitializationError.lib.dart delete mode 100644 LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t01.dart delete mode 100644 LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t02.dart delete mode 100644 LibTest/core/CyclicInitializationError/variableName_A01_t01.dart diff --git a/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t02.dart b/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t02.dart index a6c413f0e1..4520a876d7 100644 --- a/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t02.dart +++ b/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t02.dart @@ -51,15 +51,15 @@ class C { main() { - Expect.throws(() => C.sVar, (e) => e is CyclicInitializationError); + Expect.throws(() => C.sVar); Expect.equals(null, C.sVar); - Expect.throws(() => C.sTyped, (e) => e is CyclicInitializationError); + Expect.throws(() => C.sTyped); Expect.equals(null, C.sTyped); - Expect.throws(() => C.sFinal, (e) => e is CyclicInitializationError); + Expect.throws(() => C.sFinal); Expect.equals(null, C.sFinal); - Expect.throws(() => C.sFinalTyped, (e) => e is CyclicInitializationError); + Expect.throws(() => C.sFinalTyped); Expect.equals(null, C.sFinalTyped); } diff --git a/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t05.dart b/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t05.dart index ef18abdb31..35bc40bc48 100644 --- a/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t05.dart +++ b/Language/Variables/Evaluation_of_Implicit_Variable_Getters/definition_t05.dart @@ -24,8 +24,8 @@ /// can occur. Otherwise /// - Variable declaration without initializer. The result of executing the /// getter method is the value stored in v. -/// @description Checks that CyclicInitializationError is thrown when getter -/// is referenced during evaluation of initialization expression. +/// @description Checks that an error is thrown when getter is referenced during +/// evaluation of initialization expression. /// @author kaigorodov import "../../../Utils/expect.dart"; @@ -38,13 +38,8 @@ class C { static int sTyped = f(); } - main() { - try { + Expect.throws(() { C.sTyped; - Expect.fail('CyclicInitializationError is expected'); - } on CyclicInitializationError catch (e) { - } catch (e) { - Expect.fail('"$e" of type ${e.runtimeType} thrown instead of CyclicInitializationError'); - } + }); } diff --git a/LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t01.dart b/LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t01.dart deleted file mode 100644 index a34784edf4..0000000000 --- a/LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t01.dart +++ /dev/null @@ -1,32 +0,0 @@ -// 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. - -// @dart = 2.9 - -/// @assertion Error thrown when a lazily initialized variable cannot be -/// initialized. -/// A static/library variable with an initializer expression is initialized the -/// first time it is read. If evaluating the initializer expression causes -/// another read of the variable, this error is thrown. -/// @description Checks that if evaluating the initializer expression causes -/// another read of the variable, then CyclicInitializationError is thrown. -/// Test static variable -/// -/// @note: there should be a CyclicInitializationError in legacy code, and this -/// is not so for opted out code, see -/// https://github.com/dart-lang/sdk/issues/42893#issuecomment-668452162 -/// -/// @Issue 22141, 42470, 42893 -/// @author sgrekhov@unipro.ru - -import "../../../Utils/expect.dart"; - -class C { - static var x = f(); - static f() => x + 1; -} - -main() { - Expect.throws(() { C.x; }, (e) => e is CyclicInitializationError); -} diff --git a/LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t02.dart b/LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t02.dart deleted file mode 100644 index d8415d3e92..0000000000 --- a/LibTest/core/CyclicInitializationError/CyclicInitializationError.class_A01_t02.dart +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -// @dart = 2.9 - -/// @assertion Error thrown when a lazily initialized variable cannot be -/// initialized. -/// A static/library variable with an initializer expression is initialized the -/// first time it is read. If evaluating the initializer expression causes -/// another read of the variable, this error is thrown. -/// @description Checks that if evaluating the initializer expression causes -/// another read of the variable, then CyclicInitializationError is thrown. -/// Test library variable -/// @author sgrekhov@unipro.ru - -import "../../../Utils/expect.dart"; -import "CyclicInitializationError.lib.dart" as lib; - -main() { - Expect.throws(() { lib.x; }, (e) => e is CyclicInitializationError); -} diff --git a/LibTest/core/CyclicInitializationError/CyclicInitializationError.lib.dart b/LibTest/core/CyclicInitializationError/CyclicInitializationError.lib.dart deleted file mode 100644 index b415f12b9f..0000000000 --- a/LibTest/core/CyclicInitializationError/CyclicInitializationError.lib.dart +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -// @dart = 2.9 - -library cyclic_initialization_error; - -var x = f(); -f() => x + 1; diff --git a/LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t01.dart b/LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t01.dart deleted file mode 100644 index 31be224399..0000000000 --- a/LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t01.dart +++ /dev/null @@ -1,16 +0,0 @@ -// 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. - -// @dart = 2.9 - -/// @assertion CyclicInitializationError([String variableName]) -/// @description Checks that this constructor can be called without parameter -/// @author sgrekhov@unipro.ru - -import "../../../Utils/expect.dart"; - -main() { - CyclicInitializationError e = new CyclicInitializationError(); - Expect.isNull(e.variableName); -} diff --git a/LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t02.dart b/LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t02.dart deleted file mode 100644 index a4fa5d6401..0000000000 --- a/LibTest/core/CyclicInitializationError/CyclicInitializationError_A01_t02.dart +++ /dev/null @@ -1,16 +0,0 @@ -// 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. - -// @dart = 2.9 - -/// @assertion CyclicInitializationError([String variableName]) -/// @description Checks that this constructor can be called with parameter -/// @author sgrekhov@unipro.ru - -import "../../../Utils/expect.dart"; - -main() { - CyclicInitializationError e = new CyclicInitializationError("someVar"); - Expect.equals("someVar", e.variableName); -} diff --git a/LibTest/core/CyclicInitializationError/variableName_A01_t01.dart b/LibTest/core/CyclicInitializationError/variableName_A01_t01.dart deleted file mode 100644 index aaddef7493..0000000000 --- a/LibTest/core/CyclicInitializationError/variableName_A01_t01.dart +++ /dev/null @@ -1,32 +0,0 @@ -// 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. - -// @dart = 2.9 - -/// @assertionString variableName -/// read-only -/// @description Checks that this property returns name of the variable that -/// caused this error -/// @Issue 42470 -/// @author sgrekhov@unipro.ru - -import "../../../Utils/expect.dart"; - -class C { - static var x = throw CyclicInitializationError("x"); -} - -main() { - try { - C.x; - Expect.fail("CyclicInitializationError error should be thrown"); - } on CyclicInitializationError catch (e) { - if (isJS) { - // Name is C_x on some web configurations. - Expect.isTrue(e.variableName == "C_x" || e.variableName == "x"); - } else { - Expect.equals("x", e.variableName); - } - } -}