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

Commit 3fa2f078 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

aconfig: improve the 'text' dump format 

Standardize the flag values as '<permission> + <state>', e.g.
'READ_ONLY + ENABLED'.

Bug: 283910447
Test: atest aconfig.test
Test: printflags # manually inspect output
Change-Id: I60f74196816327613bd8165a688f8b36da5bdac7
parent 9338007c

tools/aconfig/src/commands.rs

+4 −4
Original line number Diff line number Diff line
@@ -228,11 +228,11 @@ pub fn dump_parsed_flags(mut input: Vec<Input>, format: DumpFormat) -> Result<Ve 
        DumpFormat::Text => {

            for parsed_flag in parsed_flags.parsed_flag.into_iter() {

                let line = format!(

                    "{}/{}: {:?} {:?}\n",

                    "{}/{}: {:?} + {:?}\n",

                    parsed_flag.package(),

                    parsed_flag.name(),

                    parsed_flag.state(),

                    parsed_flag.permission()

                    parsed_flag.permission(),

                    parsed_flag.state()

                );

                output.extend_from_slice(line.as_bytes());

            }
@@ -319,7 +319,7 @@ mod tests { 
        let input = parse_test_flags_as_input();

        let bytes = dump_parsed_flags(vec![input], DumpFormat::Text).unwrap();

        let text = std::str::from_utf8(&bytes).unwrap();

        assert!(text.contains("com.android.aconfig.test/disabled_ro: DISABLED READ_ONLY"));

        assert!(text.contains("com.android.aconfig.test/disabled_ro: READ_ONLY + DISABLED"));

    }



    #[test]