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
diff --git a/y2015/actors/BUILD b/y2015/actors/BUILD
index e561440..06ab08a 100644
--- a/y2015/actors/BUILD
+++ b/y2015/actors/BUILD
@@ -130,7 +130,7 @@
],
deps = [
'//aos/testing:googletest',
- '//aos/common:queue_testutils',
+ '//aos/testing:test_shm',
'//aos/common/logging:queue_logging',
'//aos/common:queues',
'//aos/common:time',
@@ -431,7 +431,7 @@
],
deps = [
'//aos/testing:googletest',
- '//aos/common:queue_testutils',
+ '//aos/testing:test_shm',
'//aos/common/logging:queue_logging',
'//aos/common:queues',
'//aos/common:time',
diff --git a/y2015/actors/score_actor_test.cc b/y2015/actors/score_actor_test.cc
index 4791f09..f859875 100644
--- a/y2015/actors/score_actor_test.cc
+++ b/y2015/actors/score_actor_test.cc
@@ -4,7 +4,7 @@
#include "gtest/gtest.h"
#include "aos/common/queue.h"
-#include "aos/common/queue_testutils.h"
+#include "aos/testing/test_shm.h"
#include "aos/common/actions/actor.h"
#include "y2015/actors/score_action.q.h"
#include "y2015/actors/score_actor.h"
@@ -34,7 +34,7 @@
}
// Bring up and down Core.
- ::aos::common::testing::GlobalCoreInstance my_core;
+ ::aos::testing::TestSharedMemory my_shm_;
};
// Tests that cancel stops not only the score action, but also the underlying
diff --git a/y2015/actors/stack_actor_test.cc b/y2015/actors/stack_actor_test.cc
index e1b1856..35b3604 100644
--- a/y2015/actors/stack_actor_test.cc
+++ b/y2015/actors/stack_actor_test.cc
@@ -4,7 +4,7 @@
#include "gtest/gtest.h"
#include "aos/common/queue.h"
-#include "aos/common/queue_testutils.h"
+#include "aos/testing/test_shm.h"
#include "aos/common/actions/actor.h"
#include "y2015/actors/stack_action.q.h"
#include "y2015/actors/stack_actor.h"
@@ -36,7 +36,7 @@
}
// Bring up and down Core.
- ::aos::common::testing::GlobalCoreInstance my_core;
+ ::aos::testing::TestSharedMemory my_shm_;
};
// Tests that cancel stops not only the stack action, but the underlying profile
diff --git a/y2015/control_loops/drivetrain/drivetrain_lib_test.cc b/y2015/control_loops/drivetrain/drivetrain_lib_test.cc
index d3869aa..8585fda 100644
--- a/y2015/control_loops/drivetrain/drivetrain_lib_test.cc
+++ b/y2015/control_loops/drivetrain/drivetrain_lib_test.cc
@@ -4,7 +4,6 @@
#include "gtest/gtest.h"
#include "aos/common/network/team_number.h"
-#include "aos/common/queue_testutils.h"
#include "aos/common/controls/polytope.h"
#include "aos/common/controls/control_loop_test.h"
diff --git a/y2015/util/BUILD b/y2015/util/BUILD
index 481ed7e..71c7adb 100644
--- a/y2015/util/BUILD
+++ b/y2015/util/BUILD
@@ -19,7 +19,7 @@
],
deps = [
'//aos/testing:googletest',
- '//aos/common:queue_testutils',
+ '//aos/testing:test_logging',
'//aos/common/logging',
'//frc971/control_loops:team_number_test_environment',
':kinematics',
diff --git a/y2015/util/kinematics_test.cc b/y2015/util/kinematics_test.cc
index be1645e..acf3699 100644
--- a/y2015/util/kinematics_test.cc
+++ b/y2015/util/kinematics_test.cc
@@ -3,7 +3,7 @@
#include "gtest/gtest.h"
#include "aos/common/logging/logging.h"
-#include "aos/common/queue_testutils.h"
+#include "aos/testing/test_logging.h"
#include "y2015/util/kinematics.h"
#include "frc971/control_loops/team_number_test_environment.h"
@@ -25,7 +25,7 @@
upper_angle_limit_(M_PI / 2.0) {}
void SetUp() {
- ::aos::common::testing::EnableTestLogging();
+ ::aos::testing::EnableTestLogging();
kinematics_ = ElevatorArmKinematics(arm_length_, upper_height_limit_, lower_height_limit_,
upper_angle_limit_, lower_angle_limit_);
}