1 files changed, 25 insertions, 104 deletions

diff --git a/simpleperf/cmd_inject_test.cpp b/simpleperf/cmd_inject_test.cpp
index 8668174c..1f057cb0 100644
--- a/simpleperf/cmd_inject_test.cpp
+++ b/simpleperf/cmd_inject_test.cpp
@@ -17,134 +17,55 @@
 #include <android-base/file.h>
 #include <gtest/gtest.h>
 
-#include "cmd_inject_impl.h"
 #include "command.h"
 #include "get_test_data.h"
 #include "test_util.h"
 #include "utils.h"
 
-using namespace simpleperf;
+static std::unique_ptr<Command> InjectCmd() { return CreateCommandInstance("inject"); }
 
-static std::unique_ptr<Command> InjectCmd() {
-  return CreateCommandInstance("inject");
-}
-
-static bool RunInjectCmd(std::vector<std::string>&& args) {
-  bool has_input = std::find(args.begin(), args.end(), "-i") != args.end();
-  if (!has_input) {
-    args.insert(args.end(), {"-i", GetTestData(PERF_DATA_ETM_TEST_LOOP)});
-  }
-  args.insert(args.end(), {"--symdir", GetTestDataDir() + "etm"});
-  return InjectCmd()->Run(args);
-}
-
-static bool RunInjectCmd(std::vector<std::string>&& args, std::string* output) {
+TEST(cmd_inject, smoke) {
   TemporaryFile tmpfile;
-  close(tmpfile.release());
-  args.insert(args.end(), {"-o", tmpfile.path});
-  if (!RunInjectCmd(std::move(args))) {
-    return false;
-  }
-  if (output != nullptr) {
-    return android::base::ReadFileToString(tmpfile.path, output);
-  }
-  return true;
-}
-
-static void CheckMatchingExpectedData(std::string& data) {
+  ASSERT_TRUE(InjectCmd()->Run({"--symdir", GetTestDataDir() + "etm", "-i",
+                                GetTestData(PERF_DATA_ETM_TEST_LOOP), "-o", tmpfile.path}));
+  std::string data;
+  ASSERT_TRUE(android::base::ReadFileToString(tmpfile.path, &data));
+  // Test that we can find instr range in etm_test_loop binary.
+  ASSERT_NE(data.find("etm_test_loop"), std::string::npos);
   std::string expected_data;
   ASSERT_TRUE(android::base::ReadFileToString(
       GetTestData(std::string("etm") + OS_PATH_SEPARATOR + "perf_inject.data"), &expected_data));
-  data.erase(std::remove(data.begin(), data.end(), '\r'), data.end());
   ASSERT_EQ(data, expected_data);
 }
 
-TEST(cmd_inject, smoke) {
-  std::string data;
-  ASSERT_TRUE(RunInjectCmd({}, &data));
-  // Test that we can find instr range in etm_test_loop binary.
-  ASSERT_NE(data.find("etm_test_loop"), std::string::npos);
-  CheckMatchingExpectedData(data);
-}
-
 TEST(cmd_inject, binary_option) {
   // Test that data for etm_test_loop is generated when selected by --binary.
+  TemporaryFile tmpfile;
+  ASSERT_TRUE(InjectCmd()->Run({"--symdir", GetTestDataDir() + "etm", "-i",
+                                GetTestData(PERF_DATA_ETM_TEST_LOOP), "--binary", "etm_test_loop",
+                                "-o", tmpfile.path}));
   std::string data;
-  ASSERT_TRUE(RunInjectCmd({"--binary", "etm_test_loop"}, &data));
+  ASSERT_TRUE(android::base::ReadFileToString(tmpfile.path, &data));
   ASSERT_NE(data.find("etm_test_loop"), std::string::npos);
 
   // Test that data for etm_test_loop is generated when selected by regex.
-  ASSERT_TRUE(RunInjectCmd({"--binary", "etm_t.*_loop"}, &data));
+  ASSERT_TRUE(InjectCmd()->Run({"--symdir", GetTestDataDir() + "etm", "-i",
+                                GetTestData(PERF_DATA_ETM_TEST_LOOP), "--binary", "etm_t.*_loop",
+                                "-o", tmpfile.path}));
+  ASSERT_TRUE(android::base::ReadFileToString(tmpfile.path, &data));
   ASSERT_NE(data.find("etm_test_loop"), std::string::npos);
 
   // Test that data for etm_test_loop isn't generated when not selected by --binary.
-  ASSERT_TRUE(RunInjectCmd({"--binary", "no_etm_test_loop"}, &data));
+  ASSERT_TRUE(InjectCmd()->Run({"--symdir", GetTestDataDir() + "etm", "-i",
+                                GetTestData(PERF_DATA_ETM_TEST_LOOP), "--binary",
+                                "no_etm_test_loop", "-o", tmpfile.path}));
+  ASSERT_TRUE(android::base::ReadFileToString(tmpfile.path, &data));
   ASSERT_EQ(data.find("etm_test_loop"), std::string::npos);
 
   // Test that data for etm_test_loop isn't generated when not selected by regex.
-  ASSERT_TRUE(RunInjectCmd({"--binary", "no_etm_test_.*"}, &data));
+  ASSERT_TRUE(InjectCmd()->Run({"--symdir", GetTestDataDir() + "etm", "-i",
+                                GetTestData(PERF_DATA_ETM_TEST_LOOP), "--binary",
+                                "no_etm_test_.*", "-o", tmpfile.path}));
+  ASSERT_TRUE(android::base::ReadFileToString(tmpfile.path, &data));
   ASSERT_EQ(data.find("etm_test_loop"), std::string::npos);
 }
-
-TEST(cmd_inject, exclude_perf_option) {
-  ASSERT_FALSE(RunInjectCmd({"--exclude-perf"}, nullptr));
-  std::string perf_with_recording_process =
-      GetTestData(std::string("etm") + OS_PATH_SEPARATOR + "perf_with_recording_process.data");
-  ASSERT_TRUE(RunInjectCmd({"--exclude-perf", "-i", perf_with_recording_process}, nullptr));
-}
-
-TEST(cmd_inject, output_option) {
-  TemporaryFile tmpfile;
-  close(tmpfile.release());
-  ASSERT_TRUE(RunInjectCmd({"--output", "autofdo", "-o", tmpfile.path}));
-  ASSERT_TRUE(RunInjectCmd({"--output", "branch-list", "-o", tmpfile.path}));
-  std::string autofdo_data;
-  ASSERT_TRUE(RunInjectCmd({"-i", tmpfile.path, "--output", "autofdo"}, &autofdo_data));
-  CheckMatchingExpectedData(autofdo_data);
-}
-
-TEST(cmd_inject, branch_to_proto_string) {
-  std::vector<bool> branch;
-  for (size_t i = 0; i < 100; i++) {
-    branch.push_back(i % 2 == 0);
-    std::string s = BranchToProtoString(branch);
-    for (size_t j = 0; j <= i; j++) {
-      bool b = s[j >> 3] & (1 << (j & 7));
-      ASSERT_EQ(b, branch[j]);
-    }
-    std::vector<bool> branch2 = ProtoStringToBranch(s, branch.size());
-    ASSERT_EQ(branch, branch2);
-  }
-}
-
-TEST(cmd_inject, skip_empty_output_file) {
-  TemporaryFile tmpfile;
-  close(tmpfile.release());
-  ASSERT_TRUE(RunInjectCmd(
-      {"--binary", "not_exist_binary", "--output", "branch-list", "-o", tmpfile.path}));
-  // The empty output file should not be produced.
-  ASSERT_FALSE(IsRegularFile(tmpfile.path));
-  tmpfile.DoNotRemove();
-}
-
-TEST(cmd_inject, inject_kernel_data) {
-  const std::string recording_file =
-      GetTestData(std::string("etm") + OS_PATH_SEPARATOR + "perf_kernel.data");
-
-  // Inject directly to autofdo format.
-  TemporaryFile tmpfile;
-  close(tmpfile.release());
-  ASSERT_TRUE(RunInjectCmd({"-i", recording_file, "-o", tmpfile.path}));
-  std::string autofdo_output;
-  ASSERT_TRUE(android::base::ReadFileToString(tmpfile.path, &autofdo_output));
-  ASSERT_NE(autofdo_output.find("rq_stats.ko"), std::string::npos);
-
-  // Inject through etm branch list.
-  TemporaryFile tmpfile2;
-  close(tmpfile2.release());
-  ASSERT_TRUE(RunInjectCmd({"-i", recording_file, "-o", tmpfile.path, "--output", "branch-list"}));
-  ASSERT_TRUE(RunInjectCmd({"-i", tmpfile.path, "-o", tmpfile2.path}));
-  std::string output;
-  ASSERT_TRUE(android::base::ReadFileToString(tmpfile2.path, &output));
-  ASSERT_EQ(output, autofdo_output);
-}