From 189ea72afaec1e1f40aea89461a00a01d3a96d72 Mon Sep 17 00:00:00 2001 From: Stephen Just Date: Wed, 29 Jul 2026 19:54:45 -0700 Subject: [PATCH] Move mock types into xbot.common WPILib 2027 is changing their package name from `edu.wpi.first.wpilibj` to `org.wpilib` so now is a good opportunity to clean this up. --- .../mock_adapters}/MockDigitalOutput.java | 2 +- .../actuators/mock_adapters}/MockPWM.java | 2 +- .../actuators/mock_adapters}/MockServo.java | 2 +- .../actuators/mock_adapters}/MockSolenoid.java | 2 +- .../mock_adapters}/MockSpeedController.java | 2 +- .../sensors/mock_adapters}/MockAnalogInput.java | 2 +- .../sensors/mock_adapters}/MockDigitalInput.java | 2 +- .../mock_adapters}/MockDistanceSensor.java | 2 +- .../mock_adapters}/MockDistanceSensorPair.java | 2 +- .../mock_adapters/MockDutyCycleEncoder.java | 1 - .../sensors/mock_adapters}/MockLidarLite.java | 2 +- .../sensors/mock_adapters}/MockTimer.java | 2 +- .../MockXboxControllerAdapter.java | 3 ++- .../java/xbot/common/injection/BaseWPITest.java | 2 +- .../injection/modules/MockControlsModule.java | 2 +- .../injection/modules/MockDevicesModule.java | 16 ++++++++-------- .../common/injection/modules/UnitTestModule.java | 2 +- .../common/simulation/BaseSimulationTest.java | 2 +- .../actuators/TimedAndBoundedServoTest.java | 3 ++- .../controls/actuators/XDoubleSolenoidTest.java | 2 +- .../controls/sensors/XboxControllerTest.java | 2 +- .../xbot/common/injection/MockTimerTest.java | 2 +- .../java/xbot/common/math/PIDManagerTest.java | 2 +- .../common/simulation/SimulatedSolenoidTest.java | 2 +- .../common/simulation/SimulatedTimerTest.java | 2 +- .../drive/HeadingAssistModuleTest.java | 2 +- .../subsystems/drive/HeadingModuleTest.java | 2 +- .../subsystems/feedback/RumbleManagerTest.java | 2 +- .../common/subsystems/pose/BasePoseTest.java | 2 +- 29 files changed, 37 insertions(+), 36 deletions(-) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/actuators/mock_adapters}/MockDigitalOutput.java (95%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/actuators/mock_adapters}/MockPWM.java (95%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/actuators/mock_adapters}/MockServo.java (94%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/actuators/mock_adapters}/MockSolenoid.java (95%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/actuators/mock_adapters}/MockSpeedController.java (95%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/sensors/mock_adapters}/MockAnalogInput.java (96%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/sensors/mock_adapters}/MockDigitalInput.java (97%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/sensors/mock_adapters}/MockDistanceSensor.java (91%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/sensors/mock_adapters}/MockDistanceSensorPair.java (93%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/sensors/mock_adapters}/MockLidarLite.java (95%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/sensors/mock_adapters}/MockTimer.java (94%) rename src/main/java/{edu/wpi/first/wpilibj => xbot/common/controls/sensors/mock_adapters}/MockXboxControllerAdapter.java (97%) diff --git a/src/main/java/edu/wpi/first/wpilibj/MockDigitalOutput.java b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockDigitalOutput.java similarity index 95% rename from src/main/java/edu/wpi/first/wpilibj/MockDigitalOutput.java rename to src/main/java/xbot/common/controls/actuators/mock_adapters/MockDigitalOutput.java index 150e8d390..77fd70c71 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockDigitalOutput.java +++ b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockDigitalOutput.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.actuators.mock_adapters; import dagger.assisted.Assisted; import dagger.assisted.AssistedFactory; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockPWM.java b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockPWM.java similarity index 95% rename from src/main/java/edu/wpi/first/wpilibj/MockPWM.java rename to src/main/java/xbot/common/controls/actuators/mock_adapters/MockPWM.java index 80b4812b7..3bd02b9a1 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockPWM.java +++ b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockPWM.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.actuators.mock_adapters; import dagger.assisted.Assisted; import dagger.assisted.AssistedFactory; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockServo.java b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockServo.java similarity index 94% rename from src/main/java/edu/wpi/first/wpilibj/MockServo.java rename to src/main/java/xbot/common/controls/actuators/mock_adapters/MockServo.java index ab41738d1..b26c7374a 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockServo.java +++ b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockServo.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.actuators.mock_adapters; import dagger.assisted.Assisted; import dagger.assisted.AssistedFactory; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockSolenoid.java b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockSolenoid.java similarity index 95% rename from src/main/java/edu/wpi/first/wpilibj/MockSolenoid.java rename to src/main/java/xbot/common/controls/actuators/mock_adapters/MockSolenoid.java index 43d6d5131..1b4abf354 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockSolenoid.java +++ b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockSolenoid.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.actuators.mock_adapters; import org.json.JSONObject; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockSpeedController.java b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockSpeedController.java similarity index 95% rename from src/main/java/edu/wpi/first/wpilibj/MockSpeedController.java rename to src/main/java/xbot/common/controls/actuators/mock_adapters/MockSpeedController.java index 3ed88b6cf..735fcd155 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockSpeedController.java +++ b/src/main/java/xbot/common/controls/actuators/mock_adapters/MockSpeedController.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.actuators.mock_adapters; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockAnalogInput.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockAnalogInput.java similarity index 96% rename from src/main/java/edu/wpi/first/wpilibj/MockAnalogInput.java rename to src/main/java/xbot/common/controls/sensors/mock_adapters/MockAnalogInput.java index 17d8e891b..fe5525b10 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockAnalogInput.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockAnalogInput.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.sensors.mock_adapters; import org.json.JSONObject; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockDigitalInput.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDigitalInput.java similarity index 97% rename from src/main/java/edu/wpi/first/wpilibj/MockDigitalInput.java rename to src/main/java/xbot/common/controls/sensors/mock_adapters/MockDigitalInput.java index d442f1164..041e0a49c 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockDigitalInput.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDigitalInput.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.sensors.mock_adapters; import org.json.JSONObject; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockDistanceSensor.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDistanceSensor.java similarity index 91% rename from src/main/java/edu/wpi/first/wpilibj/MockDistanceSensor.java rename to src/main/java/xbot/common/controls/sensors/mock_adapters/MockDistanceSensor.java index 996079b2a..25289e910 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockDistanceSensor.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDistanceSensor.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.sensors.mock_adapters; import xbot.common.controls.sensors.DistanceSensor; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockDistanceSensorPair.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDistanceSensorPair.java similarity index 93% rename from src/main/java/edu/wpi/first/wpilibj/MockDistanceSensorPair.java rename to src/main/java/xbot/common/controls/sensors/mock_adapters/MockDistanceSensorPair.java index 523b268e8..cfafe522c 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockDistanceSensorPair.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDistanceSensorPair.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.sensors.mock_adapters; import javax.inject.Inject; diff --git a/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDutyCycleEncoder.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDutyCycleEncoder.java index 1c192a632..bb5b02244 100644 --- a/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDutyCycleEncoder.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockDutyCycleEncoder.java @@ -3,7 +3,6 @@ import dagger.assisted.Assisted; import dagger.assisted.AssistedFactory; import dagger.assisted.AssistedInject; -import edu.wpi.first.wpilibj.MockAnalogInput; import xbot.common.command.DataFrameRegistry; import xbot.common.controls.io_inputs.XDutyCycleEncoderInputs; import xbot.common.controls.sensors.XAnalogInput; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockLidarLite.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockLidarLite.java similarity index 95% rename from src/main/java/edu/wpi/first/wpilibj/MockLidarLite.java rename to src/main/java/xbot/common/controls/sensors/mock_adapters/MockLidarLite.java index 1b1c6845c..e7af66ec6 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockLidarLite.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockLidarLite.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.sensors.mock_adapters; import dagger.assisted.Assisted; import dagger.assisted.AssistedFactory; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockTimer.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockTimer.java similarity index 94% rename from src/main/java/edu/wpi/first/wpilibj/MockTimer.java rename to src/main/java/xbot/common/controls/sensors/mock_adapters/MockTimer.java index 0630c6f17..505dc4997 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockTimer.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockTimer.java @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.sensors.mock_adapters; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/src/main/java/edu/wpi/first/wpilibj/MockXboxControllerAdapter.java b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockXboxControllerAdapter.java similarity index 97% rename from src/main/java/edu/wpi/first/wpilibj/MockXboxControllerAdapter.java rename to src/main/java/xbot/common/controls/sensors/mock_adapters/MockXboxControllerAdapter.java index 6b16740d5..8af56b135 100644 --- a/src/main/java/edu/wpi/first/wpilibj/MockXboxControllerAdapter.java +++ b/src/main/java/xbot/common/controls/sensors/mock_adapters/MockXboxControllerAdapter.java @@ -1,8 +1,9 @@ -package edu.wpi.first.wpilibj; +package xbot.common.controls.sensors.mock_adapters; import dagger.assisted.Assisted; import dagger.assisted.AssistedFactory; import dagger.assisted.AssistedInject; +import edu.wpi.first.wpilibj.GenericHID; import xbot.common.controls.sensors.XXboxController; import xbot.common.controls.sensors.buttons.AdvancedJoystickButtonTrigger.AdvancedJoystickButtonTriggerFactory; import xbot.common.controls.sensors.buttons.AdvancedPovButtonTrigger.AdvancedPovButtonTriggerFactory; diff --git a/src/main/java/xbot/common/injection/BaseWPITest.java b/src/main/java/xbot/common/injection/BaseWPITest.java index d495c6f31..1c71b2542 100644 --- a/src/main/java/xbot/common/injection/BaseWPITest.java +++ b/src/main/java/xbot/common/injection/BaseWPITest.java @@ -3,8 +3,8 @@ import org.junit.Before; import org.junit.Ignore; -import edu.wpi.first.wpilibj.MockTimer; import xbot.common.controls.sensors.XTimer; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.components.BaseComponent; import xbot.common.math.PIDManager.PIDManagerFactory; import xbot.common.properties.PropertyFactory; diff --git a/src/main/java/xbot/common/injection/modules/MockControlsModule.java b/src/main/java/xbot/common/injection/modules/MockControlsModule.java index 6bf9a3a16..6951fdfb5 100644 --- a/src/main/java/xbot/common/injection/modules/MockControlsModule.java +++ b/src/main/java/xbot/common/injection/modules/MockControlsModule.java @@ -4,12 +4,12 @@ import dagger.Binds; import dagger.Module; -import edu.wpi.first.wpilibj.MockXboxControllerAdapter.MockXboxControllerFactory; import xbot.common.controls.sensors.XFTCGamepad.XFTCGamepadFactory; import xbot.common.controls.sensors.XJoystick.XJoystickFactory; import xbot.common.controls.sensors.XXboxController.XXboxControllerFactory; import xbot.common.controls.sensors.mock_adapters.MockFTCGamepad.MockFTCGamepadFactory; import xbot.common.controls.sensors.mock_adapters.MockJoystick.MockJoystickFactory; +import xbot.common.controls.sensors.mock_adapters.MockXboxControllerAdapter.MockXboxControllerFactory; import xbot.common.subsystems.feedback.RumbleManager.RumbleManagerFactory; import xbot.common.subsystems.feedback.XRumbleManager.XRumbleManagerFactory; diff --git a/src/main/java/xbot/common/injection/modules/MockDevicesModule.java b/src/main/java/xbot/common/injection/modules/MockDevicesModule.java index bd74f9b29..13bc72cc1 100644 --- a/src/main/java/xbot/common/injection/modules/MockDevicesModule.java +++ b/src/main/java/xbot/common/injection/modules/MockDevicesModule.java @@ -2,14 +2,6 @@ import dagger.Binds; import dagger.Module; -import edu.wpi.first.wpilibj.MockAnalogInput.MockAnalogInputFactory; -import edu.wpi.first.wpilibj.MockDigitalInput.MockDigitalInputFactory; -import edu.wpi.first.wpilibj.MockDigitalOutput.MockDigitalOutputFactory; -import edu.wpi.first.wpilibj.MockLidarLite.MockLidarLiteFactory; -import edu.wpi.first.wpilibj.MockPWM.MockPWMFactory; -import edu.wpi.first.wpilibj.MockServo.MockServoFactory; -import edu.wpi.first.wpilibj.MockSolenoid.MockSolenoidFactory; -import edu.wpi.first.wpilibj.MockSpeedController.MockSpeedControllerFactory; import xbot.common.controls.actuators.XCANLightController; import xbot.common.controls.actuators.XCANMotorController; import xbot.common.controls.actuators.XCompressor.XCompressorFactory; @@ -22,7 +14,12 @@ import xbot.common.controls.actuators.mock_adapters.MockCANLightController; import xbot.common.controls.actuators.mock_adapters.MockCANMotorController; import xbot.common.controls.actuators.mock_adapters.MockCompressor.MockCompressorFactory; +import xbot.common.controls.actuators.mock_adapters.MockDigitalOutput.MockDigitalOutputFactory; +import xbot.common.controls.actuators.mock_adapters.MockPWM.MockPWMFactory; import xbot.common.controls.actuators.mock_adapters.MockRelay.MockRelayFactory; +import xbot.common.controls.actuators.mock_adapters.MockServo.MockServoFactory; +import xbot.common.controls.actuators.mock_adapters.MockSolenoid.MockSolenoidFactory; +import xbot.common.controls.actuators.mock_adapters.MockSpeedController.MockSpeedControllerFactory; import xbot.common.controls.sensors.SimulatedAnalogDistanceSensor.SimulatedAnalogDistanceSensorFactory; import xbot.common.controls.sensors.XAbsoluteEncoder.XAbsoluteEncoderFactory; import xbot.common.controls.sensors.XAnalogDistanceSensor.XAnalogDistanceSensorFactory; @@ -36,10 +33,13 @@ import xbot.common.controls.sensors.XLidarLite.XLidarLiteFactory; import xbot.common.controls.sensors.XPowerDistributionPanel.XPowerDistributionPanelFactory; import xbot.common.controls.sensors.mock_adapters.MockAbsoluteEncoder.MockAbsoluteEncoderFactory; +import xbot.common.controls.sensors.mock_adapters.MockAnalogInput.MockAnalogInputFactory; import xbot.common.controls.sensors.mock_adapters.MockCANCoder.MockCANCoderFactory; +import xbot.common.controls.sensors.mock_adapters.MockDigitalInput.MockDigitalInputFactory; import xbot.common.controls.sensors.mock_adapters.MockDutyCycleEncoder; import xbot.common.controls.sensors.mock_adapters.MockEncoder.MockEncoderFactory; import xbot.common.controls.sensors.mock_adapters.MockGyro.MockGyroFactory; +import xbot.common.controls.sensors.mock_adapters.MockLidarLite.MockLidarLiteFactory; import xbot.common.controls.sensors.mock_adapters.MockLaserCAN; import xbot.common.controls.sensors.mock_adapters.MockPowerDistributionPanel.MockPowerDistributionPanelFactory; import xbot.common.networking.MockZeromqListener.MockZeromqListenerFactory; diff --git a/src/main/java/xbot/common/injection/modules/UnitTestModule.java b/src/main/java/xbot/common/injection/modules/UnitTestModule.java index f898915ed..05b171906 100644 --- a/src/main/java/xbot/common/injection/modules/UnitTestModule.java +++ b/src/main/java/xbot/common/injection/modules/UnitTestModule.java @@ -5,11 +5,11 @@ import dagger.Binds; import dagger.Module; -import edu.wpi.first.wpilibj.MockTimer; import xbot.common.command.MockSmartDashboardCommandPutter; import xbot.common.command.SmartDashboardCommandPutter; import xbot.common.controls.sensors.XSettableTimerImpl; import xbot.common.controls.sensors.XTimerImpl; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.logging.LoudRobotAssertionManager; import xbot.common.logging.RobotAssertionManager; import xbot.common.properties.ITableProxy; diff --git a/src/main/java/xbot/common/simulation/BaseSimulationTest.java b/src/main/java/xbot/common/simulation/BaseSimulationTest.java index 9d7a16f7f..ec531f0e3 100644 --- a/src/main/java/xbot/common/simulation/BaseSimulationTest.java +++ b/src/main/java/xbot/common/simulation/BaseSimulationTest.java @@ -7,8 +7,8 @@ import org.junit.Before; import org.junit.Ignore; -import edu.wpi.first.wpilibj.MockTimer; import xbot.common.controls.sensors.XTimer; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.components.DaggerSimulationComponent; import xbot.common.math.PIDManager.PIDManagerFactory; import xbot.common.injection.components.BaseComponent; diff --git a/src/test/java/xbot/common/controls/actuators/TimedAndBoundedServoTest.java b/src/test/java/xbot/common/controls/actuators/TimedAndBoundedServoTest.java index 0d95b379f..acc26ead1 100644 --- a/src/test/java/xbot/common/controls/actuators/TimedAndBoundedServoTest.java +++ b/src/test/java/xbot/common/controls/actuators/TimedAndBoundedServoTest.java @@ -1,8 +1,9 @@ package xbot.common.controls.actuators; -import edu.wpi.first.wpilibj.MockTimer; import org.junit.Before; import org.junit.Test; + +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.BaseCommonLibTest; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/xbot/common/controls/actuators/XDoubleSolenoidTest.java b/src/test/java/xbot/common/controls/actuators/XDoubleSolenoidTest.java index 5bba3466e..008d81fbb 100644 --- a/src/test/java/xbot/common/controls/actuators/XDoubleSolenoidTest.java +++ b/src/test/java/xbot/common/controls/actuators/XDoubleSolenoidTest.java @@ -6,8 +6,8 @@ import org.junit.Before; import org.junit.Test; -import edu.wpi.first.wpilibj.MockSolenoid; import xbot.common.controls.actuators.XDoubleSolenoid.DoubleSolenoidMode; +import xbot.common.controls.actuators.mock_adapters.MockSolenoid; import xbot.common.injection.BaseCommonLibTest; public class XDoubleSolenoidTest extends BaseCommonLibTest { diff --git a/src/test/java/xbot/common/controls/sensors/XboxControllerTest.java b/src/test/java/xbot/common/controls/sensors/XboxControllerTest.java index f2fe81b18..6a5bb5ccf 100644 --- a/src/test/java/xbot/common/controls/sensors/XboxControllerTest.java +++ b/src/test/java/xbot/common/controls/sensors/XboxControllerTest.java @@ -1,9 +1,9 @@ package xbot.common.controls.sensors; -import edu.wpi.first.wpilibj.MockXboxControllerAdapter; import org.junit.Test; import xbot.common.controls.sensors.XXboxController.XboxButton; +import xbot.common.controls.sensors.mock_adapters.MockXboxControllerAdapter; import xbot.common.injection.BaseCommonLibTest; import xbot.common.logging.RobotAssertionException; diff --git a/src/test/java/xbot/common/injection/MockTimerTest.java b/src/test/java/xbot/common/injection/MockTimerTest.java index 6db60fbb4..80512500f 100644 --- a/src/test/java/xbot/common/injection/MockTimerTest.java +++ b/src/test/java/xbot/common/injection/MockTimerTest.java @@ -7,11 +7,11 @@ import org.junit.Ignore; import org.junit.Test; -import edu.wpi.first.wpilibj.MockTimer; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.CommandScheduler; import edu.wpi.first.wpilibj2.command.WaitCommand; import xbot.common.command.XScheduler; +import xbot.common.controls.sensors.mock_adapters.MockTimer; public class MockTimerTest extends BaseCommonLibTest { diff --git a/src/test/java/xbot/common/math/PIDManagerTest.java b/src/test/java/xbot/common/math/PIDManagerTest.java index ce0292177..399a6da82 100644 --- a/src/test/java/xbot/common/math/PIDManagerTest.java +++ b/src/test/java/xbot/common/math/PIDManagerTest.java @@ -7,7 +7,7 @@ import org.junit.Before; import org.junit.Test; -import edu.wpi.first.wpilibj.MockTimer; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.BaseCommonLibTest; import xbot.common.logging.RobotAssertionException; import xbot.common.math.PID.OffTargetReason; diff --git a/src/test/java/xbot/common/simulation/SimulatedSolenoidTest.java b/src/test/java/xbot/common/simulation/SimulatedSolenoidTest.java index e9654029c..cd29de6e9 100644 --- a/src/test/java/xbot/common/simulation/SimulatedSolenoidTest.java +++ b/src/test/java/xbot/common/simulation/SimulatedSolenoidTest.java @@ -6,7 +6,7 @@ import org.junit.Ignore; import org.junit.Test; -import edu.wpi.first.wpilibj.MockSolenoid; +import xbot.common.controls.actuators.mock_adapters.MockSolenoid; @Ignore public class SimulatedSolenoidTest extends BaseSimulationTest { diff --git a/src/test/java/xbot/common/simulation/SimulatedTimerTest.java b/src/test/java/xbot/common/simulation/SimulatedTimerTest.java index 4928aef63..d03a21192 100644 --- a/src/test/java/xbot/common/simulation/SimulatedTimerTest.java +++ b/src/test/java/xbot/common/simulation/SimulatedTimerTest.java @@ -8,7 +8,7 @@ import org.junit.Ignore; import org.junit.Test; -import edu.wpi.first.wpilibj.MockTimer; +import xbot.common.controls.sensors.mock_adapters.MockTimer; @Ignore public class SimulatedTimerTest extends BaseSimulationTest { diff --git a/src/test/java/xbot/common/subsystems/drive/HeadingAssistModuleTest.java b/src/test/java/xbot/common/subsystems/drive/HeadingAssistModuleTest.java index b4fd8ba47..fe5a39847 100644 --- a/src/test/java/xbot/common/subsystems/drive/HeadingAssistModuleTest.java +++ b/src/test/java/xbot/common/subsystems/drive/HeadingAssistModuleTest.java @@ -1,9 +1,9 @@ package xbot.common.subsystems.drive; -import edu.wpi.first.wpilibj.MockTimer; import org.junit.Test; import xbot.common.controls.actuators.XCANMotorController; import xbot.common.controls.sensors.mock_adapters.MockGyro; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.BaseCommonLibTest; import xbot.common.injection.electrical_contract.CANMotorControllerInfo; import xbot.common.subsystems.drive.control_logic.HeadingAssistModule; diff --git a/src/test/java/xbot/common/subsystems/drive/HeadingModuleTest.java b/src/test/java/xbot/common/subsystems/drive/HeadingModuleTest.java index 5099a2ad6..83eb030fd 100644 --- a/src/test/java/xbot/common/subsystems/drive/HeadingModuleTest.java +++ b/src/test/java/xbot/common/subsystems/drive/HeadingModuleTest.java @@ -5,11 +5,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import edu.wpi.first.wpilibj.MockTimer; import org.junit.Test; import xbot.common.controls.actuators.XCANMotorController; import xbot.common.controls.sensors.mock_adapters.MockGyro; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.BaseCommonLibTest; import xbot.common.injection.electrical_contract.CANMotorControllerInfo; import xbot.common.math.PIDManager; diff --git a/src/test/java/xbot/common/subsystems/feedback/RumbleManagerTest.java b/src/test/java/xbot/common/subsystems/feedback/RumbleManagerTest.java index 1ba15444e..00b2e472c 100644 --- a/src/test/java/xbot/common/subsystems/feedback/RumbleManagerTest.java +++ b/src/test/java/xbot/common/subsystems/feedback/RumbleManagerTest.java @@ -5,8 +5,8 @@ import org.junit.Test; -import edu.wpi.first.wpilibj.MockTimer; import xbot.common.controls.sensors.mock_adapters.MockFTCGamepad; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.BaseCommonLibTest; /** diff --git a/src/test/java/xbot/common/subsystems/pose/BasePoseTest.java b/src/test/java/xbot/common/subsystems/pose/BasePoseTest.java index c725c3950..13a6a0cf5 100644 --- a/src/test/java/xbot/common/subsystems/pose/BasePoseTest.java +++ b/src/test/java/xbot/common/subsystems/pose/BasePoseTest.java @@ -5,8 +5,8 @@ import org.junit.Before; import org.junit.Ignore; -import edu.wpi.first.wpilibj.MockTimer; import xbot.common.controls.actuators.XCANMotorController; +import xbot.common.controls.sensors.mock_adapters.MockTimer; import xbot.common.injection.BaseCommonLibTest; import xbot.common.injection.electrical_contract.CANMotorControllerInfo;