Skip to content

Commit 413cbba

Browse files
committed
made MotorErrorsTest use sparkSimFaultManager
1 parent cf28366 commit 413cbba

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

src/test/java/org/carlmontrobotics/lib199/MotorErrorsTest.java

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import com.ctre.phoenix.ErrorCode;
1212
import com.revrobotics.REVLibError;
13+
import com.revrobotics.sim.SparkSimFaultManager;
1314
import com.revrobotics.spark.SparkBase.Faults;
1415
import com.revrobotics.spark.SparkMax;
1516

@@ -19,23 +20,7 @@
1920
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
2021

2122
public class MotorErrorsTest extends ErrStreamTest {
22-
public static class SensorFaultSparkMax {
23-
Faults sensorFault = new Faults(4);
24-
public short getFaults() {
25-
// return (short)FaultID.kSensorFault.value;
26-
return (short)sensorFault.rawBits;
27-
}
28-
}
29-
30-
public static class StickySensorFaultSparkMax {
31-
Faults sensorFault = new Faults(4);
32-
public short getStickyFaults() {
33-
// return (short)FaultID.kSensorFault.value;
34-
return (short)sensorFault.rawBits;
35-
}
36-
}
37-
38-
public static interface TemperatureSparkMax {
23+
public static interface TemperatureSparkMax {
3924

4025
public void setTemperature(double temperature);
4126
public int getSmartCurrentLimit();
@@ -127,7 +112,10 @@ public void testOtherErrors() {
127112

128113
@Test
129114
public void testFaultReporting() {
130-
SparkMax sensorFaultSparkMax = Mocks.createMock(SparkMax.class, new SensorFaultSparkMax(), false);
115+
Faults sensorFault = new Faults(4);
116+
SparkMax sensorFaultSparkMax = MotorControllerFactory.createSparkMax(1, MotorConfig.NEO, MotorControllerFactory.sparkConfig(MotorConfig.NEO));
117+
SparkSimFaultManager sparkSimFaultManager = new SparkSimFaultManager(sensorFaultSparkMax);
118+
sparkSimFaultManager.setFaults(sensorFault);
131119
errStream.reset();
132120
MotorErrors.checkSparkErrors(sensorFaultSparkMax);
133121
assertNotEquals(0, errStream.toByteArray().length);
@@ -138,7 +126,10 @@ public void testFaultReporting() {
138126

139127
@Test
140128
public void testStickyFaultReporting() {
141-
SparkMax stickySensorFaultSparkMax = Mocks.createMock(SparkMax.class, new StickySensorFaultSparkMax(), false);
129+
Faults sensorFault = new Faults(4);
130+
SparkMax stickySensorFaultSparkMax = MotorControllerFactory.createSparkMax(1, MotorConfig.NEO, MotorControllerFactory.sparkConfig(MotorConfig.NEO));
131+
SparkSimFaultManager sparkSimFaultManager = new SparkSimFaultManager(stickySensorFaultSparkMax);
132+
sparkSimFaultManager.setStickyFaults(sensorFault);
142133
errStream.reset();
143134
MotorErrors.checkSparkErrors(stickySensorFaultSparkMax);
144135
assertNotEquals(0, errStream.toByteArray().length);

0 commit comments

Comments
 (0)