Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-06 03:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "More updates to the Gyro test fixing potential null pointer exception"

Browse Source
This commit is contained in:
Brad Miller (WPI)
2016-02-11 11:17:06 -08:00
committed by Gerrit Code Review
parent df33a78221 f436b33d79
commit 91c5db06db
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/GyroTest.java
View File

@@ -100,7 +100,7 @@ public class GyroTest extends AbstractComsSetup {
assertEquals(errorMessage(angle, 0), 0, angle, .5); assertEquals(errorMessage(angle, 0), 0, angle, .5);
Timer.delay(5); Timer.delay(5);
angle = gyro.getAngle(); angle = gyro.getAngle();
assertEquals("After 5 seconds " + errorMessage(angle, 0), 0, angle, 1); assertEquals("After 5 seconds " + errorMessage(angle, 0), 0, angle, 2.0);
} }
/** /**

7
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/TiltPanCameraFixture.java
View File

@@ -65,6 +65,7 @@ public abstract class TiltPanCameraFixture implements ITestFixture {
@Override @Override
public boolean reset() { public boolean reset() {
if(gyro != null)
gyro.reset(); gyro.reset();
return true; return true;
} }
@@ -101,8 +102,14 @@ public abstract class TiltPanCameraFixture implements ITestFixture {
tilt = null; tilt = null;
pan.free(); pan.free();
pan = null; pan = null;
if(gyro !=null){//in case not freed during gyro tests
gyro.free();
gyro = null;
}
if(gyroParam != null){//in case gyro tests failed before getting to this point
gyroParam.free(); gyroParam.free();
gyroParam = null; gyroParam = null;
}
return true; return true;
} }