summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2021-09-30 13:02:45 -0700
committerSteven Moreland <smoreland@google.com>2021-09-30 13:02:45 -0700
commit08002ac67accc49d5eba8ab077a3c4d6f3c0cd73 (patch)
treeec79d4bc7a625f798fa682a6c90ae337d15e27e2
parent50ed56a5a5ad8fb8fab0619d99ce8811503b1fd3 (diff)
downloadcts-08002ac67accc49d5eba8ab077a3c4d6f3c0cd73.tar.gz
CtsNdkBinderTestCases: test strings with nulls
It's supported, but I'm not sure if we had any existing test coverage for it. Bug: N/A Test: CtsNdkBinderTestCases Change-Id: If12bf09c13f7ab99dad59d5df75c33e89c7d75b6
-rw-r--r--tests/tests/binder_ndk/libbinder_ndk_test/test_native_aidl_client.cpp6
-rw-r--r--tests/tests/binder_ndk/src/android/binder/cts/JavaClientTest.java3
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/tests/binder_ndk/libbinder_ndk_test/test_native_aidl_client.cpp b/tests/tests/binder_ndk/libbinder_ndk_test/test_native_aidl_client.cpp
index 3128d12fb39..8da32e8bc68 100644
--- a/tests/tests/binder_ndk/libbinder_ndk_test/test_native_aidl_client.cpp
+++ b/tests/tests/binder_ndk/libbinder_ndk_test/test_native_aidl_client.cpp
@@ -456,6 +456,12 @@ TEST_P(NdkBinderTest_Aidl, RepeatString) {
EXPECT_OK(iface->RepeatString("say what?", &res));
EXPECT_EQ("say what?", res);
+
+ std::string stringWithNulls = "asdf";
+ stringWithNulls[1] = '\0';
+
+ EXPECT_OK(iface->RepeatString(stringWithNulls, &res));
+ EXPECT_EQ(stringWithNulls, res);
}
TEST_P(NdkBinderTest_Aidl, RepeatNullableString) {
diff --git a/tests/tests/binder_ndk/src/android/binder/cts/JavaClientTest.java b/tests/tests/binder_ndk/src/android/binder/cts/JavaClientTest.java
index 5d2c7d1a644..a8c940f4d1b 100644
--- a/tests/tests/binder_ndk/src/android/binder/cts/JavaClientTest.java
+++ b/tests/tests/binder_ndk/src/android/binder/cts/JavaClientTest.java
@@ -282,6 +282,9 @@ public class JavaClientTest {
assertEquals("", mInterface.RepeatString(""));
assertEquals("a", mInterface.RepeatString("a"));
assertEquals("foo", mInterface.RepeatString("foo"));
+
+ String stringWithNulls = "a\0df";
+ assertEquals(stringWithNulls, mInterface.RepeatString(stringWithNulls));
}
@Test