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 wpilibj FilterOutputTest null pointer exception (#778)

Browse Source
This commit is contained in:
Tyler Veness
2017-11-27 12:28:25 -08:00
committed by Peter Johnson
parent 0f3f5218ad
commit dfc0656e5c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ public abstract class FilterOutputFixture<T extends PIDSource> implements ITestF
private boolean m_initialized = false;
private boolean m_tornDown = false;
protected T m_filter;
private DataWrapper m_data;
protected DataWrapper m_data;
private double m_expectedOutput;
public FilterOutputFixture(double expectedOutput) {

16
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
View File

@@ -388,8 +388,8 @@ public final class TestBench {
return new FilterOutputFixture<LinearDigitalFilter>(kSinglePoleIIRExpectedOutput) {
@Override
protected LinearDigitalFilter giveFilter() {
DataWrapper data = new DataWrapper(getData);
return LinearDigitalFilter.singlePoleIIR(data,
m_data = new DataWrapper(getData);
return LinearDigitalFilter.singlePoleIIR(m_data,
kSinglePoleIIRTimeConstant,
kFilterStep);
}
@@ -405,8 +405,8 @@ public final class TestBench {
return new FilterOutputFixture<LinearDigitalFilter>(kHighPassExpectedOutput) {
@Override
protected LinearDigitalFilter giveFilter() {
DataWrapper data = new DataWrapper(getData);
return LinearDigitalFilter.highPass(data, kHighPassTimeConstant,
m_data = new DataWrapper(getData);
return LinearDigitalFilter.highPass(m_data, kHighPassTimeConstant,
kFilterStep);
}
};
@@ -422,8 +422,8 @@ public final class TestBench {
return new FilterOutputFixture<LinearDigitalFilter>(kMovAvgExpectedOutput) {
@Override
protected LinearDigitalFilter giveFilter() {
DataWrapper data = new DataWrapper(getData);
return LinearDigitalFilter.movingAverage(data, kMovAvgTaps);
m_data = new DataWrapper(getData);
return LinearDigitalFilter.movingAverage(m_data, kMovAvgTaps);
}
};
}
@@ -438,8 +438,8 @@ public final class TestBench {
return new FilterOutputFixture<LinearDigitalFilter>(0.0) {
@Override
protected LinearDigitalFilter giveFilter() {
DataWrapper data = new DataWrapper(getPulseData);
return LinearDigitalFilter.movingAverage(data, kMovAvgTaps);
m_data = new DataWrapper(getPulseData);
return LinearDigitalFilter.movingAverage(m_data, kMovAvgTaps);
}
};
}