Merge "hidl_test: fix indexing issue in BatchSharedMemory" am: 203818ef0b am: 8345d2d94b am: 45b1705acf

Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2193400

Change-Id: Iafc45d15d3a04ec73355790f85d5a1ba205f9345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 24 insertions, 20 deletions

diff --git a/test/hidl_test/hidl_test_client.cpp b/test/hidl_test/hidl_test_client.cpp
index eff40a54..d82dab60 100644
--- a/test/hidl_test/hidl_test_client.cpp
+++ b/test/hidl_test/hidl_test_client.cpp
@@ -960,41 +960,45 @@ TEST_F(HidlTest, BatchSharedMemory) {
     const uint64_t kBatchSize = 2;
     hidl_vec<hidl_memory> batchCopy;
 
-    EXPECT_OK(ashmemAllocator->batchAllocate(1024, kBatchSize,
-        [&](bool success, const hidl_vec<hidl_memory>& batch) {
-            ASSERT_TRUE(success);
-            EXPECT_EQ(kBatchSize, batch.size());
+    ASSERT_TRUE(ashmemAllocator
+                        ->batchAllocate(1024, kBatchSize,
+                                        [&](bool success, const hidl_vec<hidl_memory>& batch) {
+                                            ASSERT_TRUE(success);
+                                            EXPECT_EQ(kBatchSize, batch.size());
 
-            for (uint64_t i = 0; i < batch.size(); i++) {
-                sp<IMemory> memory = mapMemory(batch[i]);
+                                            for (uint64_t i = 0; i < batch.size(); i++) {
+                                                sp<IMemory> memory = mapMemory(batch[i]);
 
-                EXPECT_NE(nullptr, memory.get());
+                                                EXPECT_NE(nullptr, memory.get());
 
-                uint8_t* data = static_cast<uint8_t*>(static_cast<void*>(memory->getPointer()));
-                EXPECT_NE(nullptr, data);
+                                                uint8_t* data = static_cast<uint8_t*>(
+                                                        static_cast<void*>(memory->getPointer()));
+                                                EXPECT_NE(nullptr, data);
 
-                EXPECT_EQ(memory->getSize(), batch[i].size());
+                                                EXPECT_EQ(memory->getSize(), batch[i].size());
 
-                memory->update();
-                memset(data, kValue, memory->getSize());
-                memory->commit();
-            }
+                                                memory->update();
+                                                memset(data, kValue, memory->getSize());
+                                                memory->commit();
+                                            }
 
-            batchCopy = batch;
-        }));
+                                            batchCopy = batch;
+                                        })
+                        .isOk());
 
     for (uint64_t i = 0; i < batchCopy.size(); i++) {
         // Test the memory persists after the call
         sp<IMemory> memory = mapMemory(batchCopy[i]);
 
-        EXPECT_NE(memory, nullptr);
+        ASSERT_NE(memory, nullptr);
 
         uint8_t* data = static_cast<uint8_t*>(static_cast<void*>(memory->getPointer()));
-        EXPECT_NE(data, nullptr);
+        ASSERT_NE(data, nullptr);
 
         memory->read();
-        for (size_t i = 0; i < batchCopy[i].size(); i++) {
-            EXPECT_EQ(kValue, data[i]);
+
+        for (size_t k = 0; k < batchCopy[i].size(); k++) {
+            EXPECT_EQ(kValue, data[k]);
         }
         memory->commit();
     }