diff options
| author | Muhammad Qureshi <muhammadq@google.com> | 2020-03-05 09:48:48 -0800 |
|---|---|---|
| committer | Muhammad Qureshi <muhammadq@google.com> | 2020-03-05 14:52:05 -0800 |
| commit | f8460f70d072a3ae839002e5b2698ba535da7f76 (patch) | |
| tree | 1ddfef27fba803843e13f95b3466002858a5d2dc /tools/stats_log_api_gen/test_collation.cpp | |
| parent | c88fbf1e1c110765f8de1d288a620896c8e96220 (diff) | |
Support multiple module annotations per atom
Bug: 150864291
Test: m stats-log-api-gen-test &&
out/host/linux-x86/nativetest/stats-log-api-gen-test/stats-log-api-gen-test
Change-Id: Ibf8869078c6f1eae13e687f0196d6ed91ec35c64
Diffstat (limited to 'tools/stats_log_api_gen/test_collation.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/test_collation.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tools/stats_log_api_gen/test_collation.cpp b/tools/stats_log_api_gen/test_collation.cpp index a972e2342cad..73abaef1d91b 100644 --- a/tools/stats_log_api_gen/test_collation.cpp +++ b/tools/stats_log_api_gen/test_collation.cpp @@ -248,23 +248,27 @@ TEST(CollationTest, PassOnLogFromModuleAtom) { Atoms atoms; int errorCount = collate_atoms(ModuleAtoms::descriptor(), &atoms); EXPECT_EQ(errorCount, 0); - EXPECT_EQ(atoms.decls.size(), 3ul); + EXPECT_EQ(atoms.decls.size(), 4ul); } TEST(CollationTest, RecognizeModuleAtom) { Atoms atoms; int errorCount = collate_atoms(ModuleAtoms::descriptor(), &atoms); EXPECT_EQ(errorCount, 0); - EXPECT_EQ(atoms.decls.size(), 3ul); + EXPECT_EQ(atoms.decls.size(), 4ul); for (const auto& atomDecl: atoms.decls) { if (atomDecl.code == 1) { - EXPECT_TRUE(atomDecl.hasModule); - EXPECT_EQ(atomDecl.moduleName, "module1"); + EXPECT_EQ(1ul, atomDecl.moduleNames.size()); + EXPECT_NE(atomDecl.moduleNames.end(), atomDecl.moduleNames.find("module1")); } else if (atomDecl.code == 2) { - EXPECT_TRUE(atomDecl.hasModule); - EXPECT_EQ(atomDecl.moduleName, "module2"); + EXPECT_EQ(1ul, atomDecl.moduleNames.size()); + EXPECT_NE(atomDecl.moduleNames.end(), atomDecl.moduleNames.find("module2")); + } else if (atomDecl.code == 3) { + EXPECT_EQ(2ul, atomDecl.moduleNames.size()); + EXPECT_NE(atomDecl.moduleNames.end(), atomDecl.moduleNames.find("module1")); + EXPECT_NE(atomDecl.moduleNames.end(), atomDecl.moduleNames.find("module2")); } else { - EXPECT_FALSE(atomDecl.hasModule); + EXPECT_TRUE(atomDecl.moduleNames.empty()); } } @@ -286,4 +290,4 @@ TEST(CollationTest, RecognizeModuleAtom) { } } // namespace stats_log_api_gen -} // namespace android
\ No newline at end of file +} // namespace android |