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

Commit bd635ce6 authored by Dennis Shen's avatar Dennis Shen Committed by Gerrit Code Review
Browse files

Merge "aconfig: add additional test aconfig to test chaining" into main

parents e1cd8461 8bab859f

tools/aconfig/src/storage/mod.rs

+13 −1
Original line number Diff line number Diff line
@@ -160,6 +160,11 @@ mod tests { 
                "storage_test_2.aconfig",

                include_bytes!("../../tests/storage_test_2.aconfig").as_slice(),

            ),

            (

                "com.android.aconfig.storage.test_4",

                "storage_test_4.aconfig",

                include_bytes!("../../tests/storage_test_4.aconfig").as_slice(),

            ),

        ];



        aconfig_files
@@ -195,7 +200,7 @@ mod tests { 
            }

        }



        assert_eq!(packages.len(), 2);

        assert_eq!(packages.len(), 3);



        assert_eq!(packages[0].package_name, "com.android.aconfig.storage.test_1");

        assert_eq!(packages[0].package_id, 0);
@@ -214,5 +219,12 @@ mod tests { 
        assert!(packages[1].flag_names.contains("disabled_ro"));

        assert!(packages[1].flag_names.contains("enabled_fixed_ro"));

        assert_eq!(packages[1].boolean_offset, 10);



        assert_eq!(packages[2].package_name, "com.android.aconfig.storage.test_4");

        assert_eq!(packages[2].package_id, 2);

        assert_eq!(packages[2].flag_names.len(), 2);

        assert!(packages[2].flag_names.contains("enabled_ro"));

        assert!(packages[2].flag_names.contains("enabled_fixed_ro"));

        assert_eq!(packages[2].boolean_offset, 16);

    }

}

tools/aconfig/src/storage/package_table.rs

+12 −4
Original line number Diff line number Diff line
@@ -206,8 +206,8 @@ mod tests { 
        let expected_header = PackageTableHeader {

            version: storage::FILE_VERSION,

            container: String::from("system"),

            file_size: 158,

            num_packages: 2,

            file_size: 208,

            num_packages: 3,

            bucket_offset: 30,

            node_offset: 58,

        };
@@ -218,7 +218,7 @@ mod tests { 
        assert_eq!(buckets, &expected);



        let nodes: &Vec<PackageTableNode> = &package_table.as_ref().unwrap().nodes;

        assert_eq!(nodes.len(), 2);

        assert_eq!(nodes.len(), 3);

        let first_node_expected = PackageTableNode {

            package_name: String::from("com.android.aconfig.storage.test_2"),

            package_id: 1,
@@ -231,10 +231,18 @@ mod tests { 
            package_name: String::from("com.android.aconfig.storage.test_1"),

            package_id: 0,

            boolean_offset: 0,

            next_offset: None,

            next_offset: Some(100),

            bucket_index: 3,

        };

        assert_eq!(nodes[1], second_node_expected);

        let third_node_expected = PackageTableNode {

            package_name: String::from("com.android.aconfig.storage.test_4"),

            package_id: 2,

            boolean_offset: 16,

            next_offset: None,

            bucket_index: 3,

        };

        assert_eq!(nodes[2], third_node_expected);

    }



    #[test]

tools/aconfig/tests/storage_test_4.aconfig

0 → 100644
+17 −0
Original line number Diff line number Diff line 
package: "com.android.aconfig.storage.test_4"

container: "system"



flag {

    name: "enabled_ro"

    namespace: "aconfig_test"

    description: "This flag is ENABLED + READ_ONLY"

    bug: "abc"

}



flag {

    name: "enabled_fixed_ro"

    namespace: "aconfig_test"

    description: "This flag is fixed READ_ONLY + ENABLED"

    bug: ""

    is_fixed_read_only: true

}