Integration test for all primitive types
Note that this does not test null references passed for strings from
Java. We'll address that in a separate CL.
Bug: 25241875
Test: unit tests, integration test passes
Change-Id: Id6f1820965b58d46393c34a0fa4988aac4107ce6
diff --git a/tests/aidl_test_client.cpp b/tests/aidl_test_client.cpp
index 7097edb..89cb6b8 100644
--- a/tests/aidl_test_client.cpp
+++ b/tests/aidl_test_client.cpp
@@ -15,8 +15,10 @@
*/
#include <iostream>
+#include <vector>
#include <binder/IServiceManager.h>
+#include <utils/String8.h>
#include <utils/String16.h>
#include <utils/StrongPointer.h>
@@ -27,6 +29,7 @@
using android::sp;
using android::status_t;
using android::String16;
+using android::String8;
// libbinder:
using android::getService;
@@ -37,30 +40,12 @@
using std::cerr;
using std::cout;
using std::endl;
+using std::vector;
namespace {
const char kServiceName[] = "android.aidl.tests.ITestService";
-bool ConfirmBasicPing(const sp<ITestService>& service) {
- cout << "Confirming basic ping functionality." << endl;
- const int32_t kIncrement = 1 << 20;
- for (int32_t i = 0; i < 3; ++i) {
- const int32_t token = -kIncrement + i * kIncrement;
- int32_t reply = -1;
- if (service->Ping(token, &reply) != OK) {
- cerr << "Failed to ping server with token=" << token << endl;
- return false;
- }
- if (token != reply) {
- cerr << "Server replied to token=" << token
- << " with reply=" << reply << endl;
- return false;
- }
- }
- return true;
-}
-
bool GetService(sp<ITestService>* service) {
cout << "Retrieving test service binder" << endl;
status_t status = getService(String16(kServiceName), service);
@@ -72,6 +57,50 @@
return true;
}
+template <typename T>
+bool RepeatPrimitive(const sp<ITestService>& service,
+ status_t(ITestService::*func)(T, T*),
+ const T input) {
+ T reply;
+ status_t status = (*service.*func)(input, &reply);
+ if (status != OK || input != reply) {
+ cerr << "Failed to repeat primitive. status=" << status << "." << endl;
+ return false;
+ }
+ return true;
+}
+
+bool ConfirmPrimitiveRepeat(const sp<ITestService>& s) {
+ cout << "Confirming passing and returning primitives." << endl;
+
+ if (!RepeatPrimitive(s, &ITestService::RepeatBoolean, true) ||
+ !RepeatPrimitive(s, &ITestService::RepeatByte, int8_t{-128}) ||
+ !RepeatPrimitive(s, &ITestService::RepeatChar, char16_t{'A'}) ||
+ !RepeatPrimitive(s, &ITestService::RepeatInt, int32_t{1 << 30}) ||
+ !RepeatPrimitive(s, &ITestService::RepeatLong, int64_t{1ll << 60}) ||
+ !RepeatPrimitive(s, &ITestService::RepeatFloat, float{1.0f/3.0f}) ||
+ !RepeatPrimitive(s, &ITestService::RepeatDouble, double{1.0/3.0})) {
+ return false;
+ }
+
+ vector<String16> inputs = {
+ String16("Deliver us from evil."),
+ String16(),
+ String16("\0\0", 2),
+ };
+ for (const auto& input : inputs) {
+ String16 reply;
+ status_t status = s->RepeatString(input, &reply);
+ if (status != OK || input != reply) {
+ cerr << "Failed while requesting service to repeat String16=\""
+ << String8(input).string()
+ << "\". Got status=" << status << endl;
+ return false;
+ }
+ }
+ return true;
+}
+
} // namespace
int main(int /* argc */, char * /* argv */ []) {
@@ -79,7 +108,7 @@
if (!GetService(&service)) return 1;
- if (!ConfirmBasicPing(service)) return 1;
+ if (!ConfirmPrimitiveRepeat(service)) return 1;
return 0;
}