Fix two bluetooth tests

Change-Id: I0c0b75e40531169b6455a6daae6b3695a85e0ea1
Test: presubmit
Bug: 179092189

diff --git a/gd/dumpsys/bundler/Android.bp b/gd/dumpsys/bundler/Android.bp
index ea91c85..ef63600 100644 (file)
--- a/gd/dumpsys/bundler/Android.bp
+++ b/gd/dumpsys/bundler/Android.bp
@@ -70,4 +70,7 @@ cc_test {
     data: [
         "test.bfbs",
     ],
+    test_options: {
+        unit_test: true,
+    },
 }

diff --git a/gd/dumpsys/bundler/test.cc b/gd/dumpsys/bundler/test.cc
index 9c8254f..73b389e 100644 (file)
--- a/gd/dumpsys/bundler/test.cc
+++ b/gd/dumpsys/bundler/test.cc
@@ -40,14 +40,14 @@ class BundlerTest : public ::testing::Test {
 TEST_F(BundlerTest, LoadBinarySchema) {
   std::string string_schema;
   ASSERT_FALSE(LoadBinarySchema(nullptr, &string_schema));
-  ASSERT_DEATH(LoadBinarySchema("system/bt/gd/dumpsys/bundler/test.bfbs", nullptr), "");
-  ASSERT_TRUE(LoadBinarySchema("system/bt/gd/dumpsys/bundler/test.bfbs", &string_schema));
-  ASSERT_FALSE(LoadBinarySchema("system/bt/gd/dumpsys/bundler/does_not_exist.bfbs", &string_schema));
+  ASSERT_DEATH(LoadBinarySchema("test.bfbs", nullptr), "");
+  ASSERT_TRUE(LoadBinarySchema("test.bfbs", &string_schema));
+  ASSERT_FALSE(LoadBinarySchema("does_not_exist.bfbs", &string_schema));
 }
 
 TEST_F(BundlerTest, VerifyBinarySchema) {
   std::string string_schema;
-  ASSERT_TRUE(LoadBinarySchema("system/bt/gd/dumpsys/bundler/test.bfbs", &string_schema));
+  ASSERT_TRUE(LoadBinarySchema("test.bfbs", &string_schema));
   std::vector<const uint8_t> raw_schema(string_schema.begin(), string_schema.end());
   ASSERT_TRUE(VerifyBinarySchema(raw_schema));