diff options
Diffstat (limited to 'tools/aconfig/src')
| -rw-r--r-- | tools/aconfig/src/storage/mod.rs | 14 | ||||
| -rw-r--r-- | tools/aconfig/src/storage/package_table.rs | 16 |
2 files changed, 25 insertions, 5 deletions
diff --git a/tools/aconfig/src/storage/mod.rs b/tools/aconfig/src/storage/mod.rs index f81fb5c277..686f9ae963 100644 --- a/tools/aconfig/src/storage/mod.rs +++ b/tools/aconfig/src/storage/mod.rs @@ -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); } } diff --git a/tools/aconfig/src/storage/package_table.rs b/tools/aconfig/src/storage/package_table.rs index 78102a51b2..a6ce013309 100644 --- a/tools/aconfig/src/storage/package_table.rs +++ b/tools/aconfig/src/storage/package_table.rs @@ -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] |