summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-08-07 18:16:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-07 18:16:09 +0000
commit1501880ca1523bece8ade9a89c75c624d2bed49d (patch)
tree129bc3d8e18e51f04aec44e836a7ae54ab212ed6
parent19b57edfb2c9b86e558849910aed8194e41c57b7 (diff)
parent9173971f2f6d18554077c73799503c7795589e01 (diff)
Merge "libbinder_ndk: re-enable unit test case GetServiceThatDoesntExist" am: a452b652d7 am: bddfe74ffb am: 9173971f2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1389080 Change-Id: Ic8403bb4a4fbe1cad16b78bca604f01bd0f7f857
-rw-r--r--libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
index 332b4ca5b8..b2c412d5ef 100644
--- a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
+++ b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
@@ -165,11 +165,10 @@ int lazyService(const char* instance) {
return 1; // should not return
}
-// This is too slow
-// TEST(NdkBinder, GetServiceThatDoesntExist) {
-// sp<IFoo> foo = IFoo::getService("asdfghkl;");
-// EXPECT_EQ(nullptr, foo.get());
-// }
+TEST(NdkBinder, GetServiceThatDoesntExist) {
+ sp<IFoo> foo = IFoo::getService("asdfghkl;");
+ EXPECT_EQ(nullptr, foo.get());
+}
TEST(NdkBinder, CheckServiceThatDoesntExist) {
AIBinder* binder = AServiceManager_checkService("asdfghkl;");