Update googletest
Merge commit 'e10c4a83477d150b0abfd84a863450c569f30a1b' into master
Change-Id: I219e458e8d80c0c0d31520e3620adae6d0ee4d64
diff --git a/aos/controls/control_loop_test.cc b/aos/controls/control_loop_test.cc
index 61c2fe0..8a21f1f 100644
--- a/aos/controls/control_loop_test.cc
+++ b/aos/controls/control_loop_test.cc
@@ -1,64 +1,10 @@
#include "aos/controls/control_loop_test.h"
-#include "aos/robot_state/robot_state.q.h"
-#include "aos/logging/queue_logging.h"
+#include <chrono>
namespace aos {
namespace testing {
-constexpr ::std::chrono::milliseconds ControlLoopTest::kTimeTick;
-constexpr ::std::chrono::milliseconds ControlLoopTest::kDSPacketTime;
-
-ControlLoopTest::ControlLoopTest() {
- ::aos::joystick_state.Clear();
- ::aos::robot_state.Clear();
-
- ::aos::time::EnableMockTime(current_time_);
-
- SendMessages(false);
-}
-
-ControlLoopTest::~ControlLoopTest() {
- ::aos::joystick_state.Clear();
- ::aos::robot_state.Clear();
-
- ::aos::time::DisableMockTime();
-}
-
-void ControlLoopTest::SendMessages(bool enabled) {
- if (current_time_ >= kDSPacketTime + last_ds_time_ ||
- last_enabled_ != enabled) {
- last_ds_time_ = current_time_;
- auto new_state = ::aos::joystick_state.MakeMessage();
- new_state->fake = true;
-
- new_state->enabled = enabled;
- new_state->autonomous = false;
- new_state->team_id = team_id_;
-
- new_state.Send();
- last_enabled_ = enabled;
- }
-
- {
- auto new_state = ::aos::robot_state.MakeMessage();
-
- new_state->reader_pid = reader_pid_;
- new_state->outputs_enabled = enabled;
- new_state->browned_out = false;
-
- new_state->is_3v3_active = true;
- new_state->is_5v_active = true;
- new_state->voltage_3v3 = 3.3;
- new_state->voltage_5v = 5.0;
-
- new_state->voltage_roborio_in = battery_voltage_;
- new_state->voltage_battery = battery_voltage_;
-
- LOG_STRUCT(INFO, "robot_state", *new_state);
- new_state.Send();
- }
-}
} // namespace testing
} // namespace aos