Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01d2f57c authored by David Duarte's avatar David Duarte
Browse files

RootCanal: Replace base::SplitString with a std::regex 



Tag: #testing
Test: root-canal -default_commands_file /dev/stdin
Change-Id: I56db4b9286841feb80a4178f37690bcfefcc0833
Signed-off-by: default avatarDavid Duarte <licorne@google.com>
parent 5dd2bd7e

system/vendor_libs/test_vendor_lib/model/setup/test_command_handler.cc

+16 −15
Original line number Diff line number Diff line
@@ -18,15 +18,12 @@ 
#include "device_boutique.h"

#include "phy.h"



#include <fstream>

#include <memory>

#include <regex>



#include <stdlib.h>



#include "base/files/file_util.h"

#include "base/json/json_reader.h"

#include "base/strings/string_split.h"

#include "base/values.h"



#include "os/log.h"

#include "osi/include/osi.h"
@@ -102,18 +99,22 @@ void TestCommandHandler::FromFile(const std::string& file_name) { 
    return;

  }



  std::string commands_raw;

  if (!base::ReadFileToString(base::FilePath::FromUTF8Unsafe(file_name), &commands_raw)) {

    LOG_ERROR("Error reading commands from file.");

    return;

  std::ifstream file(file_name.c_str());



  const std::regex re("\\s+");



  std::string line;

  while (std::getline(file, line)) {

    auto begin = std::sregex_token_iterator(line.begin(), line.end(), re, -1);

    auto end = std::sregex_token_iterator();

    auto params = std::vector<std::string>(std::next(begin), end);



    HandleCommand(*begin, params);

  }



  base::StringPairs command_pairs;

  base::SplitStringIntoKeyValuePairs(commands_raw, ' ', '\n', &command_pairs);

  for (const std::pair<std::string, std::string>& p : command_pairs) {

    auto params = base::SplitString(p.second, " ", base::TRIM_WHITESPACE,

                                    base::SPLIT_WANT_NONEMPTY);

    HandleCommand(p.first, params);

  if (file.fail()) {

    LOG_ERROR("Error reading commands from file.");

    return;

  }

}