commit dca2ecf2883771b4c895e52a9f07e2467d603f77
author Christopher Wiley <wiley@google.com> Fri Jan 29 10:55:43 2016 -0800
committer Christopher Wiley <wiley@google.com> Mon Feb 01 13:37:33 2016 -0800
tree 4bd6034b04ce20554a85983f003bd823d564347b
parent c79583392abd844923ca07988754d2b9b9aefaf3

Add integration test support for @utf8InCpp

This patch adds validation of String and String[] marked with
@utf8InCpp.

While here, move everything but main() in aidl_test_service.cpp to an
anonymous namespace.

Bug: 26729450
Test: Integration, unittests continue to pass

Change-Id: Iab79bc23ed8a34168544425952afd2e29cdbe030

tests/aidl_test_client.cpp

diff --git a/tests/aidl_test_client.cpp b/tests/aidl_test_client.cpp
index 0663f2c..af4312b 100644
--- a/tests/aidl_test_client.cpp
+++ b/tests/aidl_test_client.cpp
@@ -16,6 +16,7 @@
 
 #include <iostream>
 
+#include <android-base/logging.h>
 #include <binder/IServiceManager.h>
 #include <utils/String16.h>
 #include <utils/StrongPointer.h>
@@ -23,10 +24,11 @@
 #include "android/aidl/tests/ITestService.h"
 
 #include "aidl_test_client_file_descriptors.h"
-#include "aidl_test_client_parcelables.h"
-#include "aidl_test_client_service_exceptions.h"
-#include "aidl_test_client_primitives.h"
 #include "aidl_test_client_nullables.h"
+#include "aidl_test_client_parcelables.h"
+#include "aidl_test_client_primitives.h"
+#include "aidl_test_client_service_exceptions.h"
+#include "aidl_test_client_utf8_strings.h"
 
 // libutils:
 using android::OK;
@@ -68,7 +70,8 @@
 }  // namespace android
 
 /* Runs all the test cases in aidl_test_client_*.cpp files. */
-int main(int /* argc */, char * /* argv */ []) {
+int main(int /* argc */, char * argv []) {
+  android::base::InitLogging(argv, android::base::StderrLogger);
   sp<ITestService> service;
   namespace client_tests = android::aidl::tests::client;
 
@@ -93,7 +96,11 @@
 
   if (!client_tests::ConfirmServiceSpecificExceptions(service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmNullables(service)) return 1;
+  if (!client_tests::ConfirmNullables(service)) return 1;
+
+  if (!client_tests::ConfirmUtf8InCppStringRepeat(service)) return 1;
+
+  if (!client_tests::ConfirmUtf8InCppStringArrayReverse(service)) return 1;
 
   return 0;
 }