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

Commit 7a208afc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "aconfig: move unit tests for is_valid_{name,package,container}_ident to... 

Merge "aconfig: move unit tests for is_valid_{name,package,container}_ident to aconfig_protos" into main am: d397f59f am: 408dd245

Original change: https://android-review.googlesource.com/c/platform/build/+/3466705



Change-Id: Ic19f1df6c224f770e79463792f5099b03fb0c475
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9ea67d3 408dd245

tools/aconfig/aconfig/src/codegen/mod.rs

+0 −61
Original line number Diff line number Diff line
@@ -50,67 +50,6 @@ impl std::fmt::Display for CodegenMode { 
#[cfg(test)]

mod tests {

    use super::*;

    use aconfig_protos::is_valid_container_ident;



    #[test]

    fn test_is_valid_name_ident() {

        assert!(is_valid_name_ident("foo"));

        assert!(is_valid_name_ident("foo_bar_123"));

        assert!(is_valid_name_ident("foo_"));



        assert!(!is_valid_name_ident(""));

        assert!(!is_valid_name_ident("123_foo"));

        assert!(!is_valid_name_ident("foo-bar"));

        assert!(!is_valid_name_ident("foo-b\u{00e5}r"));

        assert!(!is_valid_name_ident("foo__bar"));

        assert!(!is_valid_name_ident("_foo"));

    }



    #[test]

    fn test_is_valid_package_ident() {

        assert!(is_valid_package_ident("foo.bar"));

        assert!(is_valid_package_ident("foo.bar_baz"));

        assert!(is_valid_package_ident("foo.bar.a123"));



        assert!(!is_valid_package_ident("foo_bar_123"));

        assert!(!is_valid_package_ident("foo"));

        assert!(!is_valid_package_ident("foo._bar"));

        assert!(!is_valid_package_ident(""));

        assert!(!is_valid_package_ident("123_foo"));

        assert!(!is_valid_package_ident("foo-bar"));

        assert!(!is_valid_package_ident("foo-b\u{00e5}r"));

        assert!(!is_valid_package_ident("foo.bar.123"));

        assert!(!is_valid_package_ident(".foo.bar"));

        assert!(!is_valid_package_ident("foo.bar."));

        assert!(!is_valid_package_ident("."));

        assert!(!is_valid_package_ident(".."));

        assert!(!is_valid_package_ident("foo..bar"));

        assert!(!is_valid_package_ident("foo.__bar"));

    }



    #[test]

    fn test_is_valid_container_ident() {

        assert!(is_valid_container_ident("foo.bar"));

        assert!(is_valid_container_ident("foo.bar_baz"));

        assert!(is_valid_container_ident("foo.bar.a123"));

        assert!(is_valid_container_ident("foo"));

        assert!(is_valid_container_ident("foo_bar_123"));



        assert!(!is_valid_container_ident(""));

        assert!(!is_valid_container_ident("foo._bar"));

        assert!(!is_valid_container_ident("_foo"));

        assert!(!is_valid_container_ident("123_foo"));

        assert!(!is_valid_container_ident("foo-bar"));

        assert!(!is_valid_container_ident("foo-b\u{00e5}r"));

        assert!(!is_valid_container_ident("foo.bar.123"));

        assert!(!is_valid_container_ident(".foo.bar"));

        assert!(!is_valid_container_ident("foo.bar."));

        assert!(!is_valid_container_ident("."));

        assert!(!is_valid_container_ident(".."));

        assert!(!is_valid_container_ident("foo..bar"));

        assert!(!is_valid_container_ident("foo.__bar"));

    }



    #[test]

    fn test_create_device_config_ident() {

        assert_eq!(

tools/aconfig/aconfig_protos/src/lib.rs

+59 −0
Original line number Diff line number Diff line
@@ -1073,4 +1073,63 @@ parsed_flag { 
        // two identical flags with dedup enabled

        assert_eq!(first, parsed_flags::merge(vec![first.clone(), first.clone()], true).unwrap());

    }



    #[test]

    fn test_is_valid_name_ident() {

        assert!(is_valid_name_ident("foo"));

        assert!(is_valid_name_ident("foo_bar_123"));

        assert!(is_valid_name_ident("foo_"));



        assert!(!is_valid_name_ident(""));

        assert!(!is_valid_name_ident("123_foo"));

        assert!(!is_valid_name_ident("foo-bar"));

        assert!(!is_valid_name_ident("foo-b\u{00e5}r"));

        assert!(!is_valid_name_ident("foo__bar"));

        assert!(!is_valid_name_ident("_foo"));

    }



    #[test]

    fn test_is_valid_package_ident() {

        assert!(is_valid_package_ident("foo.bar"));

        assert!(is_valid_package_ident("foo.bar_baz"));

        assert!(is_valid_package_ident("foo.bar.a123"));



        assert!(!is_valid_package_ident("foo_bar_123"));

        assert!(!is_valid_package_ident("foo"));

        assert!(!is_valid_package_ident("foo._bar"));

        assert!(!is_valid_package_ident(""));

        assert!(!is_valid_package_ident("123_foo"));

        assert!(!is_valid_package_ident("foo-bar"));

        assert!(!is_valid_package_ident("foo-b\u{00e5}r"));

        assert!(!is_valid_package_ident("foo.bar.123"));

        assert!(!is_valid_package_ident(".foo.bar"));

        assert!(!is_valid_package_ident("foo.bar."));

        assert!(!is_valid_package_ident("."));

        assert!(!is_valid_package_ident(".."));

        assert!(!is_valid_package_ident("foo..bar"));

        assert!(!is_valid_package_ident("foo.__bar"));

    }



    #[test]

    fn test_is_valid_container_ident() {

        assert!(is_valid_container_ident("foo.bar"));

        assert!(is_valid_container_ident("foo.bar_baz"));

        assert!(is_valid_container_ident("foo.bar.a123"));

        assert!(is_valid_container_ident("foo"));

        assert!(is_valid_container_ident("foo_bar_123"));



        assert!(!is_valid_container_ident(""));

        assert!(!is_valid_container_ident("foo._bar"));

        assert!(!is_valid_container_ident("_foo"));

        assert!(!is_valid_container_ident("123_foo"));

        assert!(!is_valid_container_ident("foo-bar"));

        assert!(!is_valid_container_ident("foo-b\u{00e5}r"));

        assert!(!is_valid_container_ident("foo.bar.123"));

        assert!(!is_valid_container_ident(".foo.bar"));

        assert!(!is_valid_container_ident("foo.bar."));

        assert!(!is_valid_container_ident("."));

        assert!(!is_valid_container_ident(".."));

        assert!(!is_valid_container_ident("foo..bar"));

        assert!(!is_valid_container_ident("foo.__bar"));

    }

}