commit 4c7360e7b99676896a3ba7837e478f18a52451e1
author Steven Moreland <smoreland@google.com> Tue Dec 08 23:58:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 08 23:58:09 2020 +0000
tree 3be4466074e6ad3a1edb6008f2e64fe9fd65ca6b
parent 39c064de0b98a5184a8537c11ad8320e5d7dcec1
parent e8544d4fae9e8b7f1b31068c1bbd817c792315c7

hidl_test_java: reflect new overread check in art am: e8544d4fae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27278153794c70f9eb8dd51e2541c7550fa34508

test/java_test/hidl_test_java_native.cpp

diff --git a/test/java_test/hidl_test_java_native.cpp b/test/java_test/hidl_test_java_native.cpp
index a7467d7..ba12625 100644
--- a/test/java_test/hidl_test_java_native.cpp
+++ b/test/java_test/hidl_test_java_native.cpp
@@ -178,13 +178,11 @@
         }
     };
 
-    auto ret = baz->someOtherBaseMethod(foo, [&](const auto&) {
-        ADD_FAILURE() << "Should not accept invalid UTF-8 String";
+    auto ret = baz->someOtherBaseMethod(foo, [](const IBase::Foo& ret) {
+        EXPECT_EQ(ret.y.s, "?");  // :)
     });
 
-    EXPECT_FALSE(ret.isOk());
-
-    EXPECT_OK(baz->ping());
+    EXPECT_TRUE(ret.isOk());
 }
 
 TEST_F(HidlTest, BazSomeMethodWithFooArraysTest) {