summaryrefslogtreecommitdiff
path: root/nn/runtime/test/TestExtensions.cpp
diff options
context:
space:
mode:
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>2019-05-14 09:14:50 +0100
committerPrzemyslaw Szczepaniak <pszczepaniak@google.com>2019-05-28 15:10:07 +0100
commit32d62ba6eac9508a94e3cdf967ab7f3dc9892b05 (patch)
tree6b1349da4a00495a2d5f5677cc4669000f0f62cf /nn/runtime/test/TestExtensions.cpp
parent307bd1e98f988ca19a5b50e4f7ee45ab7cb47d40 (diff)
downloadml-32d62ba6eac9508a94e3cdf967ab7f3dc9892b05.tar.gz
Extensions whitelist renamed to allowlist.
go/allowlist. The terms “allowlist” and “blocklist” describe their purpose, while the other words use metaphors to decribe their purpose. Test: NeuralNetworksTest_static Bug: 132147842 Change-Id: I83e336ac822cdc412f76c46bc6913ccfadda72b6 Merged-In: I83e336ac822cdc412f76c46bc6913ccfadda72b6 (cherry picked from commit c8747bb09bd63bf7d4e01bd4625de05cd83bb6f8)
Diffstat (limited to 'nn/runtime/test/TestExtensions.cpp')
-rw-r--r--nn/runtime/test/TestExtensions.cpp100
1 files changed, 50 insertions, 50 deletions
diff --git a/nn/runtime/test/TestExtensions.cpp b/nn/runtime/test/TestExtensions.cpp
index 943616f77..4aa7cd191 100644
--- a/nn/runtime/test/TestExtensions.cpp
+++ b/nn/runtime/test/TestExtensions.cpp
@@ -118,8 +118,8 @@ TEST_F(ExtensionsTest, DeviceReportsSupportedExtensions) {
}
TEST_F(ExtensionsTest, TestAllowedNativeBinaries) {
- std::vector<std::string> whitelist = {"/data/foo", "/vendor/foo", "/odm/foo",
- "/product/foo", "/system/whitelisted", "/foobar/foo"};
+ std::vector<std::string> allowlist = {"/data/foo", "/vendor/foo", "/odm/foo",
+ "/product/foo", "/system/allowlisted", "/foobar/foo"};
auto native_info =
[&](const std::string& binaryPath) -> android::nn::TypeManager::AppPackageInfo {
@@ -133,55 +133,55 @@ TEST_F(ExtensionsTest, TestAllowedNativeBinaries) {
// No binary info
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info(""),
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
// Non-approved top-level dir
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/foobar/foo"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Whitelisted /data binary
+ allowlist));
+ // Allowlisted /data binary
EXPECT_TRUE(TypeManager::isExtensionsUseAllowed(native_info("/data/foo"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Whitelisted /vendor binary
+ allowlist));
+ // Allowlisted /vendor binary
EXPECT_TRUE(TypeManager::isExtensionsUseAllowed(native_info("/vendor/foo"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Whitelisted /odm binary
+ allowlist));
+ // Allowlisted /odm binary
EXPECT_TRUE(TypeManager::isExtensionsUseAllowed(native_info("/odm/foo"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Non-whitelisted /system binary
+ allowlist));
+ // Non-allowlisted /system binary
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/system/foo"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // whitelisted /system binary (can't be whitelisted)
- EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/system/whitelisted"),
+ allowlist));
+ // allowlisted /system binary (can't be allowlisted)
+ EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/system/allowlisted"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Whitelisted /product binary, product disabled
+ allowlist));
+ // Allowlisted /product binary, product disabled
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/product/foo"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Whitelisted /product binary, product enabled
+ allowlist));
+ // Allowlisted /product binary, product enabled
EXPECT_TRUE(TypeManager::isExtensionsUseAllowed(native_info("/product/foo"),
/* useOnProductImageEnabled = */ true,
- whitelist));
- // Non-whitelisted /product binary, product enabled
- EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/product/foo_not_whitelisted"),
+ allowlist));
+ // Non-allowlisted /product binary, product enabled
+ EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/product/foo_not_allowlisted"),
/* useOnProductImageEnabled = */ true,
- whitelist));
- // Non-whitelisted /odm binary
- EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/odm/foo_not_whitelisted"),
+ allowlist));
+ // Non-allowlisted /odm binary
+ EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/odm/foo_not_allowlisted"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Non-whitelisted /vendor binary
- EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/vendor/foo_not_whitelisted"),
+ allowlist));
+ // Non-allowlisted /vendor binary
+ EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/vendor/foo_not_allowlisted"),
/* useOnProductImageEnabled = */ false,
- whitelist));
- // Non-whitelisted /data binary
- EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/data/foo_not_whitelisted"),
+ allowlist));
+ // Non-allowlisted /data binary
+ EXPECT_FALSE(TypeManager::isExtensionsUseAllowed(native_info("/data/foo_not_allowlisted"),
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
}
TEST_F(ExtensionsTest, TestAllowedApps) {
@@ -190,9 +190,9 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
std::string other_binary = "/system/bin/foo";
std::string package = "com.foo";
- std::string package_non_whitelisted = "com.foo2";
+ std::string package_non_allowlisted = "com.foo2";
- std::vector<std::string> whitelist = {"com.foo"};
+ std::vector<std::string> allowlist = {"com.foo"};
auto test_app_process = [&](const std::string& binary) {
// /data app
@@ -202,7 +202,7 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
.appIsOnVendorImage = false,
.appIsOnProductImage = false},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
// /system app
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed({.binaryPath = binary,
@@ -211,7 +211,7 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
.appIsOnVendorImage = false,
.appIsOnProductImage = false},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
// /vendor || /odm app
EXPECT_TRUE(TypeManager::isExtensionsUseAllowed({.binaryPath = binary,
@@ -220,7 +220,7 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
.appIsOnVendorImage = true,
.appIsOnProductImage = false},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
// /product app, disabled
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed({.binaryPath = binary,
@@ -229,7 +229,7 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
.appIsOnVendorImage = false,
.appIsOnProductImage = true},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
// /product app, enabled
EXPECT_TRUE(TypeManager::isExtensionsUseAllowed({.binaryPath = binary,
@@ -238,34 +238,34 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
.appIsOnVendorImage = false,
.appIsOnProductImage = true},
/* useOnProductImageEnabled = */ true,
- whitelist));
+ allowlist));
- // /product app, enabled, package name not on whitelist
+ // /product app, enabled, package name not on allowlist
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed({.binaryPath = binary,
- .appPackageName = package_non_whitelisted,
+ .appPackageName = package_non_allowlisted,
.appIsSystemApp = true,
.appIsOnVendorImage = false,
.appIsOnProductImage = true},
/* useOnProductImageEnabled = */ true,
- whitelist));
+ allowlist));
- // /data app, package name not on whitelist
+ // /data app, package name not on allowlist
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed({.binaryPath = binary,
- .appPackageName = package_non_whitelisted,
+ .appPackageName = package_non_allowlisted,
.appIsSystemApp = false,
.appIsOnVendorImage = false,
.appIsOnProductImage = false},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
- // /vendor || /odm app, package name not on whitelist
+ // /vendor || /odm app, package name not on allowlist
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed({.binaryPath = binary,
- .appPackageName = package_non_whitelisted,
+ .appPackageName = package_non_allowlisted,
.appIsSystemApp = true,
.appIsOnVendorImage = true,
.appIsOnProductImage = false},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
};
test_app_process(app_process64);
test_app_process(app_process32);
@@ -277,14 +277,14 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
.appIsOnVendorImage = false,
.appIsOnProductImage = false},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed({.binaryPath = other_binary,
.appPackageName = package,
.appIsSystemApp = true,
.appIsOnVendorImage = true,
.appIsOnProductImage = false},
/* useOnProductImageEnabled = */ false,
- whitelist));
+ allowlist));
EXPECT_FALSE(TypeManager::isExtensionsUseAllowed({.binaryPath = other_binary,
.appPackageName = package,
@@ -292,7 +292,7 @@ TEST_F(ExtensionsTest, TestAllowedApps) {
.appIsOnVendorImage = false,
.appIsOnProductImage = true},
/* useOnProductImageEnabled = */ true,
- whitelist));
+ allowlist));
}
} // namespace
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 22:18:14 +0000