From 7454cb984b8e73458b820a52d32678da01e5679e Mon Sep 17 00:00:00 2001 From: Joel Hirsbrunner Date: Fri, 4 Oct 2024 21:32:53 +0200 Subject: [PATCH] Devicetree: Devicetree Bindings: Adjust python tests Adjust existing tests to support the changes and add new tests to test the newly added feature. Signed-off-by: Joel Hirsbrunner --- .../tests/test-bindings/enums.yaml | 15 +++++++++++ scripts/dts/python-devicetree/tests/test.dts | 2 ++ .../python-devicetree/tests/test_edtlib.py | 27 ++++++++++++++----- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/scripts/dts/python-devicetree/tests/test-bindings/enums.yaml b/scripts/dts/python-devicetree/tests/test-bindings/enums.yaml index f36b89b26eb..964cae1d4b7 100644 --- a/scripts/dts/python-devicetree/tests/test-bindings/enums.yaml +++ b/scripts/dts/python-devicetree/tests/test-bindings/enums.yaml @@ -32,5 +32,20 @@ properties: - whitespace is ok - 123 is ok + array-enum: + type: array + enum: + - 0 + - 10 + - 20 + - 30 + - 40 + + string-array-enum: # tokenizable string-array + type: string-array + enum: + - bar + - foo + no-enum: type: string diff --git a/scripts/dts/python-devicetree/tests/test.dts b/scripts/dts/python-devicetree/tests/test.dts index 213d5d45dfe..bc54fd049d5 100644 --- a/scripts/dts/python-devicetree/tests/test.dts +++ b/scripts/dts/python-devicetree/tests/test.dts @@ -432,6 +432,8 @@ string-enum = "foo_bar"; tokenizable-enum = "123 is ok"; tokenizable-lower-enum = "bar"; + array-enum = <0 40 40 10>; + string-array-enum = "foo", "bar"; no-enum = "baz"; }; diff --git a/scripts/dts/python-devicetree/tests/test_edtlib.py b/scripts/dts/python-devicetree/tests/test_edtlib.py index a81aa929370..d02bfd7fc6d 100644 --- a/scripts/dts/python-devicetree/tests/test_edtlib.py +++ b/scripts/dts/python-devicetree/tests/test_edtlib.py @@ -572,31 +572,44 @@ def test_prop_enums(): string_enum = props['string-enum'] tokenizable_enum = props['tokenizable-enum'] tokenizable_lower_enum = props['tokenizable-lower-enum'] + array_enum = props['array-enum'] + string_array_enum = props['string-array-enum'] no_enum = props['no-enum'] assert int_enum.val == 1 - assert int_enum.enum_index == 0 + assert int_enum.enum_indices[0] == 0 assert not int_enum.spec.enum_tokenizable assert not int_enum.spec.enum_upper_tokenizable assert string_enum.val == 'foo_bar' - assert string_enum.enum_index == 1 + assert string_enum.enum_indices[0] == 1 assert not string_enum.spec.enum_tokenizable assert not string_enum.spec.enum_upper_tokenizable assert tokenizable_enum.val == '123 is ok' - assert tokenizable_enum.val_as_token == '123_is_ok' - assert tokenizable_enum.enum_index == 2 + assert tokenizable_enum.val_as_tokens[0] == '123_is_ok' + assert tokenizable_enum.enum_indices[0] == 2 assert tokenizable_enum.spec.enum_tokenizable assert tokenizable_enum.spec.enum_upper_tokenizable assert tokenizable_lower_enum.val == 'bar' - assert tokenizable_lower_enum.val_as_token == 'bar' - assert tokenizable_lower_enum.enum_index == 0 + assert tokenizable_lower_enum.val_as_tokens[0] == 'bar' + assert tokenizable_lower_enum.enum_indices[0] == 0 assert tokenizable_lower_enum.spec.enum_tokenizable assert not tokenizable_lower_enum.spec.enum_upper_tokenizable - assert no_enum.enum_index is None + assert array_enum.val == [0, 40, 40, 10] + assert array_enum.enum_indices == [0, 4, 4, 1] + assert not array_enum.spec.enum_tokenizable + assert not array_enum.spec.enum_upper_tokenizable + + assert string_array_enum.val == ["foo", "bar"] + assert string_array_enum.val_as_tokens == ["foo", "bar"] + assert string_array_enum.enum_indices == [1, 0] + assert string_array_enum.spec.enum_tokenizable + assert string_array_enum.spec.enum_upper_tokenizable + + assert no_enum.enum_indices is None assert not no_enum.spec.enum_tokenizable assert not no_enum.spec.enum_upper_tokenizable