commit 63137e5ded659c02eb70d59ef38f99aecac4d076
author J. Richard Barnette <jrbarnette@chromium.org> Mon Oct 28 10:57:29 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Oct 28 20:17:19 2013 +0000
tree a0f01d7a1fc4fadd89850c67b962fc4351a0381f
parent 60fc59c3936dee428924a8fd7fbee3a73787cdca

Split GetECVersion to allow saner unit testing.

Previously, GetECVersion() accepted a (const char *) parameter that
was used solely as a flag meaning "unit test this function with
the specified data in place of mosys output".  This change splits
the function into GetECVersion() and ParseECVersion(), and only unit
tests the second part.

BUG=None
TEST=unit tests

Change-Id: Ic48d18c02bd1924f49a0d8f0034ccb1ae8b5231e
Reviewed-on: https://chromium-review.googlesource.com/174883
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>

utils.cc

diff --git a/utils.cc b/utils.cc
index c5d3e05..7a304ee 100644
--- a/utils.cc
+++ b/utils.cc
@@ -109,30 +109,30 @@
   return ReadValueFromCrosSystem("fwid");
 }
 
-string GetECVersion(const char* input_line) {
-  string line;
-  if(input_line == NULL) {
-    int exit_code = 0;
-    vector<string> cmd(1, "/usr/sbin/mosys");
-    cmd.push_back("-k");
-    cmd.push_back("ec");
-    cmd.push_back("info");
+string GetECVersion() {
+  int exit_code = 0;
+  vector<string> cmd(1, "/usr/sbin/mosys");
+  cmd.push_back("-k");
+  cmd.push_back("ec");
+  cmd.push_back("info");
 
-    bool success = Subprocess::SynchronousExec(cmd, &exit_code, &line);
-    if (!success || exit_code) {
-      LOG(ERROR) << "Unable to read ec info from mosys (" << exit_code << ")";
-      return "";
-    }
-  } else {
-    line = input_line;
+  string input_line;
+  bool success = Subprocess::SynchronousExec(cmd, &exit_code, &input_line);
+  if (!success || exit_code) {
+    LOG(ERROR) << "Unable to read ec info from mosys (" << exit_code << ")";
+    return "";
   }
 
-  TrimWhitespaceASCII(line, TRIM_ALL, &line);
+  return ParseECVersion(input_line);
+}
+
+string ParseECVersion(string input_line) {
+  TrimWhitespaceASCII(input_line, TRIM_ALL, &input_line);
 
   // At this point we want to conver the format key=value pair from mosys to
   // a vector of key value pairs.
   vector<pair<string, string> > kv_pairs;
-  if (base::SplitStringIntoKeyValuePairs(line, '=', ' ', &kv_pairs)) {
+  if (base::SplitStringIntoKeyValuePairs(input_line, '=', ' ', &kv_pairs)) {
     for (vector<pair<string, string> >::iterator it = kv_pairs.begin();
          it != kv_pairs.end(); ++it) {
       // Finally match against the fw_verion which may have quotes.