diff options
Diffstat (limited to 'server/FirewallControllerTest.cpp')
| -rw-r--r-- | server/FirewallControllerTest.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server/FirewallControllerTest.cpp b/server/FirewallControllerTest.cpp index 836adb8b..71cc532f 100644 --- a/server/FirewallControllerTest.cpp +++ b/server/FirewallControllerTest.cpp @@ -30,7 +30,6 @@ #include "IptablesBaseTest.h" using android::base::Join; -using android::base::StringPrintf; using android::base::WriteStringToFile; namespace android { @@ -86,8 +85,8 @@ TEST_F(FirewallControllerTest, TestCreateWhitelistChain) { "COMMIT\n" }; std::vector<std::pair<IptablesTarget, std::string>> expectedRestoreCommands = { - { V4, android::base::Join(expectedRestore4, '\n') }, - { V6, android::base::Join(expectedRestore6, '\n') }, + {V4, Join(expectedRestore4, '\n')}, + {V6, Join(expectedRestore6, '\n')}, }; createChain("fw_whitelist", WHITELIST); @@ -104,8 +103,8 @@ TEST_F(FirewallControllerTest, TestCreateBlacklistChain) { "COMMIT\n" }; std::vector<std::pair<IptablesTarget, std::string>> expectedRestoreCommands = { - { V4, android::base::Join(expectedRestore, '\n') }, - { V6, android::base::Join(expectedRestore, '\n') }, + {V4, Join(expectedRestore, '\n')}, + {V6, Join(expectedRestore, '\n')}, }; createChain("fw_blacklist", BLACKLIST); @@ -348,4 +347,4 @@ TEST_F(FirewallControllerTest, TestDiscoverMaximumValidUid) { } } // namespace net -} // namespace android
\ No newline at end of file +} // namespace android |