Skip to content

Fix JSON parsing in CCDB api test #3470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 3 commits into from
Apr 28, 2020
Merged

Fix JSON parsing in CCDB api test #3470

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42ee92e
Fix JSON parsing in CCDB api test
Barthelemy Apr 28, 2020
b838f48
format
Barthelemy Apr 28, 2020
b90ca08
Update O2ReportNonTestedMacros.cmake
Barthelemy Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions CCDB/test/testCcdbApi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
#include <sys/types.h>
#include <unistd.h>

#include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/foreach.hpp>
#include <boost/optional/optional.hpp>

using namespace std;
using namespace o2::ccdb;
namespace utf = boost::unit_test;
Expand Down Expand Up @@ -308,30 +313,16 @@ void countItems(const string& s, int& countObjects, int& countSubfolders)
countObjects = 0;
countSubfolders = 0;
std::stringstream ss(s);
std::string line;
bool subfolderMode = false;
while (std::getline(ss, line, '\n')) {
o2::utils::ltrim(line);
o2::utils::rtrim(line);
if (line.length() == 0) {
continue;
}

if (line.find("subfolders") != std::string::npos) {
subfolderMode = true;
continue;
}
boost::property_tree::ptree pt;
boost::property_tree::read_json(ss, pt);

if (subfolderMode) {
countSubfolders++;
if (line.find(']') != std::string::npos) {
break;
}
}
if (pt.count("objects") > 0) {
countObjects = pt.get_child("objects").size();
}

if (line.find(R"("path")") == 0) {
countObjects++;
}
if (pt.count("subfolders") > 0) {
countSubfolders = pt.get_child("subfolders").size();
}
}

Expand Down