commit f5f8d8eac63ac6423453461a6b211dff4add67dd
author Brian Silverman <brian@peloton-tech.com> Sun Dec 06 18:39:12 2015 -0500
committer Brian Silverman <brian@peloton-tech.com> Thu Dec 24 14:33:43 2015 -0800
tree d786a7ca09cb102c86f0009262e0ee502356db6c
parent 279e2e331f31fc9f39e89a1a0a89e7ac69e95acc

Split out //aos/common:queue_testutils and rename stuff

It had three independent pieces of functionality, one of which had a
pretty bad name.

Change-Id: I4a6937692fa36e74f814b3be4d4c5bc751947088

aos/common/actions/action_test.cc

diff --git a/aos/common/actions/action_test.cc b/aos/common/actions/action_test.cc
index 1e94b32..21da2c7 100644
--- a/aos/common/actions/action_test.cc
+++ b/aos/common/actions/action_test.cc
@@ -4,13 +4,14 @@
 #include <thread>
 
 #include "gtest/gtest.h"
+
 #include "aos/common/queue.h"
-#include "aos/common/queue_testutils.h"
 #include "aos/common/actions/actor.h"
 #include "aos/common/actions/actions.h"
 #include "aos/common/actions/actions.q.h"
 #include "aos/common/actions/test_action.q.h"
 #include "aos/common/event.h"
+#include "aos/testing/test_shm.h"
 
 using ::aos::time::Time;
 
@@ -98,8 +99,6 @@
 class ActionTest : public ::testing::Test {
  protected:
   ActionTest() {
-    // Flush the robot state queue so we can use clean shared memory for this.
-    // test.
     actions::test_action.goal.Clear();
     actions::test_action.status.Clear();
     actions::test_action2.goal.Clear();
@@ -114,7 +113,7 @@
   }
 
   // Bring up and down Core.
-  ::aos::common::testing::GlobalCoreInstance my_core;
+  ::aos::testing::TestSharedMemory my_shm_;
   ::aos::common::actions::ActionQueue action_queue_;
 };