commit 05efc1e4cf9b19f8c9808f543dc61c4c6f8a53db
author Steven Moreland <smoreland@google.com> Fri Jul 21 08:37:52 2017 -0700
committer Steven Moreland <smoreland@google.com> Fri Jul 21 08:39:54 2017 -0700
tree 10f16b4496ac1265a1ba94d24df3c206a1206941
parent b4d77951d3384a96a2b3ecb2a6bdae07e5e7dddc

Restore order from 'Fix infinite recursion'

Test: pass
Bug: 63899698

Merged-In: Ifc49bcc480b894f2566837865eb350bb8e143df3
Change-Id: I88db5f67b856b121545384e832ead6c0deddf50a

test/hidl_test_client.cpp

diff --git a/test/hidl_test_client.cpp b/test/hidl_test_client.cpp
index fd41627..8dae338 100644
--- a/test/hidl_test_client.cpp
+++ b/test/hidl_test_client.cpp
@@ -1607,6 +1607,35 @@
     EXPECT_TRUE(e1 != e3);
 }
 
+TEST_F(HidlTest, InvalidTransactionTest) {
+    using ::android::hardware::tests::bar::V1_0::BnHwBar;
+    using ::android::hardware::tests::bar::V1_0::BpHwBar;
+    using ::android::hardware::IBinder;
+    using ::android::hardware::Parcel;
+    using ::android::status_t;
+    using ::android::OK;
+
+    Parcel request, reply;
+    sp<IBinder> binder;
+    status_t status = request.writeInterfaceToken(::android::hardware::tests::bar::V1_0::IBar::descriptor);
+
+    EXPECT_EQ(status, OK);
+
+    if (mode == BINDERIZED) {
+        EXPECT_TRUE(bar->isRemote());
+        binder = ::android::hardware::toBinder<IBar, BpHwBar>(bar);
+    } else {
+        // For a local test, just wrap the implementation with a BnHwBar
+        binder = new BnHwBar(bar);
+    }
+
+    status = binder->transact(1234, request, &reply);
+
+    EXPECT_EQ(status, ::android::UNKNOWN_TRANSACTION);
+    // Try another call, to make sure nothing is messed up
+    EXPECT_OK(bar->thisIsNew());
+}
+
 class HidlMultithreadTest : public ::testing::Test {
    public:
     sp<IMultithread> multithreadInterface;
@@ -1655,35 +1684,6 @@
     test_multithread(20, 10);
 }
 
-TEST_F(HidlTest, InvalidTransactionTest) {
-    using ::android::hardware::tests::bar::V1_0::BnHwBar;
-    using ::android::hardware::tests::bar::V1_0::BpHwBar;
-    using ::android::hardware::IBinder;
-    using ::android::hardware::Parcel;
-    using ::android::status_t;
-    using ::android::OK;
-
-    Parcel request, reply;
-    sp<IBinder> binder;
-    status_t status = request.writeInterfaceToken(::android::hardware::tests::bar::V1_0::IBar::descriptor);
-
-    EXPECT_EQ(status, OK);
-
-    if (mode == BINDERIZED) {
-        EXPECT_TRUE(bar->isRemote());
-        binder = ::android::hardware::toBinder<IBar, BpHwBar>(bar);
-    } else {
-        // For a local test, just wrap the implementation with a BnHwBar
-        binder = new BnHwBar(bar);
-    }
-
-    status = binder->transact(1234, request, &reply);
-
-    EXPECT_EQ(status, ::android::UNKNOWN_TRANSACTION);
-    // Try another call, to make sure nothing is messed up
-    EXPECT_OK(bar->thisIsNew());
-}
-
 #if HIDL_RUN_POINTER_TESTS
 
 TEST_F(HidlTest, PassAGraphTest) {