Style changes in `libnativebridge-tests`.

This is a follow-up to
https://android-review.git.corp.google.com/c/platform/art/+/3080063.

Test: atest --host libnativebridge-tests
Test: atest libnativebridge-tests
Bug: 189484095
Flag: TEST_ONLY
Change-Id: I8d30747d8713e9c1d29e08758df7c7d9d68e2846

14 files changed, 43 insertions, 43 deletions

diff --git a/libnativebridge/tests/CodeCacheCreate_test.cpp b/libnativebridge/tests/CodeCacheCreate_test.cpp
index 57b1abc4c5..9af226c596 100644
--- a/libnativebridge/tests/CodeCacheCreate_test.cpp
+++ b/libnativebridge/tests/CodeCacheCreate_test.cpp
@@ -26,25 +26,25 @@ namespace android {
 // exist.
 TEST_F(NativeBridgeTest, CodeCacheCreate) {
     // Make sure that code_cache does not exist
-    rmdir(codeCache());
+    rmdir(CodeCache());
     struct stat st;
-    ASSERT_EQ(-1, stat(codeCache(), &st));
+    ASSERT_EQ(-1, stat(CodeCache(), &st));
     ASSERT_EQ(ENOENT, errno);
 
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr));
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_FALSE(NativeBridgeError());
 
     // Check that code_cache was created
-    ASSERT_EQ(0, stat(codeCache(), &st));
+    ASSERT_EQ(0, stat(CodeCache(), &st));
     ASSERT_TRUE(S_ISDIR(st.st_mode));
 
     // Clean up
     UnloadNativeBridge();
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 
     ASSERT_FALSE(NativeBridgeError());
 }
diff --git a/libnativebridge/tests/CodeCacheExists_test.cpp b/libnativebridge/tests/CodeCacheExists_test.cpp
index c740bec79c..0e6d237c89 100644
--- a/libnativebridge/tests/CodeCacheExists_test.cpp
+++ b/libnativebridge/tests/CodeCacheExists_test.cpp
@@ -27,26 +27,26 @@ namespace android {
 TEST_F(NativeBridgeTest, CodeCacheExists) {
     // Make sure that code_cache does not exists
     struct stat st;
-    ASSERT_EQ(-1, stat(codeCache(), &st));
+    ASSERT_EQ(-1, stat(CodeCache(), &st));
     ASSERT_EQ(ENOENT, errno);
 
     // Create the code_cache
-    ASSERT_EQ(0, mkdir(codeCache(), S_IRWXU | S_IRWXG | S_IXOTH));
+    ASSERT_EQ(0, mkdir(CodeCache(), S_IRWXU | S_IRWXG | S_IXOTH));
 
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr));
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_FALSE(NativeBridgeError());
 
     // Check that the code cache is still there
-    ASSERT_EQ(0, stat(codeCache(), &st));
+    ASSERT_EQ(0, stat(CodeCache(), &st));
     ASSERT_TRUE(S_ISDIR(st.st_mode));
 
     // Clean up
     UnloadNativeBridge();
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 
     ASSERT_FALSE(NativeBridgeError());
 }
diff --git a/libnativebridge/tests/CodeCacheStatFail_test.cpp b/libnativebridge/tests/CodeCacheStatFail_test.cpp
index 768f07944c..d13c6530ba 100644
--- a/libnativebridge/tests/CodeCacheStatFail_test.cpp
+++ b/libnativebridge/tests/CodeCacheStatFail_test.cpp
@@ -26,17 +26,17 @@ namespace android {
 // Tests that the bridge is initialized without errors if the code_cache is
 // existed as a file.
 TEST_F(NativeBridgeTest, CodeCacheStatFail) {
-  int fd = creat(codeCache(), O_RDWR);
+  int fd = creat(CodeCache(), O_RDWR);
   ASSERT_NE(-1, fd);
   close(fd);
 
   struct stat st;
-  ASSERT_EQ(-1, stat(codeCacheStatFail(), &st));
+  ASSERT_EQ(-1, stat(CodeCacheStatFail(), &st));
   ASSERT_EQ(ENOTDIR, errno);
 
   // Init
   ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr));
-  ASSERT_TRUE(PreInitializeNativeBridge(codeCacheStatFail(), "isa"));
+  ASSERT_TRUE(PreInitializeNativeBridge(CodeCacheStatFail(), "isa"));
   ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
   ASSERT_TRUE(NativeBridgeAvailable());
   ASSERT_FALSE(NativeBridgeError());
@@ -45,7 +45,7 @@ TEST_F(NativeBridgeTest, CodeCacheStatFail) {
   UnloadNativeBridge();
 
   ASSERT_FALSE(NativeBridgeError());
-  unlink(codeCache());
+  unlink(CodeCache());
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/CompleteFlow_test.cpp b/libnativebridge/tests/CompleteFlow_test.cpp
index a4a6f20df9..24f255699c 100644
--- a/libnativebridge/tests/CompleteFlow_test.cpp
+++ b/libnativebridge/tests/CompleteFlow_test.cpp
@@ -24,7 +24,7 @@ TEST_F(NativeBridgeTest, CompleteFlow) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
@@ -41,7 +41,7 @@ TEST_F(NativeBridgeTest, CompleteFlow) {
     ASSERT_FALSE(NativeBridgeError());
 
     // Clean-up code_cache
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge2Signal_test.cpp b/libnativebridge/tests/NativeBridge2Signal_test.cpp
index a1663caeba..1edfcd4e57 100644
--- a/libnativebridge/tests/NativeBridge2Signal_test.cpp
+++ b/libnativebridge/tests/NativeBridge2Signal_test.cpp
@@ -25,7 +25,7 @@ TEST_F(NativeBridgeTest, V2_Signal) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary2, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
@@ -34,7 +34,7 @@ TEST_F(NativeBridgeTest, V2_Signal) {
     ASSERT_NE(nullptr, NativeBridgeGetSignalHandler(SIGSEGV));
 
     // Clean-up code_cache
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp b/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp
index 2b709e05ab..7cd8e6b34e 100644
--- a/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp
+++ b/libnativebridge/tests/NativeBridge3CreateNamespace_test.cpp
@@ -22,7 +22,7 @@ TEST_F(NativeBridgeTest, V3_CreateNamespace) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary3, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
@@ -32,7 +32,7 @@ TEST_F(NativeBridgeTest, V3_CreateNamespace) {
                                                    0, nullptr, nullptr));
 
     // Clean-up code_cache
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge3GetError_test.cpp b/libnativebridge/tests/NativeBridge3GetError_test.cpp
index e74e664881..cc376123eb 100644
--- a/libnativebridge/tests/NativeBridge3GetError_test.cpp
+++ b/libnativebridge/tests/NativeBridge3GetError_test.cpp
@@ -22,7 +22,7 @@ TEST_F(NativeBridgeTest, V3_GetError) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary3, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
@@ -31,7 +31,7 @@ TEST_F(NativeBridgeTest, V3_GetError) {
     ASSERT_EQ(nullptr, NativeBridgeGetError());
 
     // Clean-up code_cache
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp b/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp
index 2449939362..5267bb2244 100644
--- a/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp
+++ b/libnativebridge/tests/NativeBridge3InitAnonymousNamespace_test.cpp
@@ -22,7 +22,7 @@ TEST_F(NativeBridgeTest, V3_InitAnonymousNamespace) {
   // Init
   ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary3, nullptr));
   ASSERT_TRUE(NativeBridgeAvailable());
-  ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+  ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
   ASSERT_TRUE(NativeBridgeAvailable());
   ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
   ASSERT_TRUE(NativeBridgeAvailable());
@@ -31,7 +31,7 @@ TEST_F(NativeBridgeTest, V3_InitAnonymousNamespace) {
   ASSERT_EQ(true, NativeBridgeInitAnonymousNamespace(nullptr, nullptr));
 
   // Clean-up code_cache
-  ASSERT_EQ(0, rmdir(codeCache()));
+  ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp b/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp
index fd162c099d..cafa292560 100644
--- a/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp
+++ b/libnativebridge/tests/NativeBridge3IsPathSupported_test.cpp
@@ -22,7 +22,7 @@ TEST_F(NativeBridgeTest, V3_IsPathSupported) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary3, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
@@ -31,7 +31,7 @@ TEST_F(NativeBridgeTest, V3_IsPathSupported) {
     ASSERT_EQ(true, NativeBridgeIsPathSupported(nullptr));
 
     // Clean-up code_cache
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp b/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp
index eeb27e8431..1dbf11f2dd 100644
--- a/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp
+++ b/libnativebridge/tests/NativeBridge3LoadLibraryExt_test.cpp
@@ -22,7 +22,7 @@ TEST_F(NativeBridgeTest, V3_LoadLibraryExt) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary3, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
@@ -31,7 +31,7 @@ TEST_F(NativeBridgeTest, V3_LoadLibraryExt) {
     ASSERT_EQ(nullptr, NativeBridgeLoadLibraryExt(nullptr, 0, nullptr));
 
     // Clean-up code_cache
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp b/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp
index 39bf251f65..084b103971 100644
--- a/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp
+++ b/libnativebridge/tests/NativeBridge3UnloadLibrary_test.cpp
@@ -22,7 +22,7 @@ TEST_F(NativeBridgeTest, V3_UnloadLibrary) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary3, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
@@ -31,7 +31,7 @@ TEST_F(NativeBridgeTest, V3_UnloadLibrary) {
     ASSERT_EQ(0, NativeBridgeUnloadLibrary(nullptr));
 
     // Clean-up code_cache
-    ASSERT_EQ(0, rmdir(codeCache()));
+    ASSERT_EQ(0, rmdir(CodeCache()));
 }
 
 }  // namespace android
diff --git a/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp b/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp
index b40e7bd79e..cfcded8676 100644
--- a/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp
+++ b/libnativebridge/tests/NativeBridge6PreZygoteFork_test.cpp
@@ -23,7 +23,7 @@ TEST_F(NativeBridgeTest, V6_PreZygoteFork) {
     // Init
     ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary6, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+    ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
     ASSERT_TRUE(NativeBridgeAvailable());
     ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
     ASSERT_TRUE(NativeBridgeAvailable());
diff --git a/libnativebridge/tests/NativeBridge7CriticalNative_test.cpp b/libnativebridge/tests/NativeBridge7CriticalNative_test.cpp
index a8c9bb65c4..e80d981d6d 100644
--- a/libnativebridge/tests/NativeBridge7CriticalNative_test.cpp
+++ b/libnativebridge/tests/NativeBridge7CriticalNative_test.cpp
@@ -23,7 +23,7 @@ TEST_F(NativeBridgeTest, V7_CriticalNative) {
   // Init
   ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary7, nullptr));
   ASSERT_TRUE(NativeBridgeAvailable());
-  ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa"));
+  ASSERT_TRUE(PreInitializeNativeBridge(AppDataDir(), "isa"));
   ASSERT_TRUE(NativeBridgeAvailable());
   ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
   ASSERT_TRUE(NativeBridgeAvailable());
diff --git a/libnativebridge/tests/NativeBridgeTest.h b/libnativebridge/tests/NativeBridgeTest.h
index 782e58424b..509973d756 100644
--- a/libnativebridge/tests/NativeBridgeTest.h
+++ b/libnativebridge/tests/NativeBridgeTest.h
@@ -35,22 +35,22 @@ namespace android {
 
 class NativeBridgeTest : public testing::Test {
  protected:
-  NativeBridgeTest() : tempDir() {
-    appDataDir_ = std::string(tempDir.path);
-    codeCache_ = appDataDir_ + "/code_cache";
-    codeCacheStatFail_ = codeCache_ + "/temp";
+  NativeBridgeTest() : temp_dir_() {
+    app_data_dir_ = std::string(temp_dir_.path);
+    code_cache_ = app_data_dir_ + "/code_cache";
+    code_cache_stat_fail_ = code_cache_ + "/temp";
   }
 
-  const char* appDataDir() { return appDataDir_.c_str(); }
+  const char* AppDataDir() { return app_data_dir_.c_str(); }
 
-  const char* codeCache() { return codeCache_.c_str(); }
+  const char* CodeCache() { return code_cache_.c_str(); }
 
-  const char* codeCacheStatFail() { return codeCacheStatFail_.c_str(); }
+  const char* CodeCacheStatFail() { return code_cache_stat_fail_.c_str(); }
 
-  TemporaryDir tempDir;
-  std::string appDataDir_;
-  std::string codeCache_;
-  std::string codeCacheStatFail_;
+  TemporaryDir temp_dir_;
+  std::string app_data_dir_;
+  std::string code_cache_;
+  std::string code_cache_stat_fail_;
 };
 
 };  // namespace android