Change gzlog_TEST to use get_sha1 function rather than pipe to shasum command

Author: scpeters

tools/gzlog_TEST.cc

@@ -18,6 +18,7 @@
 #include <gtest/gtest.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/trim.hpp>
+#include <gazebo/common/CommonIface.hh>
 #include <gazebo/common/Time.hh>
 
 #include <stdio.h>
@@ -134,52 +135,52 @@ TEST(gzlog, Echo)
 /// Check to make sure that 'gzlog echo --filter' returns correct information
 TEST(gzlog, EchoFilter)
 {
-  std::string echo;
+  std::string echo, shasum;
 
   // Test model filter
   echo = custom_exec(
       std::string("gzlog echo --filter pr2 ") +
-      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log | shasum");
-  boost::trim_right(echo);
+      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log");
+  shasum = gazebo::common::get_sha1<std::string>(echo);
   // EXPECT_EQ(pr2StateLog, echo);
-  EXPECT_EQ(echo, "0bf1f293b164bbe820267f970c4b419acdca4b01  -");
+  EXPECT_EQ(shasum, "0bf1f293b164bbe820267f970c4b419acdca4b01");
 
   echo = custom_exec(
       std::string("gzlog echo --filter pr2.pose ") +
-      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log | shasum");
-  boost::trim_right(echo);
+      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log");
+  shasum = gazebo::common::get_sha1<std::string>(echo);
   // EXPECT_EQ(pr2PoseStateLog, echo);
-  EXPECT_EQ(echo, "33db2cbd0841466a67abd7d2bbc69cf2cfae19b6  -");
+  EXPECT_EQ(shasum, "33db2cbd0841466a67abd7d2bbc69cf2cfae19b6");
 
   echo = custom_exec(
       std::string("gzlog echo --filter pr2.pose.x ") +
-      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log | shasum");
-  boost::trim_right(echo);
+      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log");
+  shasum = gazebo::common::get_sha1<std::string>(echo);
   // EXPECT_EQ(pr2PoseXStateLog, echo);
-  EXPECT_EQ(echo, "07113f16d44e2484f769fd1947ff5dca93f55cf4  -");
+  EXPECT_EQ(shasum, "07113f16d44e2484f769fd1947ff5dca93f55cf4");
 
   echo = custom_exec(
       std::string("gzlog echo --filter pr2.pose.[x,y] ") +
-      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log | shasum");
-  boost::trim_right(echo);
+      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log");
+  shasum = gazebo::common::get_sha1<std::string>(echo);
   // EXPECT_EQ(pr2PoseXYStateLog, echo);
-  EXPECT_EQ(echo, "7f34f3fac505707727a74ac8659bb8736932ab07  -");
+  EXPECT_EQ(shasum, "7f34f3fac505707727a74ac8659bb8736932ab07");
 
   // Test link filter
   echo = custom_exec(
       std::string("gzlog echo --filter pr2/r_upper*.pose ") +
-      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log | shasum");
-  boost::trim_right(echo);
+      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log");
+  shasum = gazebo::common::get_sha1<std::string>(echo);
   // EXPECT_EQ(pr2LinkStateLog, echo);
-  EXPECT_EQ(echo, "d52ba4333511b7e4339db3eb71814c73473fba36  -");
+  EXPECT_EQ(shasum, "d52ba4333511b7e4339db3eb71814c73473fba36");
 
   // Test joint filter
   echo = custom_exec(
       std::string("gzlog echo --filter pr2//r_upper_arm_roll_joint ") +
-      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log | shasum");
-  boost::trim_right(echo);
+      PROJECT_SOURCE_PATH + "/test/data/pr2_state.log");
+  shasum = gazebo::common::get_sha1<std::string>(echo);
   // EXPECT_EQ(pr2JointStateLog, echo);
-  EXPECT_EQ(echo, "2f689dadc66171a76f7f3400bc218485a923c324  -");
+  EXPECT_EQ(shasum, "2f689dadc66171a76f7f3400bc218485a923c324");
 }
 
 /////////////////////////////////////////////////
@@ -218,21 +219,24 @@ TEST(gzlog, HzFilter)
 /// Just check number of characters returned for now
 TEST(gzlog, Step)
 {
-  std::string stepCmd;
+  std::string stepCmd, shasum;
   stepCmd = std::string("gzlog step ") + PROJECT_SOURCE_PATH +
-    std::string("/test/data/pr2_state.log | shasum");
+    std::string("/test/data/pr2_state.log");
 
   // Call gzlog step and press q immediately
   std::string stepq0 = custom_exec(std::string("echo 'q' | ") + stepCmd);
-  EXPECT_EQ(stepq0, "6d3af4f4d1214fe3a4860ab42777eb4d0f89c6b2  -\n");
+  shasum = gazebo::common::get_sha1<std::string>(stepq0);
+  EXPECT_EQ(shasum, "6d3af4f4d1214fe3a4860ab42777eb4d0f89c6b2");
 
   // Call gzlog step and press space once, then q
   std::string stepq1 = custom_exec(std::string("echo ' q' | ") + stepCmd);
-  EXPECT_EQ(stepq1, "43eacb140e00ef0525d54667bc558d63dac3d21f  -\n");
+  shasum = gazebo::common::get_sha1<std::string>(stepq1);
+  EXPECT_EQ(shasum, "43eacb140e00ef0525d54667bc558d63dac3d21f");
 
   // Call gzlog step and press space twice, then q
   std::string stepq2 = custom_exec(std::string("echo '  q' | ") + stepCmd);
-  EXPECT_EQ(stepq2, "37e133d15d3f74cbc686bfceb26b8db46e2f6bf5  -\n");
+  shasum = gazebo::common::get_sha1<std::string>(stepq2);
+  EXPECT_EQ(shasum, "37e133d15d3f74cbc686bfceb26b8db46e2f6bf5");
 }
 
 /////////////////////////////////////////////////