Switch to TeamNumberEnvironment in the last spots
We had a couple stragglers who were not using
TeamNumberEnvironment. Switch them over.
Change-Id: I33f3e56d70013e256d632659ee7df1f5cae2ae73
diff --git a/y2014/control_loops/claw/BUILD b/y2014/control_loops/claw/BUILD
index 5602bbc..45a77b0 100644
--- a/y2014/control_loops/claw/BUILD
+++ b/y2014/control_loops/claw/BUILD
@@ -69,11 +69,12 @@
'claw_lib_test.cc',
],
deps = [
- '//aos/testing:googletest',
- ':claw_queue',
':claw_lib',
- '//frc971/control_loops:state_feedback_loop',
+ ':claw_queue',
'//aos/common/controls:control_loop_test',
+ '//aos/testing:googletest',
+ '//frc971/control_loops:state_feedback_loop',
+ '//frc971/control_loops:team_number_test_environment',
],
)
diff --git a/y2014/control_loops/claw/claw_lib_test.cc b/y2014/control_loops/claw/claw_lib_test.cc
index 8444cea..8a7e9c3 100644
--- a/y2014/control_loops/claw/claw_lib_test.cc
+++ b/y2014/control_loops/claw/claw_lib_test.cc
@@ -4,7 +4,7 @@
#include <memory>
#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/network/team_number.h"
+#include "frc971/control_loops/team_number_test_environment.h"
#include "gtest/gtest.h"
#include "y2014/constants.h"
#include "y2014/control_loops/claw/claw.h"
@@ -28,15 +28,6 @@
CLAW_COUNT
} ClawType;
-class TeamNumberEnvironment : public ::testing::Environment {
- public:
- // Override this to define how to set up the environment.
- virtual void SetUp() { aos::network::OverrideTeamNumber(1); }
-};
-
-::testing::Environment* const team_number_env =
- ::testing::AddGlobalTestEnvironment(new TeamNumberEnvironment);
-
// Class which simulates the wrist and sends out queue messages containing the
// position.
class ClawMotorSimulation {