From 5f6b9333fa02a1ccf1e495ee4dbdfb8b6c1465f5 Mon Sep 17 00:00:00 2001
From: Nicole L <dlegare.1001@gmail.com>
Date: Wed, 26 Feb 2025 09:11:48 -0800
Subject: [PATCH] Add `Android.bp` entries for googletest and mockall example
 tests (#2643)

---
 src/android/testing/Android.bp | 16 ++++++++++++++++
 src/android/testing/mockall.rs |  6 +++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/android/testing/Android.bp b/src/android/testing/Android.bp
index af422ac3..7bdf1076 100644
--- a/src/android/testing/Android.bp
+++ b/src/android/testing/Android.bp
@@ -11,3 +11,19 @@ rust_test {
     host_supported: true,
     test_suites: ["general-tests"],
 }
+
+rust_test {
+    name: "libgoogletest_example",
+    crate_name: "googletest_example",
+    srcs: ["googletest.rs"],
+    rustlibs: ["libgoogletest_rust"],
+    host_supported: true,
+}
+
+rust_test {
+    name: "libmockall_example",
+    crate_name: "mockall_example",
+    srcs: ["mockall.rs"],
+    rustlibs: ["libmockall"],
+    host_supported: true,
+}
diff --git a/src/android/testing/mockall.rs b/src/android/testing/mockall.rs
index 427ebc33..37859bd7 100644
--- a/src/android/testing/mockall.rs
+++ b/src/android/testing/mockall.rs
@@ -10,7 +10,7 @@ pub trait Pet {
 fn test_robot_dog() {
     let mut mock_dog = MockPet::new();
     mock_dog.expect_is_hungry().return_const(true);
-    assert_eq!(mock_dog.is_hungry(Duration::from_secs(10)), true);
+    assert!(mock_dog.is_hungry(Duration::from_secs(10)));
 }
 // ANCHOR_END: simple_example
 
@@ -23,7 +23,7 @@ fn test_robot_cat() {
         .with(mockall::predicate::gt(Duration::from_secs(3 * 3600)))
         .return_const(true);
     mock_cat.expect_is_hungry().return_const(false);
-    assert_eq!(mock_cat.is_hungry(Duration::from_secs(1 * 3600)), false);
-    assert_eq!(mock_cat.is_hungry(Duration::from_secs(5 * 3600)), true);
+    assert!(mock_cat.is_hungry(Duration::from_secs(5 * 3600)));
+    assert!(!mock_cat.is_hungry(Duration::from_secs(5)));
 }
 // ANCHOR_END: extended_example