diff options
| author | Salud Lemus <saludlemus@google.com> | 2020-07-28 19:23:56 +0000 |
|---|---|---|
| committer | Salud Lemus <saludlemus@google.com> | 2020-07-31 17:31:53 +0000 |
| commit | 0cbe9d948bbe7f280455e5a8224d99341fac7adb (patch) | |
| tree | 86d327912fe862fe30bf58b0e3423fbb4dbe686d /tools/stats_log_api_gen/test_collation.cpp | |
| parent | 6d8780292a2cc1edd7e5d2d6cea6e1d3877a87dc (diff) | |
Update stats-log-api-gen source based off of google3 presubmit checks
Bug: 161812407
Test: `m statslog-framework-java-gen`
Test: `m statslog-telephony-java-gen`
Test: `m stats-log-api-gen-test && out/host/linux-x86/nativetest/stats-log-api-gen-test/stats-log-api-gen-test`
Change-Id: Id68982e306fbc379ed8e90b33a38b8a6604e66ad
Diffstat (limited to 'tools/stats_log_api_gen/test_collation.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/test_collation.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/stats_log_api_gen/test_collation.cpp b/tools/stats_log_api_gen/test_collation.cpp index 5fd728a29c07..6f78921d8f1c 100644 --- a/tools/stats_log_api_gen/test_collation.cpp +++ b/tools/stats_log_api_gen/test_collation.cpp @@ -24,7 +24,6 @@ namespace android { namespace stats_log_api_gen { using std::map; -using std::set; using std::vector; /** @@ -32,11 +31,11 @@ using std::vector; */ static bool map_contains_vector(const SignatureInfoMap& s, int count, ...) { va_list args; - vector<java_type_t> v; + vector<java_type_t> v(count); va_start(args, count); for (int i = 0; i < count; i++) { - v.push_back((java_type_t)va_arg(args, int)); + v[i] = static_cast<java_type_t>(va_arg(args, int)); } va_end(args); @@ -222,7 +221,7 @@ TEST(CollationTest, FailOnBadBinaryFieldAtom) { Atoms atoms; int errorCount = collate_atoms(BadEventWithBinaryFieldAtom::descriptor(), DEFAULT_MODULE_NAME, &atoms); - EXPECT_TRUE(errorCount > 0); + EXPECT_GT(errorCount, 0); } TEST(CollationTest, PassOnLogFromModuleAtom) { |