diff --git a/ntcore/src/test/native/cpp/main.cpp b/ntcore/src/test/native/cpp/main.cpp index 4cfa8ac89d5..3c0a5ec13d7 100644 --- a/ntcore/src/test/native/cpp/main.cpp +++ b/ntcore/src/test/native/cpp/main.cpp @@ -19,6 +19,7 @@ int main(int argc, char** argv) { }); ::testing::InitGoogleMock(&argc, argv); int ret = RUN_ALL_TESTS(); + wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance()); return ret; } diff --git a/wpilibc/src/test/native/cpp/OpModeRobotTest.cpp b/wpilibc/src/test/native/cpp/OpModeRobotTest.cpp index 1853a27dfe7..f2354003ed7 100644 --- a/wpilibc/src/test/native/cpp/OpModeRobotTest.cpp +++ b/wpilibc/src/test/native/cpp/OpModeRobotTest.cpp @@ -21,7 +21,10 @@ class OpModeRobotTest : public ::testing::Test { wpi::sim::SetProgramStarted(false); } - void TearDown() override { wpi::sim::ResumeTiming(); } + void TearDown() override { + wpi::sim::ResumeTiming(); + wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance()); + } }; class MockRobot; diff --git a/wpilibc/src/test/native/cpp/TimedRobotTest.cpp b/wpilibc/src/test/native/cpp/TimedRobotTest.cpp index dc2f594f44a..c4866bb1581 100644 --- a/wpilibc/src/test/native/cpp/TimedRobotTest.cpp +++ b/wpilibc/src/test/native/cpp/TimedRobotTest.cpp @@ -27,7 +27,10 @@ class TimedRobotTest : public ::testing::Test { wpi::sim::SetProgramStarted(false); } - void TearDown() override { wpi::sim::ResumeTiming(); } + void TearDown() override { + wpi::sim::ResumeTiming(); + wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance()); + } }; class MockRobot : public TimedRobot { diff --git a/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp b/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp index 73c817d260d..a2dad12dcd5 100644 --- a/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp +++ b/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp @@ -24,7 +24,10 @@ class TimesliceRobotTest : public ::testing::Test { wpi::sim::SetProgramStarted(false); } - void TearDown() override { wpi::sim::ResumeTiming(); } + void TearDown() override { + wpi::sim::ResumeTiming(); + wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance()); + } }; class MockRobot : public TimesliceRobot {