From a5161a006c572aeb82b012df5dd8bcf4533b64c7 Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <codewiz@google.com>
Date: Wed, 30 Jan 2019 22:40:53 +0900
Subject: Enable more clang-tidy checks and treat them as errors

Test: tests/runtests.sh
Change-Id: If59480cee6460847f5c1cef17e3ef036b8e75651
---
 server/FirewallControllerTest.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'server/FirewallControllerTest.cpp')

diff --git a/server/FirewallControllerTest.cpp b/server/FirewallControllerTest.cpp
index 836adb8b8..71cc532fe 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
-- 
cgit v1.2.3