Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wpilibcIntegrationTests RobotController warnings. (#832)

Browse Source
This commit is contained in:
Peter Johnson
2017-12-11 22:15:29 -08:00
committed by GitHub
parent 3c3a448d47
commit 86ac70a125
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibcIntegrationTests/src/FRCUserProgram/cpp/AnalogPotentiometerTest.cpp
View File

@@ -8,7 +8,7 @@
#include "AnalogPotentiometer.h" // NOLINT(build/include_order)
#include "AnalogOutput.h"
#include "ControllerPower.h"
#include "RobotController.h"
#include "TestBench.h"
#include "Timer.h"
#include "gtest/gtest.h"
@@ -43,7 +43,7 @@ TEST_F(AnalogPotentiometerTest, TestInitialSettings) {
}
TEST_F(AnalogPotentiometerTest, TestRangeValues) {
m_fakePot->SetVoltage(kAngle / kScale * ControllerPower::GetVoltage5V());
m_fakePot->SetVoltage(kAngle / kScale * RobotController::GetVoltage5V());
Wait(0.1);
EXPECT_NEAR(kAngle, m_pot->Get(), 2.0)
<< "The potentiometer did not measure the correct angle.";

6
wpilibcIntegrationTests/src/FRCUserProgram/cpp/DriverStationTest.cpp
View File

@@ -7,8 +7,8 @@
#include "DriverStation.h" // NOLINT(build/include_order)
#include "RobotController.h"
#include "TestBench.h"
#include "Utility.h"
#include "gtest/gtest.h"
using namespace frc;
@@ -22,13 +22,13 @@ class DriverStationTest : public testing::Test {};
* Test if the WaitForData function works
*/
TEST_F(DriverStationTest, WaitForData) {
uint64_t initialTime = GetFPGATime();
uint64_t initialTime = RobotController::GetFPGATime();
for (int i = 0; i < 50; i++) {
DriverStation::GetInstance().WaitForData();
}
uint64_t finalTime = GetFPGATime();
uint64_t finalTime = RobotController::GetFPGATime();
EXPECT_NEAR(TIMER_RUNTIME, finalTime - initialTime,
TIMER_TOLERANCE * TIMER_RUNTIME);