commit 7621d4d0592fbf3fb396d0c092a8e41c3c8215cd
author Christopher Wiley <wiley@google.com> Sat Nov 28 16:58:06 2015 -0800
committer Christopher Wiley <wiley@google.com> Thu Dec 10 14:53:38 2015 -0800
tree 80a5ea7e9115c0384ddb72c58ac20bcf707d458e
parent 546d27d8776c91d0769202b82d9d81405e8ab5d7

Integration test for application specific exceptions

Bug: 25800533
Test: Integration tests pass

Change-Id: Iaf742a29509b1280c5db7c7231a4fac538a07574

tests/aidl_test_client.cpp

diff --git a/tests/aidl_test_client.cpp b/tests/aidl_test_client.cpp
index 6d12335..8236902 100644
--- a/tests/aidl_test_client.cpp
+++ b/tests/aidl_test_client.cpp
@@ -24,6 +24,7 @@
 
 #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"
 
 // libutils:
@@ -68,26 +69,26 @@
 /* Runs all the test cases in aidl_test_client_*.cpp files. */
 int main(int /* argc */, char * /* argv */ []) {
   sp<ITestService> service;
+  namespace client_tests = android::aidl::tests::client;
 
-  if (!android::aidl::tests::client::GetService(&service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmPrimitiveRepeat(service)) return 1;
+  if (!client_tests::GetService(&service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmReverseArrays(service)) return 1;
+  if (!client_tests::ConfirmPrimitiveRepeat(service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmReverseLists(service)) return 1;
+  if (!client_tests::ConfirmReverseArrays(service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmReverseBinderLists(service)) {
-    return 1;
-  }
+  if (!client_tests::ConfirmReverseLists(service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmParcelables(service)) return 1;
+  if (!client_tests::ConfirmReverseBinderLists(service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmFileDescriptors(service)) return 1;
+  if (!client_tests::ConfirmParcelables(service)) return 1;
 
-  if (!android::aidl::tests::client::ConfirmFileDescriptorArrays(service)) {
-    return 1;
-  }
+  if (!client_tests::ConfirmFileDescriptors(service)) return 1;
+
+  if (!client_tests::ConfirmFileDescriptorArrays(service)) return 1;
+
+  if (!client_tests::ConfirmServiceSpecificExceptions(service)) return 1;
 
   return 0;
 }