diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java index 63459c8308..fbd9973bb9 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.util.function.BooleanConsumer; import java.util.Set; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java index f181f0cf23..1c1ccf08ce 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import java.util.Map; import java.util.function.BooleanSupplier; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java index 8a299b2dbb..585047e93d 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import java.util.function.BooleanSupplier; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java index d235bfeaad..fcd4bd7384 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import java.util.function.BooleanSupplier; import java.util.function.Consumer; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/MecanumControllerCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/MecanumControllerCommand.java index 4c10b3edd0..9b023cecce 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/MecanumControllerCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/MecanumControllerCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.controller.HolonomicDriveController; import edu.wpi.first.math.controller.PIDController; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java index f4c10dc7f2..ec184c8403 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.controller.PIDController; import java.util.Set; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java index 32dbb0a790..84318de14a 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.controller.PIDController; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java index d637b22140..4344913601 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java @@ -5,7 +5,7 @@ package edu.wpi.first.wpilibj2.command; import static edu.wpi.first.math.trajectory.TrapezoidProfile.State; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.controller.ProfiledPIDController; import java.util.Set; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java index 549de24d9f..283b4bfd46 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java @@ -5,7 +5,7 @@ package edu.wpi.first.wpilibj2.command; import static edu.wpi.first.math.trajectory.TrapezoidProfile.State; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.controller.ProfiledPIDController; import edu.wpi.first.math.trajectory.TrapezoidProfile; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java index 871d82922e..61bd8d2fde 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import java.util.function.Supplier; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java index f5a957d2c4..8aedfc6d41 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.controller.PIDController; import edu.wpi.first.math.controller.RamseteController; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java index b70f9c521c..3fcbfa7407 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; /** * A command that runs another command repeatedly, restarting it when it ends, until this command is diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java index a020c1fc9f..e7ed93404d 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import java.util.Map; import java.util.function.Supplier; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java index 2ab586ad9a..9eff70d9d9 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import java.util.function.Consumer; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SwerveControllerCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SwerveControllerCommand.java index 99e5683708..5c45cf1b78 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SwerveControllerCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SwerveControllerCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.controller.HolonomicDriveController; import edu.wpi.first.math.controller.PIDController; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java index afc09d3046..7c13973e57 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java @@ -5,7 +5,7 @@ package edu.wpi.first.wpilibj2.command; import static edu.wpi.first.math.trajectory.TrapezoidProfile.State; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.trajectory.TrapezoidProfile; import edu.wpi.first.wpilibj.Timer; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java index 547ddf6be4..1db661928e 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.trajectory.TrapezoidProfile; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java index ace287a614..4d51e62108 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.wpilibj.Timer; import java.util.function.BooleanSupplier; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java index 617d4bf835..f22d443582 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command.button; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.wpilibj.GenericHID; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java index d205da3078..b21cd970f7 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command.button; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.networktables.BooleanSubscriber; import edu.wpi.first.networktables.BooleanTopic; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java index 93463a2f70..28087ae55b 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command.button; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.wpilibj.GenericHID; diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java index e3e0e224a2..6b16adc840 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj2.command.button; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.math.filter.Debouncer; import edu.wpi.first.wpilibj.event.BooleanEvent; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java index a2405b8a69..3ea9ef7947 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tResourceType; import edu.wpi.first.hal.HAL; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java index c9b9126547..06c7e46078 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogGyro.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.AnalogGyroJNI; import edu.wpi.first.hal.FRCNetComm.tResourceType; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java index f54c0815b8..e1c04ec6d5 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.AnalogJNI; import edu.wpi.first.hal.FRCNetComm.tResourceType; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AsynchronousInterrupt.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AsynchronousInterrupt.java index 1981671dad..4cb3cb5673 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AsynchronousInterrupt.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AsynchronousInterrupt.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java index 124676a10e..735a8cf0c8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java @@ -4,8 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; -import static java.util.Objects.requireNonNull; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.CounterJNI; import edu.wpi.first.hal.FRCNetComm.tResourceType; @@ -279,7 +278,7 @@ public class Counter implements CounterBase, Sendable, AutoCloseable { * @param source the digital source to count */ public void setDownSource(DigitalSource source) { - requireNonNull(source, "The Digital Source given was null"); + requireNonNullParam(source, "source", "setDownSource"); if (m_downSource != null && m_allocatedDownSource) { m_downSource.close(); @@ -312,7 +311,9 @@ public class Counter implements CounterBase, Sendable, AutoCloseable { * @param fallingEdge true to count the falling edge */ public void setDownSourceEdge(boolean risingEdge, boolean fallingEdge) { - requireNonNull(m_downSource, "Down Source must be set before setting the edge!"); + if (m_downSource == null) { + throw new IllegalStateException("Down Source must be set before setting the edge!"); + } CounterJNI.setCounterDownSourceEdge(m_counter, risingEdge, fallingEdge); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java index 7a5ea61f49..54cca78d50 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.EncoderJNI; import edu.wpi.first.hal.FRCNetComm.tResourceType; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java index 830ad30115..1c37ecf27a 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tResourceType; import edu.wpi.first.hal.HAL; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java index 7f8f6069e8..daeaa8835f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static java.util.Objects.requireNonNull; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.NotifierJNI; import java.util.concurrent.atomic.AtomicInteger; @@ -81,7 +81,7 @@ public class Notifier implements AutoCloseable { * or StartPeriodic. */ public Notifier(Runnable run) { - requireNonNull(run); + requireNonNullParam(run, "run", "Notifier"); m_handler = run; m_notifier.set(NotifierJNI.initializeNotifier()); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java index 7675e4d2fc..68121ba00c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tResourceType; import edu.wpi.first.hal.HAL; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java index 592dbc0225..ea33f97981 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tResourceType; import edu.wpi.first.hal.HAL; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SynchronousInterrupt.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SynchronousInterrupt.java index 8983e2728b..3e553509d7 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SynchronousInterrupt.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SynchronousInterrupt.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.InterruptJNI; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java index 2d3fb4ea76..ae9ac557f2 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Ultrasonic.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj; -import static java.util.Objects.requireNonNull; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tResourceType; import edu.wpi.first.hal.HAL; @@ -142,8 +142,8 @@ public class Ultrasonic implements Sendable, AutoCloseable { * @param echoChannel The digital input object that times the return pulse to determine the range. */ public Ultrasonic(DigitalOutput pingChannel, DigitalInput echoChannel) { - requireNonNull(pingChannel, "Provided ping channel was null"); - requireNonNull(echoChannel, "Provided echo channel was null"); + requireNonNullParam(pingChannel, "pingChannel", "Ultrasonic"); + requireNonNullParam(echoChannel, "echoChannel", "Ultrasonic"); m_allocatedChannels = false; m_pingChannel = pingChannel; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/ExternalDirectionCounter.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/ExternalDirectionCounter.java index 706a28754f..76dde7063c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/ExternalDirectionCounter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/ExternalDirectionCounter.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.counter; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.CounterJNI; import edu.wpi.first.hal.FRCNetComm.tResourceType; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/Tachometer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/Tachometer.java index 5864233db7..5bd8e7ea78 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/Tachometer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/Tachometer.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.counter; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.CounterJNI; import edu.wpi.first.hal.FRCNetComm.tResourceType; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java index 8db30d3aff..4b1268203c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.drive; -import static java.util.Objects.requireNonNull; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tInstances; import edu.wpi.first.hal.FRCNetComm.tResourceType; @@ -129,8 +129,8 @@ public class DifferentialDrive extends RobotDriveBase implements Sendable, AutoC * @param rightMotor Right motor. */ public DifferentialDrive(MotorController leftMotor, MotorController rightMotor) { - requireNonNull(leftMotor, "Left motor cannot be null"); - requireNonNull(rightMotor, "Right motor cannot be null"); + requireNonNullParam(leftMotor, "leftMotor", "DifferentialDrive"); + requireNonNullParam(rightMotor, "rightMotor", "DifferentialDrive"); m_leftMotor = leftMotor; m_rightMotor = rightMotor; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java index 43b6754943..ad3bf50bd9 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.drive; -import static java.util.Objects.requireNonNull; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tInstances; import edu.wpi.first.hal.FRCNetComm.tResourceType; @@ -109,10 +109,10 @@ public class MecanumDrive extends RobotDriveBase implements Sendable, AutoClosea MotorController rearLeftMotor, MotorController frontRightMotor, MotorController rearRightMotor) { - requireNonNull(frontLeftMotor, "Front-left motor cannot be null"); - requireNonNull(rearLeftMotor, "Rear-left motor cannot be null"); - requireNonNull(frontRightMotor, "Front-right motor cannot be null"); - requireNonNull(rearRightMotor, "Rear-right motor cannot be null"); + requireNonNullParam(frontLeftMotor, "frontLeftMotor", "MecanumDrive"); + requireNonNullParam(rearLeftMotor, "rearLeftMotor", "MecanumDrive"); + requireNonNullParam(frontRightMotor, "frontRightMotor", "MecanumDrive"); + requireNonNullParam(rearRightMotor, "rearRightMotor", "MecanumDrive"); m_frontLeftMotor = frontLeftMotor; m_rearLeftMotor = rearLeftMotor; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/event/NetworkBooleanEvent.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/event/NetworkBooleanEvent.java index 53fa451e24..a322883092 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/event/NetworkBooleanEvent.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/event/NetworkBooleanEvent.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.event; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.networktables.BooleanSubscriber; import edu.wpi.first.networktables.BooleanTopic; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ContainerHelper.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ContainerHelper.java index a448970273..c8c0731fbc 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ContainerHelper.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ContainerHelper.java @@ -4,20 +4,20 @@ package edu.wpi.first.wpilibj.shuffleboard; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; + import edu.wpi.first.networktables.GenericPublisher; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.networktables.NetworkTableType; import edu.wpi.first.util.function.FloatSupplier; import edu.wpi.first.util.sendable.Sendable; import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.util.ErrorMessages; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import java.util.Objects; import java.util.Set; import java.util.function.BiConsumer; import java.util.function.BooleanSupplier; @@ -58,7 +58,7 @@ final class ContainerHelper { } ComplexWidget add(String title, Sendable sendable) { - ErrorMessages.requireNonNullParam(sendable, "sendable", "add"); + requireNonNullParam(sendable, "sendable", "add"); checkTitle(title); ComplexWidget widget = new ComplexWidget(m_container, title, sendable); m_components.add(widget); @@ -66,7 +66,7 @@ final class ContainerHelper { } ComplexWidget add(Sendable sendable) { - ErrorMessages.requireNonNullParam(sendable, "sendable", "add"); + requireNonNullParam(sendable, "sendable", "add"); String name = SendableRegistry.getName(sendable); if (name.isEmpty()) { throw new IllegalArgumentException("Sendable must have a name"); @@ -75,13 +75,13 @@ final class ContainerHelper { } SimpleWidget add(String title, Object defaultValue) { - Objects.requireNonNull(defaultValue, "Default value cannot be null"); + requireNonNullParam(defaultValue, "defaultValue", "add"); return add(title, NetworkTableType.getStringFromObject(defaultValue), defaultValue); } SimpleWidget add(String title, String typeString, Object defaultValue) { - Objects.requireNonNull(title, "Title cannot be null"); - Objects.requireNonNull(defaultValue, "Default value cannot be null"); + requireNonNullParam(title, "title", "add"); + requireNonNullParam(defaultValue, "defaultValue", "add"); checkTitle(title); checkNtType(defaultValue); @@ -92,56 +92,58 @@ final class ContainerHelper { } SuppliedValueWidget addString(String title, Supplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addString"); return addSupplied(title, "string", valueSupplier, GenericPublisher::setString); } SuppliedValueWidget addNumber(String title, DoubleSupplier valueSupplier) { + requireNonNullParam(title, "title", "addNumber"); + requireNonNullParam(valueSupplier, "valueSupplier", "addNumber"); return addDouble(title, valueSupplier); } SuppliedValueWidget addDouble(String title, DoubleSupplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addDouble"); return addSupplied(title, "double", valueSupplier::getAsDouble, GenericPublisher::setDouble); } SuppliedValueWidget addFloat(String title, FloatSupplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addFloat"); return addSupplied(title, "float", valueSupplier::getAsFloat, GenericPublisher::setFloat); } SuppliedValueWidget addInteger(String title, LongSupplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addInteger"); return addSupplied(title, "int", valueSupplier::getAsLong, GenericPublisher::setInteger); } SuppliedValueWidget addBoolean(String title, BooleanSupplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addBoolean"); return addSupplied(title, "boolean", valueSupplier::getAsBoolean, GenericPublisher::setBoolean); } SuppliedValueWidget addStringArray(String title, Supplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addStringArray"); return addSupplied(title, "string[]", valueSupplier, GenericPublisher::setStringArray); } SuppliedValueWidget addDoubleArray(String title, Supplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addDoubleArray"); return addSupplied(title, "double[]", valueSupplier, GenericPublisher::setDoubleArray); } SuppliedValueWidget addFloatArray(String title, Supplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addFloatArray"); return addSupplied(title, "float[]", valueSupplier, GenericPublisher::setFloatArray); } SuppliedValueWidget addIntegerArray(String title, Supplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addIntegerArray"); return addSupplied(title, "int[]", valueSupplier, GenericPublisher::setIntegerArray); } SuppliedValueWidget addBooleanArray(String title, Supplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addBooleanArray"); return addSupplied(title, "boolean[]", valueSupplier, GenericPublisher::setBooleanArray); } @@ -151,13 +153,13 @@ final class ContainerHelper { SuppliedValueWidget addRaw( String title, String typeString, Supplier valueSupplier) { - precheck(title, valueSupplier); + precheck(title, valueSupplier, "addRaw"); return addSupplied(title, typeString, valueSupplier, GenericPublisher::setRaw); } - private void precheck(String title, Object valueSupplier) { - Objects.requireNonNull(title, "Title cannot be null"); - Objects.requireNonNull(valueSupplier, "Value supplier cannot be null"); + private void precheck(String title, Object valueSupplier, String methodName) { + requireNonNullParam(title, "title", methodName); + requireNonNullParam(valueSupplier, "valueSupplier", methodName); checkTitle(title); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java index 1a7b496e30..150f0dbb6c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java @@ -4,6 +4,8 @@ package edu.wpi.first.wpilibj.shuffleboard; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; + import edu.wpi.first.cscore.VideoSource; import edu.wpi.first.networktables.NetworkTable; import edu.wpi.first.networktables.NetworkTableInstance; @@ -112,8 +114,8 @@ public final class SendableCameraWrapper implements Sendable, AutoCloseable { return m_wrappers.get(cameraName); } - Objects.requireNonNull(cameraName, "cameraName"); - Objects.requireNonNull(cameraUrls, "cameraUrls"); + requireNonNullParam(cameraName, "cameraName", "wrap"); + requireNonNullParam(cameraUrls, "cameraUrls", "wrap"); if (cameraName.isEmpty()) { throw new IllegalArgumentException("Camera name not specified"); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardComponent.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardComponent.java index a7c1f6cf04..39078f439e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardComponent.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardComponent.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.shuffleboard; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.networktables.NetworkTable; import java.util.Map; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstance.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstance.java index 1d87882c4a..6c03dedfc8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstance.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstance.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.shuffleboard; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.hal.FRCNetComm.tResourceType; import edu.wpi.first.hal.HAL; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardLayout.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardLayout.java index 4135e090a0..bb450e4f36 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardLayout.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardLayout.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.shuffleboard; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.networktables.NetworkTable; import edu.wpi.first.util.function.FloatSupplier; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java index 322938b853..688f00609d 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.smartdashboard; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import edu.wpi.first.networktables.IntegerPublisher; import edu.wpi.first.networktables.IntegerTopic; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/ErrorMessages.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/ErrorMessages.java deleted file mode 100644 index c5b58321c2..0000000000 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/ErrorMessages.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) FIRST and other WPILib contributors. -// Open Source Software; you can modify and/or share it under the terms of -// the WPILib BSD license file in the root directory of this project. - -package edu.wpi.first.wpilibj.util; - -import static java.util.Objects.requireNonNull; - -/** Utility class for common WPILib error messages. */ -public final class ErrorMessages { - /** Utility class, so constructor is private. */ - private ErrorMessages() { - throw new UnsupportedOperationException("This is a utility class!"); - } - - /** - * Requires that a parameter of a method not be null; prints an error message with helpful - * debugging instructions if the parameter is null. - * - * @param Type of object. - * @param obj The parameter that must not be null. - * @param paramName The name of the parameter. - * @param methodName The name of the method. - * @return The object parameter confirmed not to be null. - */ - public static T requireNonNullParam(T obj, String paramName, String methodName) { - return requireNonNull( - obj, - "Parameter " - + paramName - + " in method " - + methodName - + " was null when it" - + " should not have been! Check the stacktrace to find the responsible line of code - " - + "usually, it is the first line of user-written code indicated in the stacktrace. " - + "Make sure all objects passed to the method in question were properly initialized -" - + " note that this may not be obvious if it is being called under " - + "dynamically-changing conditions! Please do not seek additional technical assistance" - + " without doing this first!"); - } -} diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/SuppliedValueWidgetTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/SuppliedValueWidgetTest.java index 036c73d51a..794d155b1d 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/SuppliedValueWidgetTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/SuppliedValueWidgetTest.java @@ -12,6 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.networktables.NetworkTableInstance; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -25,6 +26,11 @@ class SuppliedValueWidgetTest { m_instance = new ShuffleboardInstance(m_ntInstance); } + @AfterEach + void tearDown() { + m_ntInstance.close(); + } + @Test void testAddString() { AtomicInteger count = new AtomicInteger(0); diff --git a/wpilibj/src/test/java/edu/wpi/first/math/util/ErrorMessagesTest.java b/wpiutil/src/test/java/edu/wpi/first/util/ErrorMessagesTest.java similarity index 67% rename from wpilibj/src/test/java/edu/wpi/first/math/util/ErrorMessagesTest.java rename to wpiutil/src/test/java/edu/wpi/first/util/ErrorMessagesTest.java index 5153b00f3e..94e8bea929 100644 --- a/wpilibj/src/test/java/edu/wpi/first/math/util/ErrorMessagesTest.java +++ b/wpiutil/src/test/java/edu/wpi/first/util/ErrorMessagesTest.java @@ -2,21 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.util; +package edu.wpi.first.util; -import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; +import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.wpilibj.UtilityClassTest; -import edu.wpi.first.wpilibj.util.ErrorMessages; import org.junit.jupiter.api.Test; -class ErrorMessagesTest extends UtilityClassTest { - ErrorMessagesTest() { - super(ErrorMessages.class); - } - +class ErrorMessagesTest { @Test void requireNonNullParamNullTest() { assertThrows(