diff options
author | 2020-07-27 12:49:24 +0000 | |
---|---|---|
committer | 2020-07-27 14:50:45 +0000 | |
commit | 8ebd86ea2ea9eac96d48db88c65364d56ff3b8ab (patch) | |
tree | 8d4009c204136af090ec904a35168572b06c1b1a | |
parent | 07f78906212edb684b3bf046d1bb661613f81c22 (diff) |
Replace "dummy" in libartbase/, libdexfile/, compiler/.
Test: m test-art-host-gtest
Bug: 161336379
Change-Id: I5335b28b1f66cdec39500563385bda99c580454d
-rw-r--r-- | compiler/linker/output_stream_test.cc | 2 | ||||
-rw-r--r-- | libartbase/base/hash_set.h | 4 | ||||
-rw-r--r-- | libartbase/base/hash_set_test.cc | 6 | ||||
-rw-r--r-- | libartbase/base/utils_test.cc | 2 | ||||
-rw-r--r-- | libdexfile/dex/dex_file_verifier.cc | 6 | ||||
-rw-r--r-- | libdexfile/external/dex_file_ext_c_test.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/compiler/linker/output_stream_test.cc b/compiler/linker/output_stream_test.cc index 00231b1240..f1af4cb8b7 100644 --- a/compiler/linker/output_stream_test.cc +++ b/compiler/linker/output_stream_test.cc @@ -103,7 +103,7 @@ TEST_F(OutputStreamTest, Vector) { TEST_F(OutputStreamTest, BufferedFlush) { struct CheckingOutputStream : OutputStream { CheckingOutputStream() - : OutputStream("dummy"), + : OutputStream("fake-location"), flush_called(false) { } ~CheckingOutputStream() override {} diff --git a/libartbase/base/hash_set.h b/libartbase/base/hash_set.h index 585c4ce528..0ce405c5f5 100644 --- a/libartbase/base/hash_set.h +++ b/libartbase/base/hash_set.h @@ -417,8 +417,8 @@ class HashSet { // Find an element, returns end() if not found. // Allows custom key (K) types, example of when this is useful: - // Set of Class* sorted by name, want to find a class with a name but can't allocate a dummy - // object in the heap for performance solution. + // Set of Class* indexed by name, want to find a class with a name but can't allocate + // a temporary Class object in the heap for performance solution. template <typename K> iterator find(const K& key) { return FindWithHash(key, hashfn_(key)); diff --git a/libartbase/base/hash_set_test.cc b/libartbase/base/hash_set_test.cc index 9e6e6d2083..b72fc81c21 100644 --- a/libartbase/base/hash_set_test.cc +++ b/libartbase/base/hash_set_test.cc @@ -357,7 +357,7 @@ TEST_F(HashSetTest, TestReserve) { } TEST_F(HashSetTest, IteratorConversion) { - const char* test_string = "dummy"; + const char* test_string = "test string"; HashSet<std::string> hash_set; HashSet<std::string>::iterator it = hash_set.insert(test_string).first; HashSet<std::string>::const_iterator cit = it; @@ -366,7 +366,7 @@ TEST_F(HashSetTest, IteratorConversion) { } TEST_F(HashSetTest, StringSearchStringView) { - const char* test_string = "dummy"; + const char* test_string = "test string"; HashSet<std::string> hash_set; HashSet<std::string>::iterator insert_pos = hash_set.insert(test_string).first; HashSet<std::string>::iterator it = hash_set.find(std::string_view(test_string)); @@ -374,7 +374,7 @@ TEST_F(HashSetTest, StringSearchStringView) { } TEST_F(HashSetTest, DoubleInsert) { - const char* test_string = "dummy"; + const char* test_string = "test string"; HashSet<std::string> hash_set; hash_set.insert(test_string); hash_set.insert(test_string); diff --git a/libartbase/base/utils_test.cc b/libartbase/base/utils_test.cc index e24794b096..f67ada261e 100644 --- a/libartbase/base/utils_test.cc +++ b/libartbase/base/utils_test.cc @@ -112,7 +112,7 @@ TEST_F(UtilsTest, GetProcessStatus) { EXPECT_EQ("R (running)", GetProcessStatus("State")); EXPECT_EQ("<unknown>", GetProcessStatus("tate")); EXPECT_EQ("<unknown>", GetProcessStatus("e")); - EXPECT_EQ("<unknown>", GetProcessStatus("Dummy")); + EXPECT_EQ("<unknown>", GetProcessStatus("InvalidFieldName")); } } // namespace art diff --git a/libdexfile/dex/dex_file_verifier.cc b/libdexfile/dex/dex_file_verifier.cc index efa87ff071..72f28bc695 100644 --- a/libdexfile/dex/dex_file_verifier.cc +++ b/libdexfile/dex/dex_file_verifier.cc @@ -1724,7 +1724,7 @@ bool DexFileVerifier::CheckIntraStringDataItem() { } bool DexFileVerifier::CheckIntraDebugInfoItem() { - DECODE_UNSIGNED_CHECKED_FROM(ptr_, dummy); + DECODE_UNSIGNED_CHECKED_FROM(ptr_, unused_line_start); DECODE_UNSIGNED_CHECKED_FROM(ptr_, parameters_size); if (UNLIKELY(parameters_size > 65536)) { ErrorStringPrintf("Invalid parameters_size: %x", parameters_size); @@ -1748,11 +1748,11 @@ bool DexFileVerifier::CheckIntraDebugInfoItem() { return true; } case DexFile::DBG_ADVANCE_PC: { - DECODE_UNSIGNED_CHECKED_FROM(ptr_, advance_pc_dummy); + DECODE_UNSIGNED_CHECKED_FROM(ptr_, unused_advance_pc); break; } case DexFile::DBG_ADVANCE_LINE: { - DECODE_SIGNED_CHECKED_FROM(ptr_, advance_line_dummy); + DECODE_SIGNED_CHECKED_FROM(ptr_, unused_advance_line); break; } case DexFile::DBG_START_LOCAL: { diff --git a/libdexfile/external/dex_file_ext_c_test.c b/libdexfile/external/dex_file_ext_c_test.c index c448a169ec..72c8feef02 100644 --- a/libdexfile/external/dex_file_ext_c_test.c +++ b/libdexfile/external/dex_file_ext_c_test.c @@ -27,7 +27,7 @@ static const char gtest_output_xml[] = "\ <?xml version=\"1.0\"?>\n\ <testsuites tests=\"0\" failures=\"0\" disabled=\"0\" errors=\"0\" name=\"AllTests\">"; -/* Writes a dummy gtest xml report to the given path. */ +/* Writes a fake gtest xml report to the given path. */ static int write_gtest_output_xml(char* gtest_output_path) { FILE* output_fd = fopen(gtest_output_path, "w"); if (output_fd == NULL) { |