diff options
author | Martin Stjernholm <mast@google.com> | 2024-02-21 18:56:37 +0000 |
---|---|---|
committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-22 09:52:44 +0000 |
commit | 62fc7eac55baf39d37fe90cc69851d44922995eb (patch) | |
tree | 0a0e6446d61ec771d84c3bea8a661681333cdeb1 | |
parent | 16b9c0b1ab17b5770f8cefc1d5a1414c911a7a57 (diff) | |
download | art-62fc7eac55baf39d37fe90cc69851d44922995eb.tar.gz |
Fix unit test to work on non-treblelized devices (i.e. sargo running S).
Test: libnativeloader_test on sargo in CI
Bug: 325619263
Change-Id: I6c712aeb64dca4fea5094348c72974c5e0ba1eb2
-rw-r--r-- | libnativeloader/library_namespaces_test.cpp | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/libnativeloader/library_namespaces_test.cpp b/libnativeloader/library_namespaces_test.cpp index 2e6647d7a6..7780418846 100644 --- a/libnativeloader/library_namespaces_test.cpp +++ b/libnativeloader/library_namespaces_test.cpp @@ -20,6 +20,7 @@ #include "android-base/result-gmock.h" #include "gtest/gtest.h" +#include "public_libraries.h" namespace android { namespace nativeloader { @@ -31,31 +32,39 @@ using ::android::base::testing::WithMessage; using ::testing::StartsWith; TEST(LibraryNamespacesTest, TestGetApiDomainFromPath) { + // GetApiDomainFromPath returns API_DOMAIN_PRODUCT only if the device is + // trebleized and has an unbundled product partition. + ApiDomain api_domain_product = is_product_treblelized() ? API_DOMAIN_PRODUCT : API_DOMAIN_DEFAULT; + EXPECT_EQ(GetApiDomainFromPath("/data/somewhere"), API_DOMAIN_DEFAULT); EXPECT_EQ(GetApiDomainFromPath("/system/somewhere"), API_DOMAIN_DEFAULT); - EXPECT_EQ(GetApiDomainFromPath("/product/somewhere"), API_DOMAIN_PRODUCT); + EXPECT_EQ(GetApiDomainFromPath("/product/somewhere"), api_domain_product); EXPECT_EQ(GetApiDomainFromPath("/vendor/somewhere"), API_DOMAIN_VENDOR); - EXPECT_EQ(GetApiDomainFromPath("/system/product/somewhere"), API_DOMAIN_PRODUCT); + EXPECT_EQ(GetApiDomainFromPath("/system/product/somewhere"), api_domain_product); EXPECT_EQ(GetApiDomainFromPath("/system/vendor/somewhere"), API_DOMAIN_VENDOR); EXPECT_EQ(GetApiDomainFromPath(""), API_DOMAIN_DEFAULT); EXPECT_EQ(GetApiDomainFromPath("/"), API_DOMAIN_DEFAULT); EXPECT_EQ(GetApiDomainFromPath("product/somewhere"), API_DOMAIN_DEFAULT); EXPECT_EQ(GetApiDomainFromPath("/product"), API_DOMAIN_DEFAULT); - EXPECT_EQ(GetApiDomainFromPath("/product/"), API_DOMAIN_PRODUCT); + EXPECT_EQ(GetApiDomainFromPath("/product/"), api_domain_product); EXPECT_EQ(GetApiDomainFromPath(":/product/"), API_DOMAIN_DEFAULT); EXPECT_EQ(GetApiDomainFromPath("/data/somewhere:/product/somewhere"), API_DOMAIN_DEFAULT); EXPECT_EQ(GetApiDomainFromPath("/vendor/somewhere:/product/somewhere"), API_DOMAIN_VENDOR); - EXPECT_EQ(GetApiDomainFromPath("/product/somewhere:/vendor/somewhere"), API_DOMAIN_PRODUCT); + EXPECT_EQ(GetApiDomainFromPath("/product/somewhere:/vendor/somewhere"), api_domain_product); } TEST(LibraryNamespacesTest, TestGetApiDomainFromPathList) { + // GetApiDomainFromPath returns API_DOMAIN_PRODUCT only if the device is + // trebleized and has an unbundled product partition. + ApiDomain api_domain_product = is_product_treblelized() ? API_DOMAIN_PRODUCT : API_DOMAIN_DEFAULT; + EXPECT_THAT(GetApiDomainFromPathList("/data/somewhere"), HasValue(API_DOMAIN_DEFAULT)); EXPECT_THAT(GetApiDomainFromPathList("/system/somewhere"), HasValue(API_DOMAIN_DEFAULT)); - EXPECT_THAT(GetApiDomainFromPathList("/product/somewhere"), HasValue(API_DOMAIN_PRODUCT)); + EXPECT_THAT(GetApiDomainFromPathList("/product/somewhere"), HasValue(api_domain_product)); EXPECT_THAT(GetApiDomainFromPathList("/vendor/somewhere"), HasValue(API_DOMAIN_VENDOR)); - EXPECT_THAT(GetApiDomainFromPathList("/system/product/somewhere"), HasValue(API_DOMAIN_PRODUCT)); + EXPECT_THAT(GetApiDomainFromPathList("/system/product/somewhere"), HasValue(api_domain_product)); EXPECT_THAT(GetApiDomainFromPathList("/system/vendor/somewhere"), HasValue(API_DOMAIN_VENDOR)); EXPECT_THAT(GetApiDomainFromPathList(""), HasValue(API_DOMAIN_DEFAULT)); @@ -64,11 +73,13 @@ TEST(LibraryNamespacesTest, TestGetApiDomainFromPathList) { EXPECT_THAT(GetApiDomainFromPathList("/vendor/somewhere:"), HasValue(API_DOMAIN_VENDOR)); EXPECT_THAT(GetApiDomainFromPathList("/data/somewhere:/product/somewhere"), - HasValue(API_DOMAIN_PRODUCT)); - EXPECT_THAT(GetApiDomainFromPathList("/vendor/somewhere:/product/somewhere"), - HasError(WithMessage(StartsWith("Path list crosses partition boundaries")))); - EXPECT_THAT(GetApiDomainFromPathList("/product/somewhere:/vendor/somewhere"), - HasError(WithMessage(StartsWith("Path list crosses partition boundaries")))); + HasValue(api_domain_product)); + if (api_domain_product == API_DOMAIN_PRODUCT) { + EXPECT_THAT(GetApiDomainFromPathList("/vendor/somewhere:/product/somewhere"), + HasError(WithMessage(StartsWith("Path list crosses partition boundaries")))); + EXPECT_THAT(GetApiDomainFromPathList("/product/somewhere:/vendor/somewhere"), + HasError(WithMessage(StartsWith("Path list crosses partition boundaries")))); + } } } // namespace |