commit 5ed04fe8e60776d6df2d2a51398b5e9a878e8ebc
author Steven Moreland <smoreland@google.com> Fri Sep 16 20:49:51 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 16 20:49:51 2016 +0000
tree 002272fb91e6522619e98760281127ee66acb09c
parent ec085bc17cf470f0cda4789431f6f2e3ebcbe3e6
parent 69e7c70e72dff0734d542b737ba8bb1178244218

Merge "Oneway keyword behavior in passthrough mode."

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 00b8cf6..c0b33d2 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -471,13 +471,10 @@
     return arraylikeToString(vec, vec.size());
 }
 
-template <typename T>
-static inline void EXPECT_OK(::android::hardware::Return<T> ret) {
-    EXPECT_TRUE(ret.getStatus().isOk());
-}
+#define EXPECT_OK(ret) EXPECT_TRUE(ret.getStatus().isOk())
 
 template<typename T, typename S>
-static inline bool EXPECT_ARRAYEQ(const T arr1, const S arr2, size_t size) {
+static inline bool isArrayEqual(const T arr1, const S arr2, size_t size) {
     for(size_t i = 0; i < size; i++)
         if(arr1[i] != arr2[i])
             return false;
@@ -607,7 +604,7 @@
                   arraylikeToString(something, 32).c_str());
             int32_t expect[] = {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24,
                 26, 28, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 1, 2};
-            EXPECT_ARRAYEQ(something, expect, 32);
+            EXPECT_TRUE(isArrayEqual(something, expect, 32));
         }));
 }
 
@@ -630,7 +627,7 @@
             ALOGI("CLIENT mapThisVector returned %s.",
                   vecToString(something).c_str());
             int32_t expect[] = {0, 2, 4, 6, 8, 10, 12, 14, 16, 18};
-            EXPECT_ARRAYEQ(something, expect, something.size());
+            EXPECT_TRUE(isArrayEqual(something, expect, something.size()));
         }));
 }