summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-07-07 20:27:46 -0500
committerandroid-build-merger2017-07-07 20:27:46 -0500
commitc696c7a9b1e490b35a8a48fd42055757719d9701 (patch)
tree27eeb0232c4f05958e7d08633ab1f6efb7103f76
parentd377843355a6a4f76e6285868586fb4d2341fdd4 (diff)
parent6209d174da66ac6d4755e4dc0779379573ea06e9 (diff)
downloadplatform-system-libvintf-c696c7a9b1e490b35a8a48fd42055757719d9701.tar.gz
platform-system-libvintf-c696c7a9b1e490b35a8a48fd42055757719d9701.tar.xz
platform-system-libvintf-c696c7a9b1e490b35a8a48fd42055757719d9701.zip
Fix libvintf_test KernelParserConfig tests
am: 6209d174da Change-Id: I3fb699cc85d5dc7fa6db16d8f9582c240b956642
-rw-r--r--test/main.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/test/main.cpp b/test/main.cpp
index cf537c4..179407f 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1310,16 +1310,19 @@ TEST_F(LibVintfTest, MatrixXmlFilePathMissing) {
1310 EXPECT_EQ(matrix.getXmlSchemaPath("media_profile", {2, 0}), ""); 1310 EXPECT_EQ(matrix.getXmlSchemaPath("media_profile", {2, 0}), "");
1311} 1311}
1312 1312
1313static KernelConfigParser processData(const std::string& data, bool processComments) { 1313std::pair<KernelConfigParser, status_t> processData(const std::string& data, bool processComments) {
1314 KernelConfigParser parser(processComments); 1314 KernelConfigParser parser(processComments);
1315 const char* p = data.c_str(); 1315 const char* p = data.c_str();
1316 size_t n = 0; 1316 size_t n = 0;
1317 size_t chunkSize; 1317 size_t chunkSize;
1318 status_t status = OK;
1318 for (; n < data.size(); p += chunkSize, n += chunkSize) { 1319 for (; n < data.size(); p += chunkSize, n += chunkSize) {
1319 chunkSize = std::min<size_t>(5, data.size() - n); 1320 chunkSize = std::min<size_t>(5, data.size() - n);
1320 parser.process(p, chunkSize); 1321 if ((status = parser.process(p, chunkSize)) != OK) {
1322 break;
1323 }
1321 } 1324 }
1322 return parser; 1325 return {std::move(parser), status};
1323} 1326}
1324 1327
1325TEST_F(LibVintfTest, KernelConfigParser) { 1328TEST_F(LibVintfTest, KernelConfigParser) {
@@ -1329,8 +1332,9 @@ TEST_F(LibVintfTest, KernelConfigParser) {
1329 "CONFIG_ONE=1\n" 1332 "CONFIG_ONE=1\n"
1330 "CONFIG_Y=y\n" 1333 "CONFIG_Y=y\n"
1331 "CONFIG_STR=\"string\"\n"; 1334 "CONFIG_STR=\"string\"\n";
1332 KernelConfigParser parser = processData(data, false /* processComments */); 1335 auto pair = processData(data, false /* processComments */);
1333 const auto& configs = parser.configs(); 1336 ASSERT_EQ(OK, pair.second) << pair.first.error();
1337 const auto& configs = pair.first.configs();
1334 1338
1335 EXPECT_EQ(configs.find("CONFIG_ONE")->second, "1"); 1339 EXPECT_EQ(configs.find("CONFIG_ONE")->second, "1");
1336 EXPECT_EQ(configs.find("CONFIG_Y")->second, "y"); 1340 EXPECT_EQ(configs.find("CONFIG_Y")->second, "y");
@@ -1347,8 +1351,9 @@ TEST_F(LibVintfTest, KernelConfigParser2) {
1347 "CONFIG_STR=string\n" 1351 "CONFIG_STR=string\n"
1348 "# ignore_thiscomment\n" 1352 "# ignore_thiscomment\n"
1349 "# CONFIG_NOT_SET2 is not set\n"; 1353 "# CONFIG_NOT_SET2 is not set\n";
1350 KernelConfigParser parser = processData(data, true /* processComments */); 1354 auto pair = processData(data, true /* processComments */);
1351 const auto& configs = parser.configs(); 1355 ASSERT_EQ(OK, pair.second) << pair.first.error();
1356 const auto& configs = pair.first.configs();
1352 1357
1353 EXPECT_EQ(configs.find("CONFIG_ONE")->second, "1"); 1358 EXPECT_EQ(configs.find("CONFIG_ONE")->second, "1");
1354 EXPECT_EQ(configs.find("CONFIG_Y")->second, "y"); 1359 EXPECT_EQ(configs.find("CONFIG_Y")->second, "y");