From 10e52a14e1279b83cc34e7f4be986f1b63d7c02b Mon Sep 17 00:00:00 2001 From: Hetman Sofya Date: Fri, 5 Sep 2025 17:55:20 +0300 Subject: [PATCH] Remove duplicates for 7.27, 7.28 Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICWNUA Testing: All required pre-merge tests passed. Results are available in GGW. Signed-off-by: Hetman Sofya --- .../conditional_and_bool.params.yaml | 31 ++++++---------- .../conditional_and_boolean.params.yaml | 31 ++++++---------- .../conditional_or_bool.params.yaml | 37 +++++++------------ .../conditional_or_boolean.params.yaml | 37 +++++++------------ 4 files changed, 50 insertions(+), 86 deletions(-) diff --git a/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_bool.params.yaml b/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_bool.params.yaml index 3dea48c5c1..eee3639e64 100644 --- a/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_bool.params.yaml +++ b/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_bool.params.yaml @@ -30,37 +30,28 @@ cases: let a: boolean = false; arktest.assertTrue((a && fail()) == false); - - doc: Conditional AND for 4x boolean - true true true true + - doc: Conditional AND for 2x boolean - unknown false - left to right execution decl: |- - let a: boolean = true; - let b: boolean = true; - let c: boolean = true; - let d: boolean = true; - arktest.assertTrue((a && b && c && d) == true) + let a: boolean = false; + let expectedException = (e: Error): boolean => { return (e instanceof AssertionError) } + arktest.expectThrow(() => { fail() && a }, expectedException) - - doc: Conditional AND for 4x boolean - true true true false + - doc: Conditional AND for 3x boolean - true true true decl: |- let a: boolean = true; let b: boolean = true; let c: boolean = true; - let d: boolean = false; - arktest.assertTrue((a && b && c && d) == false) + arktest.assertTrue((a && b && c) == true) - - doc: Conditional AND for 4x boolean - true true false unknown + - doc: Conditional AND for 3x boolean - true true false decl: |- let a: boolean = true; let b: boolean = true; let c: boolean = false; - arktest.assertTrue((a && b && c && fail()) == false) - - - doc: Conditional AND for 4x boolean - true false unknown... - decl: |- - let a: boolean = true; - let b: boolean = false; - arktest.assertTrue((a && b && fail() && fail()) == false) + arktest.assertTrue((a && b && c) == false) - - doc: Conditional AND for 4x boolean - false unknown... + - doc: Conditional AND for 3x boolean - false unknown true - left to right grouping decl: |- let a: boolean = false; - arktest.assertTrue((a && fail() && fail() && fail()) == false) - + let b: boolean = true; + arktest.assertTrue((a && fail() && b) == false) \ No newline at end of file diff --git a/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_boolean.params.yaml b/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_boolean.params.yaml index aa2a5c09e8..6bd7e303fa 100644 --- a/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_boolean.params.yaml +++ b/static_core/plugins/ets/tests/ets-templates/07.expressions/27.conditional-and_expression/conditional_and_boolean.params.yaml @@ -30,37 +30,28 @@ cases: let a: Boolean = false; arktest.assertTrue((a && fail()) == false); - - doc: Conditional AND for 4x Boolean - true true true true + - doc: Conditional AND for 2x Boolean - unknown false - left to right execution decl: |- - let a: Boolean = true; - let b: Boolean = true; - let c: Boolean = true; - let d: Boolean = true; - arktest.assertTrue((a && b && c && d) == true) + let a: Boolean = false; + let expectedException = (e: Error): Boolean => { return (e instanceof AssertionError) } + arktest.expectThrow(() => { fail() && a }, expectedException) - - doc: Conditional AND for 4x Boolean - true true true false + - doc: Conditional AND for 3x Boolean - true true true decl: |- let a: Boolean = true; let b: Boolean = true; let c: Boolean = true; - let d: Boolean = false; - arktest.assertTrue((a && b && c && d) == false) + arktest.assertTrue((a && b && c) == true) - - doc: Conditional AND for 4x Boolean - true true false unknown + - doc: Conditional AND for 3x Boolean - true true false decl: |- let a: Boolean = true; let b: Boolean = true; let c: Boolean = false; - arktest.assertTrue((a && b && c && fail()) == false) - - - doc: Conditional AND for 4x Boolean - true false unknown... - decl: |- - let a: Boolean = true; - let b: Boolean = false; - arktest.assertTrue((a && b && fail() && fail()) == false) + arktest.assertTrue((a && b && c) == false) - - doc: Conditional AND for 4x Boolean - false unknown... + - doc: Conditional AND for 3x Boolean - false unknown true - left to right grouping decl: |- let a: Boolean = false; - arktest.assertTrue((a && fail() && fail() && fail()) == false) - + let b: Boolean = true; + arktest.assertTrue((a && fail() && b) == false) \ No newline at end of file diff --git a/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_bool.params.yaml b/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_bool.params.yaml index 80c4d01b09..1c40931c5b 100644 --- a/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_bool.params.yaml +++ b/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_bool.params.yaml @@ -17,50 +17,41 @@ cases: decl: |- let a: boolean = false; let b: boolean = false; - arktest.assertTrue((a || b) == false); + arktest.assertFalse(a || b); - doc: Conditional OR for 2x boolean - false true decl: |- let a: boolean = false; let b: boolean = true; - arktest.assertTrue((a || b) == true); + arktest.assertTrue(a || b); - doc: Conditional OR for 2x boolean - true unknown decl: |- let a: boolean = true; - arktest.assertTrue((a || fail()) == true); + arktest.assertTrue(a || fail()); - - doc: Conditional OR for 4x boolean - false false false false + - doc: Conditional OR for 2x boolean - unknown true - left to right execution decl: |- - let a: boolean = false; - let b: boolean = false; - let c: boolean = false; - let d: boolean = false; - arktest.assertTrue((a || b || c || d) == false) + let a: boolean = true; + let expectedException = (e: Error): boolean => { return (e instanceof AssertionError) } + arktest.expectThrow(() => { fail() && a }, expectedException); - - doc: Conditional OR for 4x boolean - false false false true + - doc: Conditional OR for 3x boolean - false false false decl: |- let a: boolean = false; let b: boolean = false; let c: boolean = false; - let d: boolean = true; - arktest.assertTrue((a || b || c || d) == true) + arktest.assertFalse(a || b || c); - - doc: Conditional OR for 4x boolean - false false true unknown + - doc: Conditional OR for 3x boolean - false false true decl: |- let a: boolean = false; let b: boolean = false; let c: boolean = true; - arktest.assertTrue((a || b || c || fail()) == true) - - - doc: Conditional OR for 4x boolean - false true unknown... - decl: |- - let a: boolean = false; - let b: boolean = true; - arktest.assertTrue((a || b || fail() || fail()) == true) + arktest.assertTrue(a || b || c); - - doc: Conditional OR for 4x boolean - true unknown... + - doc: Conditional OR for 3x boolean - true unknown false - left to right grouping decl: |- let a: boolean = true; - arktest.assertTrue((a || fail() || fail() || fail()) == true) - + let b: boolean = false; + arktest.assertTrue(a || fail() || b); \ No newline at end of file diff --git a/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_boolean.params.yaml b/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_boolean.params.yaml index 6c080861f3..8e538a0fd5 100644 --- a/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_boolean.params.yaml +++ b/static_core/plugins/ets/tests/ets-templates/07.expressions/28.conditional-or_expression/conditional_or_boolean.params.yaml @@ -17,50 +17,41 @@ cases: decl: |- let a: Boolean = false; let b: Boolean = false; - arktest.assertTrue((a || b) == false); + arktest.assertFalse(a || b); - doc: Conditional OR for 2x Boolean - false true decl: |- let a: Boolean = false; let b: Boolean = true; - arktest.assertTrue((a || b) == true); + arktest.assertTrue(a || b); - doc: Conditional OR for 2x Boolean - true unknown decl: |- let a: Boolean = true; - arktest.assertTrue((a || fail()) == true); + arktest.assertTrue(a || fail()); - - doc: Conditional OR for 4x Boolean - false false false false + - doc: Conditional OR for 2x Boolean - unknown true - left to right execution decl: |- - let a: Boolean = false; - let b: Boolean = false; - let c: Boolean = false; - let d: Boolean = false; - arktest.assertTrue((a || b || c || d) == false) + let a: Boolean = true; + let expectedException = (e: Error): Boolean => { return (e instanceof AssertionError) } + arktest.expectThrow(() => { fail() && a }, expectedException) - - doc: Conditional OR for 4x Boolean - false false false true + - doc: Conditional OR for 3x Boolean - false false false decl: |- let a: Boolean = false; let b: Boolean = false; let c: Boolean = false; - let d: Boolean = true; - arktest.assertTrue((a || b || c || d) == true) + arktest.assertFalse(a || b || c); - - doc: Conditional OR for 4x Boolean - false false true unknown + - doc: Conditional OR for 3x Boolean - false false true decl: |- let a: Boolean = false; let b: Boolean = false; let c: Boolean = true; - arktest.assertTrue((a || b || c || fail()) == true) - - - doc: Conditional OR for 4x Boolean - false true unknown... - decl: |- - let a: Boolean = false; - let b: Boolean = true; - arktest.assertTrue((a || b || fail() || fail()) == true) + arktest.assertTrue(a || b || c); - - doc: Conditional OR for 4x Boolean - true unknown... + - doc: Conditional OR for 3x Boolean - true unknown false - left to right grouping decl: |- let a: Boolean = true; - arktest.assertTrue((a || fail() || fail() || fail()) == true) - + let b: Boolean = false; + arktest.assertTrue(a || fail() || b); \ No newline at end of file -- Gitee