commit 929804f8e3a070f1c7a470804ebbac9c094ea2d1
author Alice Ryhl <aliceryhl@google.com> Tue Nov 02 12:04:39 2021 +0000
committer Alice Ryhl <aliceryhl@google.com> Tue Nov 02 12:05:15 2021 +0000
tree b8abf4af0aa14389b26a1782f0489d24c8d99465
parent 05f5a2c4aa35cc0b90b1f90ef1f7f1a7cbca687d

binder_rust: add async variants of get_interface and wait_for_interface

Test: update integration tests
Change-Id: I90af3334a6dae8cff02f923408780eb8de81aac3

libs/binder/rust/tests/integration.rs

diff --git a/libs/binder/rust/tests/integration.rs b/libs/binder/rust/tests/integration.rs
index 3c29073..ebfe879 100644
--- a/libs/binder/rust/tests/integration.rs
+++ b/libs/binder/rust/tests/integration.rs
@@ -377,6 +377,33 @@
         );
     }
 
+    #[tokio::test]
+    async fn check_services_async() {
+        let mut sm = binder::get_service("manager").expect("Did not get manager binder service");
+        assert!(sm.is_binder_alive());
+        assert!(sm.ping_binder().is_ok());
+
+        assert!(binder::get_service("this_service_does_not_exist").is_none());
+        assert_eq!(
+            binder_tokio::get_interface::<dyn ITest>("this_service_does_not_exist").await.err(),
+            Some(StatusCode::NAME_NOT_FOUND)
+        );
+        assert_eq!(
+            binder_tokio::get_interface::<dyn IATest<Tokio>>("this_service_does_not_exist").await.err(),
+            Some(StatusCode::NAME_NOT_FOUND)
+        );
+
+        // The service manager service isn't an ITest, so this must fail.
+        assert_eq!(
+            binder_tokio::get_interface::<dyn ITest>("manager").await.err(),
+            Some(StatusCode::BAD_TYPE)
+        );
+        assert_eq!(
+            binder_tokio::get_interface::<dyn IATest<Tokio>>("manager").await.err(),
+            Some(StatusCode::BAD_TYPE)
+        );
+    }
+
     #[test]
     fn check_wait_for_service() {
         let mut sm =
@@ -409,7 +436,7 @@
         let service_name = "trivial_client_test";
         let _process = ScopedServiceProcess::new(service_name);
         let test_client: Strong<dyn IATest<Tokio>> =
-            binder::get_interface(service_name).expect("Did not get manager binder service");
+            binder_tokio::get_interface(service_name).await.expect("Did not get manager binder service");
         assert_eq!(test_client.test().await.unwrap(), "trivial_client_test");
     }
 
@@ -427,7 +454,7 @@
         let service_name = "wait_for_trivial_client_test";
         let _process = ScopedServiceProcess::new(service_name);
         let test_client: Strong<dyn IATest<Tokio>> =
-            binder::wait_for_interface(service_name).expect("Did not get manager binder service");
+            binder_tokio::wait_for_interface(service_name).await.expect("Did not get manager binder service");
         assert_eq!(test_client.test().await.unwrap(), "wait_for_trivial_client_test");
     }
 
@@ -459,7 +486,7 @@
         let service_name = "get_selinux_context";
         let _process = ScopedServiceProcess::new(service_name);
         let test_client: Strong<dyn IATest<Tokio>> =
-            binder::get_interface(service_name).expect("Did not get manager binder service");
+            binder_tokio::get_interface(service_name).await.expect("Did not get manager binder service");
         assert_eq!(
             test_client.get_selinux_context().await.unwrap(),
             get_expected_selinux_context()