Move mock types into xbot.common from edu.wpi.first.wpilibj

src/main/java/edu/wpi/first/wpilibj/MockDigitalOutput.java → 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;

src/main/java/edu/wpi/first/wpilibj/MockPWM.java → 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;

src/main/java/edu/wpi/first/wpilibj/MockServo.java → 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;

src/main/java/edu/wpi/first/wpilibj/MockSolenoid.java → 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;
 

src/main/java/edu/wpi/first/wpilibj/MockSpeedController.java → 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;

src/main/java/edu/wpi/first/wpilibj/MockAnalogInput.java → 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;
 

src/main/java/edu/wpi/first/wpilibj/MockDigitalInput.java → 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;
 

src/main/java/edu/wpi/first/wpilibj/MockDistanceSensor.java → 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;
 

src/main/java/edu/wpi/first/wpilibj/MockDistanceSensorPair.java → 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;
 

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;

src/main/java/edu/wpi/first/wpilibj/MockLidarLite.java → 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;

src/main/java/edu/wpi/first/wpilibj/MockTimer.java → 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;

src/main/java/edu/wpi/first/wpilibj/MockXboxControllerAdapter.java → 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;

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;

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;
 

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;

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;

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;

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;

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 {

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;
 

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 {
 

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;

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 {

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 {

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;

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;

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;
 
 /**

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;