From c2136c58f632cec2ab39bf6943d704e57b41e90f Mon Sep 17 00:00:00 2001 From: Aleksander Sotov Date: Tue, 17 Jun 2025 11:53:37 +0800 Subject: [PATCH] Drop asserts without namespace Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICFL3N Testing: all tests passed Signed-off-by: Aleksander Sotov --- .../enum-initialize-with-enum2.ets | 6 +- .../test/ast/compiler/ets/func_as_param.ets | 28 ++-- ...mbda_transform_trailing_block-expected.txt | 128 ++++++++++++++---- ...ailing_lambda_transform_trailing_block.ets | 4 +- ets2panda/test/runtime/ets/AnyType.ets | 8 +- .../test/runtime/ets/StaticInitNullChecks.ets | 10 +- ets2panda/test/runtime/ets/enum_empty.ets | 2 +- .../test/runtime/ets/generic_lambda_1.ets | 46 +++---- .../test/runtime/ets/generic_lambda_2.ets | 32 ++--- .../test/runtime/ets/generic_lambda_3.ets | 12 +- .../test/runtime/ets/generic_lambda_4.ets | 24 ++-- .../test/runtime/ets/generic_lambda_5.ets | 18 +-- .../test/runtime/ets/generic_lambda_6.ets | 78 +++++------ .../test/runtime/ets/generic_lambda_7.ets | 12 +- .../interfaceMethodWithDefaultParameter.ets | 22 +-- .../test/runtime/ets/invoke-with-rest.ets | 2 +- .../lambda_with_receiver_as_class_fields1.ets | 4 +- .../lambda_with_receiver_as_class_fields2.ets | 2 +- .../runtime/ets/multiple_typeof_operator.ets | 14 +- .../ets/overload-primitive-and-object.ets | 4 +- .../test/runtime/ets/unicode_whitespace.ets | 2 +- 21 files changed, 263 insertions(+), 195 deletions(-) diff --git a/ets2panda/test/ast/compiler/ets/enum_expressions/enum-initialize-with-enum2.ets b/ets2panda/test/ast/compiler/ets/enum_expressions/enum-initialize-with-enum2.ets index 2dd4590685..1e9c2016b1 100644 --- a/ets2panda/test/ast/compiler/ets/enum_expressions/enum-initialize-with-enum2.ets +++ b/ets2panda/test/ast/compiler/ets/enum_expressions/enum-initialize-with-enum2.ets @@ -18,9 +18,9 @@ enum Color2 { Red = Color.Red } enum Color3 { Red = Color2.Red } enum Color4 { Red = Color3.Red } -assertEQ(Color2.Red.valueOf(), 0) -assertEQ(Color3.Red.valueOf(), 0) -assertEQ(Color4.Red.valueOf(), 0) +arktest.assertEQ(Color2.Red.valueOf(), 0) +arktest.assertEQ(Color3.Red.valueOf(), 0) +arktest.assertEQ(Color4.Red.valueOf(), 0) /* @@? 17:21 Error TypeError: Enumeration members can be initialized only by compile-time expressions and initializers must be of the same type. */ /* @@? 18:21 Error TypeError: Enumeration members can be initialized only by compile-time expressions and initializers must be of the same type. */ diff --git a/ets2panda/test/ast/compiler/ets/func_as_param.ets b/ets2panda/test/ast/compiler/ets/func_as_param.ets index 43f1c47d80..38e38baccd 100644 --- a/ets2panda/test/ast/compiler/ets/func_as_param.ets +++ b/ets2panda/test/ast/compiler/ets/func_as_param.ets @@ -56,7 +56,7 @@ async function testAsyncGetFuncWithArgsZeroSafe() { } catch (e) { success = false; } - assertEQ(success, true, "getFuncWithArgsZero with async should not throw"); + arktest.assertEQ(success, true, "getFuncWithArgsZero with async should not throw"); } function testGetFuncWithArgsZeroSafe() { @@ -67,7 +67,7 @@ function testGetFuncWithArgsZeroSafe() { } catch (e) { success = false; } - assertEQ(success, true, "getFuncWithArgsZero should not throw"); + arktest.assertEQ(success, true, "getFuncWithArgsZero should not throw"); } function main(): void { @@ -89,22 +89,22 @@ function main(): void { const funcStr4: string = Type.of(func4 as object).getLiteral(); // Test getLiteral() - assertEQ(funcStr1, "(1: std.core.Double, 2: std.core.Double): std.core.Double", "func1 literal check"); - assertEQ(funcStr2, "(): std.core.Promise", "func2 literal check"); - assertEQ(funcStr3, "(): std.core.Double", "func3 literal check"); - assertEQ(funcStr4, "(1: std.core.Double, 2: std.core.Double, 3: std.core.Double): std.core.Promise", "func4 literal check"); + arktest.assertEQ(funcStr1, "(1: std.core.Double, 2: std.core.Double): std.core.Double", "func1 literal check"); + arktest.assertEQ(funcStr2, "(): std.core.Promise", "func2 literal check"); + arktest.assertEQ(funcStr3, "(): std.core.Double", "func3 literal check"); + arktest.assertEQ(funcStr4, "(1: std.core.Double, 2: std.core.Double, 3: std.core.Double): std.core.Promise", "func4 literal check"); // Test getFunctionArgumentsCount - assertEQ(getFunctionArgumentsCount(funcStr1), 2, "func1 should have 2 arguments"); - assertEQ(getFunctionArgumentsCount(funcStr2), 0, "func2 should have 0 arguments"); - assertEQ(getFunctionArgumentsCount(funcStr3), 0, "func3 should have 0 arguments"); - assertEQ(getFunctionArgumentsCount(funcStr4), 3, "func4 should have 3 arguments"); + arktest.assertEQ(getFunctionArgumentsCount(funcStr1), 2, "func1 should have 2 arguments"); + arktest.assertEQ(getFunctionArgumentsCount(funcStr2), 0, "func2 should have 0 arguments"); + arktest.assertEQ(getFunctionArgumentsCount(funcStr3), 0, "func3 should have 0 arguments"); + arktest.assertEQ(getFunctionArgumentsCount(funcStr4), 3, "func4 should have 3 arguments"); // Test checkIsAsyncFunction - assertEQ(checkIsAsyncFunction(funcStr1), false, "func1 should not be async"); - assertEQ(checkIsAsyncFunction(funcStr2), true, "func2 should be async"); - assertEQ(checkIsAsyncFunction(funcStr3), false, "func3 should not be async"); - assertEQ(checkIsAsyncFunction(funcStr4), true, "func4 should be async"); + arktest.assertEQ(checkIsAsyncFunction(funcStr1), false, "func1 should not be async"); + arktest.assertEQ(checkIsAsyncFunction(funcStr2), true, "func2 should be async"); + arktest.assertEQ(checkIsAsyncFunction(funcStr3), false, "func3 should not be async"); + arktest.assertEQ(checkIsAsyncFunction(funcStr4), true, "func4 should be async"); // execute getFuncWithArgsZero with async testAsyncGetFuncWithArgsZeroSafe() diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt index 66508e10ca..d5582cd45c 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt @@ -749,9 +749,43 @@ "expression": { "type": "CallExpression", "callee": { - "type": "Identifier", - "name": "assertEQ", - "decorators": [], + "type": "MemberExpression", + "object": { + "type": "Identifier", + "name": "arktest", + "decorators": [], + "loc": { + "start": { + "line": 39, + "column": 5, + "program": "trailing_lambda_transform_trailing_block.ets" + }, + "end": { + "line": 39, + "column": 12, + "program": "trailing_lambda_transform_trailing_block.ets" + } + } + }, + "property": { + "type": "Identifier", + "name": "assertEQ", + "decorators": [], + "loc": { + "start": { + "line": 39, + "column": 13, + "program": "trailing_lambda_transform_trailing_block.ets" + }, + "end": { + "line": 39, + "column": 21, + "program": "trailing_lambda_transform_trailing_block.ets" + } + } + }, + "computed": false, + "optional": false, "loc": { "start": { "line": 39, @@ -760,7 +794,7 @@ }, "end": { "line": 39, - "column": 13, + "column": 21, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -772,12 +806,12 @@ "loc": { "start": { "line": 39, - "column": 14, + "column": 22, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 39, - "column": 15, + "column": 23, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -791,12 +825,12 @@ "loc": { "start": { "line": 39, - "column": 17, + "column": 25, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 39, - "column": 18, + "column": 26, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -806,12 +840,12 @@ "loc": { "start": { "line": 39, - "column": 17, + "column": 25, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 39, - "column": 20, + "column": 28, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -826,7 +860,7 @@ }, "end": { "line": 39, - "column": 23, + "column": 31, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -839,7 +873,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 32, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -849,9 +883,43 @@ "expression": { "type": "CallExpression", "callee": { - "type": "Identifier", - "name": "assertEQ", - "decorators": [], + "type": "MemberExpression", + "object": { + "type": "Identifier", + "name": "arktest", + "decorators": [], + "loc": { + "start": { + "line": 40, + "column": 5, + "program": "trailing_lambda_transform_trailing_block.ets" + }, + "end": { + "line": 40, + "column": 12, + "program": "trailing_lambda_transform_trailing_block.ets" + } + } + }, + "property": { + "type": "Identifier", + "name": "assertEQ", + "decorators": [], + "loc": { + "start": { + "line": 40, + "column": 13, + "program": "trailing_lambda_transform_trailing_block.ets" + }, + "end": { + "line": 40, + "column": 21, + "program": "trailing_lambda_transform_trailing_block.ets" + } + } + }, + "computed": false, + "optional": false, "loc": { "start": { "line": 40, @@ -860,7 +928,7 @@ }, "end": { "line": 40, - "column": 13, + "column": 21, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -872,12 +940,12 @@ "loc": { "start": { "line": 40, - "column": 14, + "column": 22, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 40, - "column": 15, + "column": 23, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -891,12 +959,12 @@ "loc": { "start": { "line": 40, - "column": 17, + "column": 25, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 40, - "column": 18, + "column": 26, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -917,12 +985,12 @@ "loc": { "start": { "line": 40, - "column": 23, + "column": 31, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 40, - "column": 25, + "column": 33, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -930,12 +998,12 @@ "loc": { "start": { "line": 40, - "column": 19, + "column": 27, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 40, - "column": 25, + "column": 33, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -943,12 +1011,12 @@ "loc": { "start": { "line": 40, - "column": 19, + "column": 27, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 40, - "column": 25, + "column": 33, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -958,12 +1026,12 @@ "loc": { "start": { "line": 40, - "column": 17, + "column": 25, "program": "trailing_lambda_transform_trailing_block.ets" }, "end": { "line": 40, - "column": 26, + "column": 34, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -978,7 +1046,7 @@ }, "end": { "line": 40, - "column": 27, + "column": 35, "program": "trailing_lambda_transform_trailing_block.ets" } } @@ -991,7 +1059,7 @@ }, "end": { "line": 40, - "column": 28, + "column": 36, "program": "trailing_lambda_transform_trailing_block.ets" } } diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block.ets b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block.ets index 08fc0c2df7..14b490341f 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block.ets +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block.ets @@ -36,8 +36,8 @@ function main() { {} // Case 3: transform trailing lambda for arktest.assert statement - assertEQ(1, f(){}); - assertEQ(1, f(()=>{})); + arktest.assertEQ(1, f(){}); + arktest.assertEQ(1, f(()=>{})); { } } diff --git a/ets2panda/test/runtime/ets/AnyType.ets b/ets2panda/test/runtime/ets/AnyType.ets index 5b84855f12..31d2114d91 100644 --- a/ets2panda/test/runtime/ets/AnyType.ets +++ b/ets2panda/test/runtime/ets/AnyType.ets @@ -27,10 +27,10 @@ a = 1 as Any function asgn(a: T): Any { return a } -assertTrue(asgn(null) === null) -assertTrue(asgn(undefined) === undefined) -assertTrue(asgn("a") === "a") -assertTrue(asgn(1) === 1) +arktest.assertTrue(asgn(null) === null) +arktest.assertTrue(asgn(undefined) === undefined) +arktest.assertTrue(asgn("a") === "a") +arktest.assertTrue(asgn(1) === 1) class C {} diff --git a/ets2panda/test/runtime/ets/StaticInitNullChecks.ets b/ets2panda/test/runtime/ets/StaticInitNullChecks.ets index 3a1c953562..21d649deee 100644 --- a/ets2panda/test/runtime/ets/StaticInitNullChecks.ets +++ b/ets2panda/test/runtime/ets/StaticInitNullChecks.ets @@ -29,9 +29,9 @@ class B { static getx() { return B.x } } -expectThrow(() => { A.getx() }, (e) => e instanceof NullPointerError) -expectThrow(() => { A.getx() }, (e) => e instanceof LinkerUnresolvedClassError) -expectThrow(() => { B.getx() }, (e) => e instanceof LinkerUnresolvedClassError) +arktest.expectThrow(() => { A.getx() }, (e) => e instanceof NullPointerError) +arktest.expectThrow(() => { A.getx() }, (e) => e instanceof LinkerUnresolvedClassError) +arktest.expectThrow(() => { B.getx() }, (e) => e instanceof LinkerUnresolvedClassError) class C { static x: string @@ -45,5 +45,5 @@ class C { let cb: () => void cb = () => { C.x } -expectThrow(() => { new C() }, (e) => e instanceof NullPointerError) -expectThrow(() => { new C() }, (e) => e instanceof LinkerUnresolvedClassError) +arktest.expectThrow(() => { new C() }, (e) => e instanceof NullPointerError) +arktest.expectThrow(() => { new C() }, (e) => e instanceof LinkerUnresolvedClassError) diff --git a/ets2panda/test/runtime/ets/enum_empty.ets b/ets2panda/test/runtime/ets/enum_empty.ets index 3b7accba50..7cd680412b 100644 --- a/ets2panda/test/runtime/ets/enum_empty.ets +++ b/ets2panda/test/runtime/ets/enum_empty.ets @@ -27,5 +27,5 @@ function main() { function foo(a?: Empty) { } function foo2(a?: Empty | string | TestClass) { - assertEQ(a, "123") + arktest.assertEQ(a, "123") } diff --git a/ets2panda/test/runtime/ets/generic_lambda_1.ets b/ets2panda/test/runtime/ets/generic_lambda_1.ets index c91f324d5f..eb72549d0d 100644 --- a/ets2panda/test/runtime/ets/generic_lambda_1.ets +++ b/ets2panda/test/runtime/ets/generic_lambda_1.ets @@ -17,42 +17,42 @@ function main() { let foo1 = (p: T): T => p; // Explicitly deducing generics - assertEQ(foo1(1), 1) - assertEQ(foo1(1.5), 1.5) - assertEQ(foo1(false), false) - assertEQ(foo1("123"), "123") + arktest.assertEQ(foo1(1), 1) + arktest.assertEQ(foo1(1.5), 1.5) + arktest.assertEQ(foo1(false), false) + arktest.assertEQ(foo1("123"), "123") let foo1res1: [int, string] = foo1<[int, string]>([123, "123"]) - assertEQ(foo1res1[0] as int, 123) - assertEQ(foo1res1[1] as string, "123") + arktest.assertEQ(foo1res1[0] as int, 123) + arktest.assertEQ(foo1res1[1] as string, "123") let foo1res2: int[] = foo1([1, 2, 3]) - assertEQ(foo1res2[0], 1) - assertEQ(foo1res2[1], 2) - assertEQ(foo1res2[2], 3) + arktest.assertEQ(foo1res2[0], 1) + arktest.assertEQ(foo1res2[1], 2) + arktest.assertEQ(foo1res2[2], 3) let foo1res3: [[int, string], int[]] = foo1<[[int, string], int[]]>([foo1res1, foo1res2]) - assertEQ(foo1res3[0][0], 123) - assertEQ(foo1res3[0][1], "123") - assertEQ(foo1res3[1][0], 1) - assertEQ(foo1res3[1][1], 2) - assertEQ(foo1res3[1][2], 3) + arktest.assertEQ(foo1res3[0][0], 123) + arktest.assertEQ(foo1res3[0][1], "123") + arktest.assertEQ(foo1res3[1][0], 1) + arktest.assertEQ(foo1res3[1][1], 2) + arktest.assertEQ(foo1res3[1][2], 3) let foo1res4: ()=>void = foo1<()=>void>((): void=>{}) foo1res4() // Implicit derivation of generics - assertEQ(foo1(1), 1) - assertEQ(foo1(1.5), 1.5) - assertEQ(foo1(false), false) - assertEQ(foo1("123"), "123") + arktest.assertEQ(foo1(1), 1) + arktest.assertEQ(foo1(1.5), 1.5) + arktest.assertEQ(foo1(false), false) + arktest.assertEQ(foo1("123"), "123") let foo1res5: Array = foo1([123, "123"]) - assertEQ(foo1res5[0] as int, 123) - assertEQ(foo1res5[1] as string, "123") + arktest.assertEQ(foo1res5[0] as int, 123) + arktest.assertEQ(foo1res5[1] as string, "123") let foo1res6: int[] = foo1([1, 2, 3]) - assertEQ(foo1res6[0], 1) - assertEQ(foo1res6[1], 2) - assertEQ(foo1res6[2], 3) + arktest.assertEQ(foo1res6[0], 1) + arktest.assertEQ(foo1res6[1], 2) + arktest.assertEQ(foo1res6[2], 3) } diff --git a/ets2panda/test/runtime/ets/generic_lambda_2.ets b/ets2panda/test/runtime/ets/generic_lambda_2.ets index 8eae59c053..7f4ba81276 100644 --- a/ets2panda/test/runtime/ets/generic_lambda_2.ets +++ b/ets2panda/test/runtime/ets/generic_lambda_2.ets @@ -18,31 +18,31 @@ function main() { // Explicitly deducing generics let res1 = foo(1.0, "abc") - assertEQ(res1[0], 1.0) - assertEQ(res1[1], "abc") + arktest.assertEQ(res1[0], 1.0) + arktest.assertEQ(res1[1], "abc") let res2 = foo(new Error(), null) - assertTrue(res2[0] instanceof Error) - assertEQ(res2[1], null) + arktest.assertTrue(res2[0] instanceof Error) + arktest.assertEQ(res2[1], null) let res3 = foo<[Double, string], [Error, null]>(res1, res2) - assertEQ(res3[0][0], 1.0) - assertEQ(res3[0][1], "abc") - assertTrue(res3[1][0] instanceof Error) - assertEQ(res3[1][1], null) + arktest.assertEQ(res3[0][0], 1.0) + arktest.assertEQ(res3[0][1], "abc") + arktest.assertTrue(res3[1][0] instanceof Error) + arktest.assertEQ(res3[1][1], null) // Implicit derivation of generics let res4 = foo(1.0, "abc") - assertEQ(res4[0], 1.0) - assertEQ(res4[1], "abc") + arktest.assertEQ(res4[0], 1.0) + arktest.assertEQ(res4[1], "abc") let res5 = foo(new Error(), null) - assertTrue(res5[0] instanceof Error) - assertEQ(res5[1], null) + arktest.assertTrue(res5[0] instanceof Error) + arktest.assertEQ(res5[1], null) let res6 = foo(res1, res2) - assertEQ(res6[0][0], 1.0) - assertEQ(res6[0][1], "abc") - assertTrue(res6[1][0] instanceof Error) - assertEQ(res6[1][1], null) + arktest.assertEQ(res6[0][0], 1.0) + arktest.assertEQ(res6[0][1], "abc") + arktest.assertTrue(res6[1][0] instanceof Error) + arktest.assertEQ(res6[1][1], null) } diff --git a/ets2panda/test/runtime/ets/generic_lambda_3.ets b/ets2panda/test/runtime/ets/generic_lambda_3.ets index 78ee055bb2..12dffa7540 100644 --- a/ets2panda/test/runtime/ets/generic_lambda_3.ets +++ b/ets2panda/test/runtime/ets/generic_lambda_3.ets @@ -21,21 +21,21 @@ function main() { // Explicitly deducing generics let res1 = foo(1) - assertEQ(res1, 1) + arktest.assertEQ(res1, 1) let res2 = foo(1.5) - assertEQ(res2, 1.5) + arktest.assertEQ(res2, 1.5) let res3 = foo("abc") - assertEQ(res3, "abc") + arktest.assertEQ(res3, "abc") // Implicit derivation of generics let res4 = foo(1) - assertEQ(res4, 1) + arktest.assertEQ(res4, 1) let res5 = foo(1.5) - assertEQ(res5, 1.5) + arktest.assertEQ(res5, 1.5) let res6 = foo("abc") - assertEQ(res6, "abc") + arktest.assertEQ(res6, "abc") } diff --git a/ets2panda/test/runtime/ets/generic_lambda_4.ets b/ets2panda/test/runtime/ets/generic_lambda_4.ets index 21ef60f39f..d69a6c14f0 100644 --- a/ets2panda/test/runtime/ets/generic_lambda_4.ets +++ b/ets2panda/test/runtime/ets/generic_lambda_4.ets @@ -28,18 +28,18 @@ function main() { } // Explicitly deducing generics - assertEQ(foo(new Object(), new Object()), 0) - assertEQ(foo(undefined, new Object()), 1) - assertEQ(foo(undefined, undefined), 2) - assertEQ(foo(new A(), new A()), 0) - assertEQ(foo(new B(), new A()), 0) - assertEQ(foo(new B(), new B()), 0) + arktest.assertEQ(foo(new Object(), new Object()), 0) + arktest.assertEQ(foo(undefined, new Object()), 1) + arktest.assertEQ(foo(undefined, undefined), 2) + arktest.assertEQ(foo(new A(), new A()), 0) + arktest.assertEQ(foo(new B(), new A()), 0) + arktest.assertEQ(foo(new B(), new B()), 0) // Implicit derivation of generics - assertEQ(foo(new Object(), new Object()), 0) - assertEQ(foo(undefined, new Object()), 1) - assertEQ(foo(undefined, undefined), 2) - assertEQ(foo(new A(), new A()), 0) - assertEQ(foo(new B(), new A()), 0) - assertEQ(foo(new B(), new B()), 0) + arktest.assertEQ(foo(new Object(), new Object()), 0) + arktest.assertEQ(foo(undefined, new Object()), 1) + arktest.assertEQ(foo(undefined, undefined), 2) + arktest.assertEQ(foo(new A(), new A()), 0) + arktest.assertEQ(foo(new B(), new A()), 0) + arktest.assertEQ(foo(new B(), new B()), 0) } diff --git a/ets2panda/test/runtime/ets/generic_lambda_5.ets b/ets2panda/test/runtime/ets/generic_lambda_5.ets index 42ebd796d8..70089d8494 100644 --- a/ets2panda/test/runtime/ets/generic_lambda_5.ets +++ b/ets2panda/test/runtime/ets/generic_lambda_5.ets @@ -17,25 +17,25 @@ function main() { let foo1 = (t: int) => { return 1; } - assertEQ(foo1(1), 1) + arktest.assertEQ(foo1(1), 1) let foo2 = (t: int) => { return t; } - assertEQ(foo2(1), 1) - assertEQ(foo2(100), 100) + arktest.assertEQ(foo2(1), 1) + arktest.assertEQ(foo2(100), 100) let foo3 = (t: T) => { return t; } - assertEQ(foo3(1), 1) - assertEQ(foo3("123"), "123") + arktest.assertEQ(foo3(1), 1) + arktest.assertEQ(foo3("123"), "123") let foo4 = (t: T, u: U) => { return t; } - assertEQ(foo4(1, 1), 1) - assertEQ(foo4(100, 1), 100) - assertEQ(foo4(100, "abc"), 100) - assertEQ(foo4("abc", 100), "abc") + arktest.assertEQ(foo4(1, 1), 1) + arktest.assertEQ(foo4(100, 1), 100) + arktest.assertEQ(foo4(100, "abc"), 100) + arktest.assertEQ(foo4("abc", 100), "abc") } diff --git a/ets2panda/test/runtime/ets/generic_lambda_6.ets b/ets2panda/test/runtime/ets/generic_lambda_6.ets index a9cbee07a9..af2bea6a41 100644 --- a/ets2panda/test/runtime/ets/generic_lambda_6.ets +++ b/ets2panda/test/runtime/ets/generic_lambda_6.ets @@ -18,73 +18,73 @@ let foo1 = (p: T): T => p; // Explicitly deducing generics -assertEQ(foo1(1), 1) -assertEQ(foo1(1.5), 1.5) -assertEQ(foo1(false), false) -assertEQ(foo1("123"), "123") +arktest.assertEQ(foo1(1), 1) +arktest.assertEQ(foo1(1.5), 1.5) +arktest.assertEQ(foo1(false), false) +arktest.assertEQ(foo1("123"), "123") let foo1res1: [int, string] = foo1<[int, string]>([123, "123"]) -assertEQ(foo1res1[0] as int, 123) -assertEQ(foo1res1[1] as string, "123") +arktest.assertEQ(foo1res1[0] as int, 123) +arktest.assertEQ(foo1res1[1] as string, "123") let foo1res2: int[] = foo1([1, 2, 3]) -assertEQ(foo1res2[0], 1) -assertEQ(foo1res2[1], 2) -assertEQ(foo1res2[2], 3) +arktest.assertEQ(foo1res2[0], 1) +arktest.assertEQ(foo1res2[1], 2) +arktest.assertEQ(foo1res2[2], 3) let foo1res3: [[int, string], int[]] = foo1<[[int, string], int[]]>([foo1res1, foo1res2]) -assertEQ(foo1res3[0][0], 123) -assertEQ(foo1res3[0][1], "123") -assertEQ(foo1res3[1][0], 1) -assertEQ(foo1res3[1][1], 2) -assertEQ(foo1res3[1][2], 3) +arktest.assertEQ(foo1res3[0][0], 123) +arktest.assertEQ(foo1res3[0][1], "123") +arktest.assertEQ(foo1res3[1][0], 1) +arktest.assertEQ(foo1res3[1][1], 2) +arktest.assertEQ(foo1res3[1][2], 3) let foo1res4: ()=>void = foo1<()=>void>((): void=>{}) foo1res4() // Implicit derivation of generics -assertEQ(foo1(1), 1) -assertEQ(foo1(1.5), 1.5) -assertEQ(foo1(false), false) -assertEQ(foo1("123"), "123") +arktest.assertEQ(foo1(1), 1) +arktest.assertEQ(foo1(1.5), 1.5) +arktest.assertEQ(foo1(false), false) +arktest.assertEQ(foo1("123"), "123") let foo1res5: Array = foo1([123, "123"]) -assertEQ(foo1res5[0] as int, 123) -assertEQ(foo1res5[1] as string, "123") +arktest.assertEQ(foo1res5[0] as int, 123) +arktest.assertEQ(foo1res5[1] as string, "123") let foo1res6: int[] = foo1([1, 2, 3]) -assertEQ(foo1res6[0], 1) -assertEQ(foo1res6[1], 2) -assertEQ(foo1res6[2], 3) +arktest.assertEQ(foo1res6[0], 1) +arktest.assertEQ(foo1res6[1], 2) +arktest.assertEQ(foo1res6[2], 3) let foo = (p: T, q: U): [T, U] => [p, q] // Explicitly deducing generics let res1 = foo(1.0, "abc") -assertEQ(res1[0], 1.0) -assertEQ(res1[1], "abc") +arktest.assertEQ(res1[0], 1.0) +arktest.assertEQ(res1[1], "abc") let res2 = foo(new Error(), null) -assertTrue(res2[0] instanceof Error) -assertEQ(res2[1], null) +arktest.assertTrue(res2[0] instanceof Error) +arktest.assertEQ(res2[1], null) let res3 = foo<[Double, string], [Error, null]>(res1, res2) -assertEQ(res3[0][0], 1.0) -assertEQ(res3[0][1], "abc") -assertTrue(res3[1][0] instanceof Error) -assertEQ(res3[1][1], null) +arktest.assertEQ(res3[0][0], 1.0) +arktest.assertEQ(res3[0][1], "abc") +arktest.assertTrue(res3[1][0] instanceof Error) +arktest.assertEQ(res3[1][1], null) // Implicit derivation of generics let res4 = foo(1.0, "abc") -assertEQ(res4[0], 1.0) -assertEQ(res4[1], "abc") +arktest.assertEQ(res4[0], 1.0) +arktest.assertEQ(res4[1], "abc") let res5 = foo(new Error(), null) -assertTrue(res5[0] instanceof Error) -assertEQ(res5[1], null) +arktest.assertTrue(res5[0] instanceof Error) +arktest.assertEQ(res5[1], null) let res6 = foo(res1, res2) -assertEQ(res6[0][0], 1.0) -assertEQ(res6[0][1], "abc") -assertTrue(res6[1][0] instanceof Error) -assertEQ(res6[1][1], null) +arktest.assertEQ(res6[0][0], 1.0) +arktest.assertEQ(res6[0][1], "abc") +arktest.assertTrue(res6[1][0] instanceof Error) +arktest.assertEQ(res6[1][1], null) diff --git a/ets2panda/test/runtime/ets/generic_lambda_7.ets b/ets2panda/test/runtime/ets/generic_lambda_7.ets index ab83a032ba..8639b6b9d8 100644 --- a/ets2panda/test/runtime/ets/generic_lambda_7.ets +++ b/ets2panda/test/runtime/ets/generic_lambda_7.ets @@ -17,14 +17,14 @@ class A {} function foo(f: (t: T) => T) { let i1: number = 1.0 - assertEQ(f(i1), i1) - assertEQ(f(i1), i1) + arktest.assertEQ(f(i1), i1) + arktest.assertEQ(f(i1), i1) let i2: string = "abc" - assertEQ(f(i2), i2) - assertEQ(f(i2), i2) + arktest.assertEQ(f(i2), i2) + arktest.assertEQ(f(i2), i2) let i3: A = new A() - assertEQ(f(i3), i3) - assertEQ(f(i3), i3) + arktest.assertEQ(f(i3), i3) + arktest.assertEQ(f(i3), i3) } function main() { diff --git a/ets2panda/test/runtime/ets/interfaceMethodWithDefaultParameter.ets b/ets2panda/test/runtime/ets/interfaceMethodWithDefaultParameter.ets index 7efbf745fc..95890963e9 100644 --- a/ets2panda/test/runtime/ets/interfaceMethodWithDefaultParameter.ets +++ b/ets2panda/test/runtime/ets/interfaceMethodWithDefaultParameter.ets @@ -66,15 +66,15 @@ function main() { let children_1: string[] = bach.getChildren(3) let children_2: string[] = bach.getChildren(7, true) - assertEQ(compositions_1.length, 8) - assertEQ(compositions_2.length, 5) - assertEQ(compositions_1[3], "Air on the G String") - assertEQ(compositions_2[4], "The Well-Tempered Clavier") - assertEQ(identification_1, "He is Johann Sebastian Bach, the greatest composer that has ever lived who died at the age of 65.") - assertEQ(identification_2, "He is Johann Sebastian Bach, the greatest composer that has ever lived.") - assertEQ(identification_3, "He is the Johann Sebastian Bach, the greatest composer that has ever lived who died at the age of 65.") - assertEQ(children_1.length, 3) - assertEQ(children_2.length, 6) - assertEQ(children_1[0], "Catharina Dorothea Bach") - assertEQ(children_2[5], "Johann Christoph Friedrich Bach") + arktest.assertEQ(compositions_1.length, 8) + arktest.assertEQ(compositions_2.length, 5) + arktest.assertEQ(compositions_1[3], "Air on the G String") + arktest.assertEQ(compositions_2[4], "The Well-Tempered Clavier") + arktest.assertEQ(identification_1, "He is Johann Sebastian Bach, the greatest composer that has ever lived who died at the age of 65.") + arktest.assertEQ(identification_2, "He is Johann Sebastian Bach, the greatest composer that has ever lived.") + arktest.assertEQ(identification_3, "He is the Johann Sebastian Bach, the greatest composer that has ever lived who died at the age of 65.") + arktest.assertEQ(children_1.length, 3) + arktest.assertEQ(children_2.length, 6) + arktest.assertEQ(children_1[0], "Catharina Dorothea Bach") + arktest.assertEQ(children_2[5], "Johann Christoph Friedrich Bach") } \ No newline at end of file diff --git a/ets2panda/test/runtime/ets/invoke-with-rest.ets b/ets2panda/test/runtime/ets/invoke-with-rest.ets index 99838da2fd..714765bd1a 100644 --- a/ets2panda/test/runtime/ets/invoke-with-rest.ets +++ b/ets2panda/test/runtime/ets/invoke-with-rest.ets @@ -31,4 +31,4 @@ class A { let x = A(1) -assertEQ(x.get(), 1) +arktest.assertEQ(x.get(), 1) diff --git a/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields1.ets b/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields1.ets index 9b3a86d870..43665d2821 100644 --- a/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields1.ets +++ b/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields1.ets @@ -23,6 +23,6 @@ class A { function main() { let a: A = new A() - assertEQ(a.f(a), "instance A") - assertEQ(A.f(a), "static A") + arktest.assertEQ(a.f(a), "instance A") + arktest.assertEQ(A.f(a), "static A") } \ No newline at end of file diff --git a/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields2.ets b/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields2.ets index 1f304be5ac..df23664770 100644 --- a/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields2.ets +++ b/ets2panda/test/runtime/ets/lambda_with_receiver/lambda_with_receiver_as_class_fields2.ets @@ -27,5 +27,5 @@ class B { function main() { let a: A = new A() let b: B = new B(a) - assertEQ(b.a.f(), "A") + arktest.assertEQ(b.a.f(), "A") } \ No newline at end of file diff --git a/ets2panda/test/runtime/ets/multiple_typeof_operator.ets b/ets2panda/test/runtime/ets/multiple_typeof_operator.ets index 6a891f640d..cd695567f4 100644 --- a/ets2panda/test/runtime/ets/multiple_typeof_operator.ets +++ b/ets2panda/test/runtime/ets/multiple_typeof_operator.ets @@ -18,19 +18,19 @@ class Y {} function main() { let a : Int = 5 - assertEQ(typeof typeof 1, "string") - assertEQ(typeof typeof typeof typeof typeof 5, "string") - assertEQ(typeof typeof typeof typeof typeof typeof 1, "string") - assertEQ(typeof typeof typeof typeof typeof typeof ++a, "string") - assertEQ(typeof typeof typeof typeof typeof typeof a++, "string") + arktest.assertEQ(typeof typeof 1, "string") + arktest.assertEQ(typeof typeof typeof typeof typeof 5, "string") + arktest.assertEQ(typeof typeof typeof typeof typeof typeof 1, "string") + arktest.assertEQ(typeof typeof typeof typeof typeof typeof ++a, "string") + arktest.assertEQ(typeof typeof typeof typeof typeof typeof a++, "string") let y = new Y(); - assertEQ(typeof y, "object") + arktest.assertEQ(typeof y, "object") let typeof: int = 0; let x = typeof + 1 ++typeof; - assertEQ(typeof typeof, "number"); + arktest.assertEQ(typeof typeof, "number"); } diff --git a/ets2panda/test/runtime/ets/overload-primitive-and-object.ets b/ets2panda/test/runtime/ets/overload-primitive-and-object.ets index 0ac7c992a6..8e369fa489 100644 --- a/ets2panda/test/runtime/ets/overload-primitive-and-object.ets +++ b/ets2panda/test/runtime/ets/overload-primitive-and-object.ets @@ -29,7 +29,7 @@ function boo(x: number, y: Number) { function main(): void { let n: Number = new Number(); foo(1, n); - assertEQ(res, 21); + arktest.assertEQ(res, 21); boo(6 as Number, 8); - assertEQ(res, 34); + arktest.assertEQ(res, 34); } diff --git a/ets2panda/test/runtime/ets/unicode_whitespace.ets b/ets2panda/test/runtime/ets/unicode_whitespace.ets index dc0042c7b9..07a27b1486 100644 --- a/ets2panda/test/runtime/ets/unicode_whitespace.ets +++ b/ets2panda/test/runtime/ets/unicode_whitespace.ets @@ -14,4 +14,4 @@ */ // this function intentionally contains unicode whitespace -function main() {　assertTrue(true)　} +function main() {　arktest.assertTrue(true)　} -- Gitee