commit 8821c0cc83f080e85ecc5cba268d617259ce0e56
author android-build-team Robot <android-build-team-robot@google.com> Thu Dec 10 00:08:04 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Dec 10 00:08:04 2020 +0000
tree acff1f7471ecd4b96316a0dad4f00cf329e537b9
parent 102bd6fd010005dfa467846e4f3cd1d230ab5690
parent 7ecf6089972101fbc413630f90abf2a1521c01c7

Snap for 7022639 from 7ecf6089972101fbc413630f90abf2a1521c01c7 to rvc-qpr2-release

Change-Id: Iae98e8f215c479905b5047309a8ce6c66ce470c7

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 fff777f..4c479f2 100644
--- a/test/java_test/hidl_test_java_native.cpp
+++ b/test/java_test/hidl_test_java_native.cpp
@@ -301,13 +301,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) {