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/frc971/control_loops/voltage_cap/BUILD b/frc971/control_loops/voltage_cap/BUILD
index ed2181c..8c2df46 100644
--- a/frc971/control_loops/voltage_cap/BUILD
+++ b/frc971/control_loops/voltage_cap/BUILD
@@ -18,6 +18,6 @@
deps = [
':voltage_cap',
'//aos/testing:googletest',
- '//aos/common:queue_testutils',
+ '//aos/testing:test_shm',
],
)
diff --git a/frc971/control_loops/voltage_cap/voltage_cap_test.cc b/frc971/control_loops/voltage_cap/voltage_cap_test.cc
index f508b25..4bee640 100644
--- a/frc971/control_loops/voltage_cap/voltage_cap_test.cc
+++ b/frc971/control_loops/voltage_cap/voltage_cap_test.cc
@@ -3,8 +3,9 @@
#include "frc971/control_loops/voltage_cap/voltage_cap.h"
#include "gtest/gtest.h"
+
#include "aos/common/queue.h"
-#include "aos/common/queue_testutils.h"
+#include "aos/testing/test_shm.h"
using ::aos::time::Time;
@@ -15,7 +16,7 @@
class VoltageTest : public ::testing::Test {
protected:
// Bring up and down Core.
- ::aos::common::testing::GlobalCoreInstance my_core;
+ ::aos::testing::TestSharedMemory my_shm_;
};
// Tests that voltage inputs return the same if inside the box.
diff --git a/frc971/zeroing/BUILD b/frc971/zeroing/BUILD
index 67cb091..8a8d82c 100644
--- a/frc971/zeroing/BUILD
+++ b/frc971/zeroing/BUILD
@@ -30,7 +30,7 @@
],
deps = [
'//aos/testing:googletest',
- '//aos/common:queue_testutils',
+ '//aos/testing:test_shm',
':zeroing',
'//aos/common/util:thread',
'//aos/common:die',
diff --git a/frc971/zeroing/zeroing_test.cc b/frc971/zeroing/zeroing_test.cc
index 4a82e04..b4c9813 100644
--- a/frc971/zeroing/zeroing_test.cc
+++ b/frc971/zeroing/zeroing_test.cc
@@ -7,7 +7,7 @@
#include "gtest/gtest.h"
#include "frc971/zeroing/zeroing.h"
#include "frc971/control_loops/control_loops.q.h"
-#include "aos/common/queue_testutils.h"
+#include "aos/testing/test_shm.h"
#include "aos/common/util/thread.h"
#include "aos/common/die.h"
#include "frc971/control_loops/position_sensor_sim.h"
@@ -34,7 +34,7 @@
estimator->UpdateEstimate(sensor_values_);
}
- aos::common::testing::GlobalCoreInstance my_core;
+ ::aos::testing::TestSharedMemory my_shm_;
};
TEST_F(ZeroingTest, TestMovingAverageFilter) {