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

Commit bcce5415 authored by Andrew Walbran's avatar Andrew Walbran Committed by Cherrypicker Worker
Browse files

Add tests to verify clap command. 

Bug: 260823636
Tag: #gd-refactor
Test: atest bluetooth_with_facades.test bt_topshim_facade.test pdl_tests
(cherry picked from https://android-review.googlesource.com/q/commit:0dcbd170a544d514da7f328555217782ac961af6)
Merged-In: Id583d26459c05e3aaa8295c6f752923ec7d8fe93
Change-Id: Id583d26459c05e3aaa8295c6f752923ec7d8fe93
parent 8fc31d0b

system/gd/rust/facade/Android.bp

+19 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,25 @@ rust_binary { 
    ],

    ],

}

}





rust_test {

    name: "bluetooth_with_facades.test",

    defaults: ["gd_rust_defaults"],

    srcs: ["src/main.rs"],

    edition: "2018",

    rustlibs: [

      "libclap",

      "libbluetooth_with_facades",

      "libfutures",

      "libgrpcio",

      "liblazy_static",

      "libtokio",

      "libnix",

      "libbt_common",

      "liblog_rust",

    ],

    test_suites: ["general-tests"],

}



rust_library {

rust_library {

    name: "libbt_facade_helpers",

    name: "libbt_facade_helpers",

    defaults: ["gd_rust_defaults"],

    defaults: ["gd_rust_defaults"],

system/gd/rust/facade/src/main.rs

+16 −3
Original line number Original line Diff line number Diff line
@@ -19,8 +19,8 @@ fn main() { 
    rt.block_on(async_main(Arc::clone(&rt), sigint));

    rt.block_on(async_main(Arc::clone(&rt), sigint));

}

}





async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) {

fn clap_command() -> Command {

    let matches = Command::new("bluetooth_with_facades")

    Command::new("bluetooth_with_facades")

        .about("The bluetooth stack, with testing facades enabled and exposed via gRPC.")

        .about("The bluetooth stack, with testing facades enabled and exposed via gRPC.")

        .arg(

        .arg(

            Arg::new("root-server-port")

            Arg::new("root-server-port")
@@ -44,7 +44,10 @@ async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) { 
        .arg(Arg::new("btsnoop").long("btsnoop"))

        .arg(Arg::new("btsnoop").long("btsnoop"))

        .arg(Arg::new("btsnooz").long("btsnooz"))

        .arg(Arg::new("btsnooz").long("btsnooz"))

        .arg(Arg::new("btconfig").long("btconfig"))

        .arg(Arg::new("btconfig").long("btconfig"))

        .get_matches();

}



async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) {

    let matches = clap_command().get_matches();





    let root_server_port = *matches.get_one::<u16>("root-server-port").unwrap();

    let root_server_port = *matches.get_one::<u16>("root-server-port").unwrap();

    let grpc_port = *matches.get_one::<u16>("grpc-port").unwrap();

    let grpc_port = *matches.get_one::<u16>("grpc-port").unwrap();
@@ -95,3 +98,13 @@ extern "C" fn handle_sigint(_: i32) { 
    }

    }

    *sigint_tx = None;

    *sigint_tx = None;

}

}



#[cfg(test)]

mod tests {

    use super::*;



    #[test]

    fn verify_comand() {

        clap_command().debug_assert();

    }

}

system/gd/rust/topshim/facade/Android.bp

+13 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,8 @@ package { 
    default_applicable_licenses: ["system_bt_license"],

    default_applicable_licenses: ["system_bt_license"],

}

}





rust_binary_host {

rust_defaults {

    name: "bt_topshim_facade",

    name: "bt_topshim_facade.defaults",

    defaults: [

    defaults: [

        "gd_rust_defaults",

        "gd_rust_defaults",

        "libchrome_support_defaults"

        "libchrome_support_defaults"
@@ -78,3 +78,14 @@ rust_binary_host { 
        "libpaste",

        "libpaste",

    ],

    ],

}

}



rust_binary_host {

    name: "bt_topshim_facade",

    defaults: ["bt_topshim_facade.defaults"],

}



rust_test_host {

    name: "bt_topshim_facade.test",

    defaults: ["bt_topshim_facade.defaults"],

    test_suites: ["general-tests"],

}

system/gd/rust/topshim/facade/src/main.rs

+16 −3
Original line number Original line Diff line number Diff line
@@ -35,8 +35,8 @@ fn main() { 
    rt.block_on(async_main(Arc::clone(&rt), sigint));

    rt.block_on(async_main(Arc::clone(&rt), sigint));

}

}





async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) {

fn clap_command() -> Command {

    let matches = Command::new("bluetooth_topshim_facade")

    Command::new("bluetooth_topshim_facade")

        .about("The bluetooth topshim stack, with testing facades enabled and exposed via gRPC.")

        .about("The bluetooth topshim stack, with testing facades enabled and exposed via gRPC.")

        .arg(

        .arg(

            Arg::new("grpc-port")

            Arg::new("grpc-port")
@@ -66,7 +66,10 @@ async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) { 
                .value_parser(value_parser!(bool))

                .value_parser(value_parser!(bool))

                .default_value("true"),

                .default_value("true"),

        )

        )

        .get_matches();

}



async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) {

    let matches = clap_command().get_matches();





    let grpc_port = *matches.get_one::<u16>("grpc-port").unwrap();

    let grpc_port = *matches.get_one::<u16>("grpc-port").unwrap();

    let _rootcanal_port = matches.get_one::<u16>("rootcanal-port").cloned();

    let _rootcanal_port = matches.get_one::<u16>("rootcanal-port").cloned();
@@ -127,3 +130,13 @@ extern "C" fn handle_sigint(_: i32) { 
    }

    }

    *sigint_tx = None;

    *sigint_tx = None;

}

}



#[cfg(test)]

mod tests {

    use super::*;



    #[test]

    fn verify_comand() {

        clap_command().debug_assert();

    }

}

tools/pdl/src/main.rs

+11 −0
Original line number Original line Diff line number Diff line
@@ -83,3 +83,14 @@ fn main() -> std::process::ExitCode { 
        }

        }

    }

    }

}

}



#[cfg(test)]

mod tests {

    use super::*;

    use clap::CommandFactory;



    #[test]

    fn verify_opt() {

        Opt::command().debug_assert();

    }

}