Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f49babb7 authored by Martin Geisler's avatar Martin Geisler
Browse files

pdl: Use num-traits in canonical tests 

The FromPrimitive and ToPrimitive traits allow us to be generic over
the value types in the canonical tests.

This is helpful when we introduce support for enums: there we will
need to convert to/from non-integer types and we will have to do so
without knowing the actual type when we generate the code. The traits
allow us to do so in a generic way.

Test: atest pdl_rust_generator_tests_{le,be}
Change-Id: I11542ff298d924a0f6d0492445267c9efe37ace8
parent 836b4342

tools/pdl/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -155,7 +155,10 @@ rust_test_host { 
    name: "pdl_rust_generator_tests_le",

    srcs: [":pdl_rust_generator_tests_le_src"],

    test_suites: ["general-tests"],

    rustlibs: ["libpdl_le_backend"],

    rustlibs: [

        "libnum_traits",

        "libpdl_le_backend",

    ],

    clippy_lints: "none",

    lints: "none",

}
@@ -164,7 +167,10 @@ rust_test_host { 
    name: "pdl_rust_generator_tests_be",

    srcs: [":pdl_rust_generator_tests_be_src"],

    test_suites: ["general-tests"],

    rustlibs: ["libpdl_be_backend"],

    rustlibs: [

        "libnum_traits",

        "libpdl_be_backend",

    ],

    clippy_lints: "none",

    lints: "none",

}

tools/pdl/src/bin/generate-canonical-tests.rs

+7 −2
Original line number Diff line number Diff line
@@ -75,8 +75,10 @@ fn generate_unit_tests(input: &str, packet_names: &[&str], module_name: &str) { 
                    .as_u64()

                    .unwrap_or_else(|| panic!("Expected u64 for {key:?} key, got {value}"));

                let value = proc_macro2::Literal::u64_unsuffixed(value_u64);

                // We lack type information, but ToPrimitive allows us

                // to convert both integers and enums to u64.

                quote! {

                    assert_eq!(actual.#getter(), #value);

                    assert_eq!(actual.#getter().to_u64().unwrap(), #value);

                }

            });
@@ -86,8 +88,10 @@ fn generate_unit_tests(input: &str, packet_names: &[&str], module_name: &str) { 
                    .as_u64()

                    .unwrap_or_else(|| panic!("Expected u64 for {key:?} key, got {value}"));

                let value = proc_macro2::Literal::u64_unsuffixed(value_u64);

                // We lack type information, but FromPrimitive allows

                // us to convert both integers and enums to u64.

                quote! {

                    #field: #value

                    #field: FromPrimitive::from_u64(#value).unwrap()

                }

            });
@@ -114,6 +118,7 @@ fn generate_unit_tests(input: &str, packet_names: &[&str], module_name: &str) { 


    let code = quote! {

        use #module::Packet;

        use num_traits::{FromPrimitive, ToPrimitive};



        #(#tests)*

    };