commit 373f17661fac2638cb3507dbe5947d5adf0bfee2
author Austin Schuh <austin.linux@gmail.com> Wed Jun 02 21:07:09 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Wed Jun 02 21:14:06 2021 -0700
tree c98dfaf146671b8263a76b13d5cbe922a3b8e3c0
parent 909698b6d1607334631210e48541849a3d14e306

Create ArtifactPath function to abstract test paths

When AOS is included as an external repo and renamed, paths have to be
updated.  Make a function to handle all this.

Change-Id: If1dfbfb3191809d86da1dca92981b7a0b851c51f

aos/events/simulated_event_loop_test.cc

diff --git a/aos/events/simulated_event_loop_test.cc b/aos/events/simulated_event_loop_test.cc
index ca0060c..7191365 100644
--- a/aos/events/simulated_event_loop_test.cc
+++ b/aos/events/simulated_event_loop_test.cc
@@ -13,13 +13,14 @@
 #include "aos/network/remote_message_generated.h"
 #include "aos/network/testing_time_converter.h"
 #include "aos/network/timestamp_generated.h"
+#include "aos/testing/path.h"
 #include "gtest/gtest.h"
 
 namespace aos {
 namespace testing {
 namespace {
 
-std::string ConfigPrefix() { return "aos/"; }
+using aos::testing::ArtifactPath;
 
 using message_bridge::RemoteMessage;
 namespace chrono = ::std::chrono;
@@ -92,7 +93,7 @@
  public:
   RemoteMessageSimulatedEventLoopTest()
       : config(aos::configuration::ReadConfig(
-            absl::StrCat(ConfigPrefix(), "events/", GetParam().config))) {
+            ArtifactPath(absl::StrCat("aos/events/", GetParam().config)))) {
     LOG(INFO) << "Config " << GetParam().config;
   }
 
@@ -762,9 +763,8 @@
 // ServerStatistics correctly.
 TEST(SimulatedEventLoopTest, MultinodePingPongWithOffset) {
   aos::FlatbufferDetachedBuffer<aos::Configuration> config =
-      aos::configuration::ReadConfig(
-          ConfigPrefix() +
-          "events/multinode_pingpong_test_combined_config.json");
+      aos::configuration::ReadConfig(ArtifactPath(
+          "aos/events/multinode_pingpong_test_combined_config.json"));
   const Node *pi1 = configuration::GetNode(&config.message(), "pi1");
   const size_t pi1_index = configuration::GetNodeIndex(&config.message(), pi1);
   ASSERT_EQ(pi1_index, 0u);
@@ -1271,9 +1271,8 @@
 // it gets delivered as expected.
 TEST(SimulatedEventLoopTest, MultinodePingPongWithOffsetAndSlope) {
   aos::FlatbufferDetachedBuffer<aos::Configuration> config =
-      aos::configuration::ReadConfig(
-          ConfigPrefix() +
-          "events/multinode_pingpong_test_combined_config.json");
+      aos::configuration::ReadConfig(ArtifactPath(
+          "aos/events/multinode_pingpong_test_combined_config.json"));
   const Node *pi1 = configuration::GetNode(&config.message(), "pi1");
   const size_t pi1_index = configuration::GetNodeIndex(&config.message(), pi1);
   ASSERT_EQ(pi1_index, 0u);