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

Commit f37b29a6 authored by Marybeth Fair's avatar Marybeth Fair Committed by Gerrit Code Review
Browse files

Merge "aconfig: enforce all file versions are tested" into main

parents 70487557 b0e1d2a3

tools/aconfig/aconfig_storage_file/src/flag_info.rs

+20 −41
Original line number Diff line number Diff line
@@ -199,10 +199,10 @@ mod tests { 
    };



    // this test point locks down the value list serialization

    // TODO: b/376108268 - Use parameterized tests.

    #[test]

    fn test_serialization_default() {

        let flag_info_list = create_test_flag_info_list(DEFAULT_FILE_VERSION);

    fn test_serialization() {

        for file_version in 1..=MAX_SUPPORTED_FILE_VERSION {

            let flag_info_list = create_test_flag_info_list(file_version);



            let header: &FlagInfoHeader = &flag_info_list.header;

            let reinterpreted_header = FlagInfoHeader::from_bytes(&header.into_bytes());
@@ -221,27 +221,6 @@ mod tests { 
            assert_eq!(&flag_info_list, &reinterpreted_info_list.unwrap());

            assert_eq!(flag_info_bytes.len() as u32, header.file_size);

        }



    #[test]

    fn test_serialization_max() {

        let flag_info_list = create_test_flag_info_list(MAX_SUPPORTED_FILE_VERSION);



        let header: &FlagInfoHeader = &flag_info_list.header;

        let reinterpreted_header = FlagInfoHeader::from_bytes(&header.into_bytes());

        assert!(reinterpreted_header.is_ok());

        assert_eq!(header, &reinterpreted_header.unwrap());



        let nodes: &Vec<FlagInfoNode> = &flag_info_list.nodes;

        for node in nodes.iter() {

            let reinterpreted_node = FlagInfoNode::from_bytes(&node.into_bytes()).unwrap();

            assert_eq!(node, &reinterpreted_node);

        }



        let flag_info_bytes = flag_info_list.into_bytes();

        let reinterpreted_info_list = FlagInfoList::from_bytes(&flag_info_bytes);

        assert!(reinterpreted_info_list.is_ok());

        assert_eq!(&flag_info_list, &reinterpreted_info_list.unwrap());

        assert_eq!(flag_info_bytes.len() as u32, header.file_size);

    }



    // this test point locks down that version number should be at the top of serialized

tools/aconfig/aconfig_storage_file/src/flag_table.rs

+17 −38
Original line number Diff line number Diff line
@@ -225,10 +225,10 @@ mod tests { 
    };



    // this test point locks down the table serialization

    // TODO: b/376108268 - Use parameterized tests.

    #[test]

    fn test_serialization_default() {

        let flag_table = create_test_flag_table(DEFAULT_FILE_VERSION);

    fn test_serialization() {

        for file_version in 1..=MAX_SUPPORTED_FILE_VERSION {

            let flag_table = create_test_flag_table(file_version);



            let header: &FlagTableHeader = &flag_table.header;

            let reinterpreted_header = FlagTableHeader::from_bytes(&header.into_bytes());
@@ -247,27 +247,6 @@ mod tests { 
            assert_eq!(&flag_table, &reinterpreted_table.unwrap());

            assert_eq!(flag_table_bytes.len() as u32, header.file_size);

        }



    #[test]

    fn test_serialization_max() {

        let flag_table = create_test_flag_table(MAX_SUPPORTED_FILE_VERSION);



        let header: &FlagTableHeader = &flag_table.header;

        let reinterpreted_header = FlagTableHeader::from_bytes(&header.into_bytes());

        assert!(reinterpreted_header.is_ok());

        assert_eq!(header, &reinterpreted_header.unwrap());



        let nodes: &Vec<FlagTableNode> = &flag_table.nodes;

        for node in nodes.iter() {

            let reinterpreted_node = FlagTableNode::from_bytes(&node.into_bytes()).unwrap();

            assert_eq!(node, &reinterpreted_node);

        }



        let flag_table_bytes = flag_table.into_bytes();

        let reinterpreted_table = FlagTable::from_bytes(&flag_table_bytes);

        assert!(reinterpreted_table.is_ok());

        assert_eq!(&flag_table, &reinterpreted_table.unwrap());

        assert_eq!(flag_table_bytes.len() as u32, header.file_size);

    }



    // this test point locks down that version number should be at the top of serialized

tools/aconfig/aconfig_storage_file/src/flag_value.rs

+15 −31
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ mod tests { 


    #[test]

    // this test point locks down the value list serialization

    // TODO: b/376108268 - Use parameterized tests.

    fn test_serialization_default() {

        let flag_value_list = create_test_flag_value_list(DEFAULT_FILE_VERSION);

    fn test_serialization() {

        for file_version in 1..=MAX_SUPPORTED_FILE_VERSION {

            let flag_value_list = create_test_flag_value_list(file_version);



            let header: &FlagValueHeader = &flag_value_list.header;

            let reinterpreted_header = FlagValueHeader::from_bytes(&header.into_bytes());
@@ -153,22 +153,6 @@ mod tests { 
            assert_eq!(&flag_value_list, &reinterpreted_value_list.unwrap());

            assert_eq!(flag_value_bytes.len() as u32, header.file_size);

        }



    #[test]

    // this test point locks down the value list serialization

    fn test_serialization_max() {

        let flag_value_list = create_test_flag_value_list(MAX_SUPPORTED_FILE_VERSION);



        let header: &FlagValueHeader = &flag_value_list.header;

        let reinterpreted_header = FlagValueHeader::from_bytes(&header.into_bytes());

        assert!(reinterpreted_header.is_ok());

        assert_eq!(header, &reinterpreted_header.unwrap());



        let flag_value_bytes = flag_value_list.into_bytes();

        let reinterpreted_value_list = FlagValueList::from_bytes(&flag_value_bytes);

        assert!(reinterpreted_value_list.is_ok());

        assert_eq!(&flag_value_list, &reinterpreted_value_list.unwrap());

        assert_eq!(flag_value_bytes.len() as u32, header.file_size);

    }



    #[test]

tools/aconfig/aconfig_storage_file/src/package_table.rs

+20 −42
Original line number Diff line number Diff line
@@ -287,9 +287,9 @@ mod tests { 


    #[test]

    // this test point locks down the table serialization

    // TODO: b/376108268 - Use parameterized tests.

    fn test_serialization_default() {

        let package_table = create_test_package_table(DEFAULT_FILE_VERSION);

    fn test_serialization() {

        for file_version in 1..=MAX_SUPPORTED_FILE_VERSION {

            let package_table = create_test_package_table(file_version);

            let header: &PackageTableHeader = &package_table.header;

            let reinterpreted_header = PackageTableHeader::from_bytes(&header.into_bytes());

            assert!(reinterpreted_header.is_ok());
@@ -309,28 +309,6 @@ mod tests { 
            assert_eq!(&package_table, &reinterpreted_table.unwrap());

            assert_eq!(package_table_bytes.len() as u32, header.file_size);

        }



    #[test]

    fn test_serialization_max() {

        let package_table = create_test_package_table(MAX_SUPPORTED_FILE_VERSION);

        let header: &PackageTableHeader = &package_table.header;

        let reinterpreted_header = PackageTableHeader::from_bytes(&header.into_bytes());

        assert!(reinterpreted_header.is_ok());

        assert_eq!(header, &reinterpreted_header.unwrap());



        let nodes: &Vec<PackageTableNode> = &package_table.nodes;

        for node in nodes.iter() {

            let reinterpreted_node =

                PackageTableNode::from_bytes(&node.into_bytes(header.version), header.version)

                    .unwrap();

            assert_eq!(node, &reinterpreted_node);

        }



        let package_table_bytes = package_table.into_bytes();

        let reinterpreted_table = PackageTable::from_bytes(&package_table_bytes);

        assert!(reinterpreted_table.is_ok());

        assert_eq!(&package_table, &reinterpreted_table.unwrap());

        assert_eq!(package_table_bytes.len() as u32, header.file_size);

    }



    #[test]