Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up Java style (#5990)

Browse Source 
Also make equivalent changes in C++ where applicable.

Co-authored-by: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
This commit is contained in:
Tyler Veness
2023-12-03 16:21:32 -08:00
committed by GitHub
parent 66172ab288
commit 2bb1409b82
113 changed files with 426 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
wpilibj/src/test/java/edu/wpi/first/wpilibj/TimedRobotTest.java
View File

@@ -144,11 +144,7 @@ class TimedRobotTest {
void disabledModeTest() {
MockRobot robot = new MockRobot();
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
DriverStationSim.setEnabled(false);
@@ -231,11 +227,7 @@ class TimedRobotTest {
void autonomousModeTest() {
MockRobot robot = new MockRobot();
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
DriverStationSim.setEnabled(true);
@@ -320,11 +312,7 @@ class TimedRobotTest {
void teleopModeTest() {
MockRobot robot = new MockRobot();
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
DriverStationSim.setEnabled(true);
@@ -411,11 +399,7 @@ class TimedRobotTest {
MockRobot robot = new MockRobot();
robot.enableLiveWindowInTest(isLW);
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
DriverStationSim.setEnabled(true);
@@ -531,11 +515,7 @@ class TimedRobotTest {
void modeChangeTest() {
MockRobot robot = new MockRobot();
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
// Start in disabled
@@ -655,17 +635,9 @@ class TimedRobotTest {
MockRobot robot = new MockRobot();
final AtomicInteger callbackCount = new AtomicInteger(0);
robot.addPeriodic(
() -> {
callbackCount.addAndGet(1);
},
kPeriod / 2.0);
robot.addPeriodic(() -> callbackCount.addAndGet(1), kPeriod / 2.0);
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
DriverStationSim.setEnabled(false);
@@ -704,12 +676,7 @@ class TimedRobotTest {
MockRobot robot = new MockRobot();
final AtomicInteger callbackCount = new AtomicInteger(0);
robot.addPeriodic(
() -> {
callbackCount.addAndGet(1);
},
kPeriod / 2.0,
kPeriod / 4.0);
robot.addPeriodic(() -> callbackCount.addAndGet(1), kPeriod / 2.0, kPeriod / 4.0);
// Expirations in this test (ms)
//
@@ -720,11 +687,7 @@ class TimedRobotTest {
// p | 0.75p
// 2p | 1.25p
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
DriverStationSim.setEnabled(false);

18
wpilibj/src/test/java/edu/wpi/first/wpilibj/TimesliceRobotTest.java
View File

@@ -54,22 +54,10 @@ class TimesliceRobotTest {
// | RobotPeriodic() | 0 | 2 |
// | Callback 1 | 2 | 0.5 |
// | Callback 2 | 2.5 | 1 |
robot.schedule(
() -> {
callbackCount1.addAndGet(1);
},
0.0005);
robot.schedule(
() -> {
callbackCount2.addAndGet(1);
},
0.001);
robot.schedule(() -> callbackCount1.addAndGet(1), 0.0005);
robot.schedule(() -> callbackCount2.addAndGet(1), 0.001);
Thread robotThread =
new Thread(
() -> {
robot.startCompetition();
});
Thread robotThread = new Thread(robot::startCompetition);
robotThread.start();
DriverStationSim.setEnabled(false);

42
wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
View File

@@ -33,12 +33,7 @@ class WatchdogTest {
void enableDisableTest() {
final AtomicInteger watchdogCounter = new AtomicInteger(0);
try (Watchdog watchdog =
new Watchdog(
0.4,
() -> {
watchdogCounter.addAndGet(1);
})) {
try (Watchdog watchdog = new Watchdog(0.4, () -> watchdogCounter.addAndGet(1))) {
// Run 1
watchdog.enable();
SimHooks.stepTiming(0.2);
@@ -71,12 +66,7 @@ class WatchdogTest {
void resetTest() {
final AtomicInteger watchdogCounter = new AtomicInteger(0);
try (Watchdog watchdog =
new Watchdog(
0.4,
() -> {
watchdogCounter.addAndGet(1);
})) {
try (Watchdog watchdog = new Watchdog(0.4, () -> watchdogCounter.addAndGet(1))) {
watchdog.enable();
SimHooks.stepTiming(0.2);
watchdog.reset();
@@ -92,12 +82,7 @@ class WatchdogTest {
void setTimeoutTest() {
final AtomicInteger watchdogCounter = new AtomicInteger(0);
try (Watchdog watchdog =
new Watchdog(
1.0,
() -> {
watchdogCounter.addAndGet(1);
})) {
try (Watchdog watchdog = new Watchdog(1.0, () -> watchdogCounter.addAndGet(1))) {
watchdog.enable();
SimHooks.stepTiming(0.2);
watchdog.setTimeout(0.2);
@@ -137,12 +122,7 @@ class WatchdogTest {
void epochsTest() {
final AtomicInteger watchdogCounter = new AtomicInteger(0);
try (Watchdog watchdog =
new Watchdog(
0.4,
() -> {
watchdogCounter.addAndGet(1);
})) {
try (Watchdog watchdog = new Watchdog(0.4, () -> watchdogCounter.addAndGet(1))) {
// Run 1
watchdog.enable();
watchdog.addEpoch("Epoch 1");
@@ -173,18 +153,8 @@ class WatchdogTest {
final AtomicInteger watchdogCounter1 = new AtomicInteger(0);
final AtomicInteger watchdogCounter2 = new AtomicInteger(0);
try (Watchdog watchdog1 =
new Watchdog(
0.2,
() -> {
watchdogCounter1.addAndGet(1);
});
Watchdog watchdog2 =
new Watchdog(
0.6,
() -> {
watchdogCounter2.addAndGet(1);
})) {
try (Watchdog watchdog1 = new Watchdog(0.2, () -> watchdogCounter1.addAndGet(1));
Watchdog watchdog2 = new Watchdog(0.6, () -> watchdogCounter2.addAndGet(1))) {
watchdog2.enable();
SimHooks.stepTiming(0.25);
assertEquals(0, watchdogCounter1.get(), "Watchdog triggered early");

2
wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstanceTest.java
View File

@@ -136,7 +136,7 @@ class ShuffleboardInstanceTest {
try (StringSubscriber subscriber =
m_ntInstance
.getStringTopic("/Shuffleboard/.metadata/Selected")
.subscribe("", PubSubOption.keepDuplicates(true)); ) {
.subscribe("", PubSubOption.keepDuplicates(true))) {
listener =
m_ntInstance.addListener(
subscriber,

2
wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSimTest.java
View File

@@ -79,7 +79,7 @@ class AddressableLEDSimTest {
BufferCallback callback = new BufferCallback();
try (AddressableLED led = new AddressableLED(0);
CallbackStore cb = sim.registerDataCallback(callback); ) {
CallbackStore cb = sim.registerDataCallback(callback)) {
assertFalse(sim.getRunning());
assertEquals(1, sim.getLength()); // Defaults to 1 led

2
wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DCMotorSimTest.java
View File

@@ -63,7 +63,7 @@ class DCMotorSimTest {
try (var motor = new PWMVictorSPX(0);
var encoder = new Encoder(0, 1);
var controller = new PIDController(0.04, 0.0, 0.001); ) {
var controller = new PIDController(0.04, 0.0, 0.001)) {
var encoderSim = new EncoderSim(encoder);
encoderSim.resetData();

2
wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSimTest.java
View File

@@ -25,7 +25,7 @@ class DigitalPWMSimTest {
BooleanCallback initializeCallback = new BooleanCallback();
DoubleCallback dutyCycleCallback = new DoubleCallback();
try (CallbackStore initCb = sim.registerInitializedCallback(initializeCallback, false);
CallbackStore dutyCycleCb = sim.registerDutyCycleCallback(dutyCycleCallback, false); ) {
CallbackStore dutyCycleCb = sim.registerDutyCycleCallback(dutyCycleCallback, false)) {
final double kTestDutyCycle = 0.191;
output.enablePWM(kTestDutyCycle);

4
wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/RelaySimTest.java
View File

@@ -58,7 +58,7 @@ class RelaySimTest {
try (CallbackStore fwdCb = sim.registerInitializedForwardCallback(forwardCallback, false);
CallbackStore revCb = sim.registerInitializedReverseCallback(reverseCallback, false);
Relay relay = new Relay(0, Relay.Direction.kForward); ) {
Relay relay = new Relay(0, Relay.Direction.kForward)) {
assertTrue(sim.getInitializedForward());
assertFalse(sim.getInitializedReverse());
@@ -84,7 +84,7 @@ class RelaySimTest {
try (CallbackStore fwdCb = sim.registerInitializedForwardCallback(forwardCallback, false);
CallbackStore revCb = sim.registerInitializedReverseCallback(reverseCallback, false);
Relay relay = new Relay(0, Relay.Direction.kReverse); ) {
Relay relay = new Relay(0, Relay.Direction.kReverse)) {
assertFalse(sim.getInitializedForward());
assertTrue(sim.getInitializedReverse());

40
wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SimDeviceSimTest.java
View File

@@ -41,18 +41,10 @@ class SimDeviceSimTest {
SimDevice dev1 = SimDevice.create("testDC1")) {
try (CallbackStore callback1 =
SimDeviceSim.registerDeviceCreatedCallback(
"testDC",
(name, handle) -> {
callback1Counter.addAndGet(1);
},
false);
"testDC", (name, handle) -> callback1Counter.addAndGet(1), false);
CallbackStore callback2 =
SimDeviceSim.registerDeviceCreatedCallback(
"testDC",
(name, handle) -> {
callback2Counter.addAndGet(1);
},
true)) {
"testDC", (name, handle) -> callback2Counter.addAndGet(1), true)) {
assertEquals(0, callback1Counter.get(), "Callback 1 called early");
assertEquals(
1,
@@ -82,11 +74,7 @@ class SimDeviceSimTest {
SimDevice dev1 = SimDevice.create("testDF1");
try (CallbackStore callback =
SimDeviceSim.registerDeviceFreedCallback(
"testDF",
(name, handle) -> {
counter.addAndGet(1);
},
false)) {
"testDF", (name, handle) -> counter.addAndGet(1), false)) {
assertEquals(0, counter.get(), "Callback called early");
dev1.close();
assertEquals(1, counter.get(), "Callback called either more than once or not at all");
@@ -108,16 +96,10 @@ class SimDeviceSimTest {
SimDeviceSim sim = new SimDeviceSim("testVM1");
try (CallbackStore callback1 =
sim.registerValueCreatedCallback(
(name, handle, readonly, value) -> {
callback1Counter.addAndGet(1);
},
false);
(name, handle, readonly, value) -> callback1Counter.addAndGet(1), false);
CallbackStore callback2 =
sim.registerValueCreatedCallback(
(name, handle, readonly, value) -> {
callback2Counter.addAndGet(1);
},
true)) {
(name, handle, readonly, value) -> callback2Counter.addAndGet(1), true)) {
assertEquals(0, callback1Counter.get(), "Callback 1 called early");
assertEquals(
1,
@@ -148,18 +130,10 @@ class SimDeviceSimTest {
SimValue simVal = sim.getValue("v1");
try (CallbackStore callback1 =
sim.registerValueChangedCallback(
simVal,
(name, handle, readonly, value) -> {
callback1Counter.addAndGet(1);
},
false);
simVal, (name, handle, readonly, value) -> callback1Counter.addAndGet(1), false);
CallbackStore callback2 =
sim.registerValueChangedCallback(
simVal,
(name, handle, readonly, value) -> {
callback2Counter.addAndGet(1);
},
true)) {
simVal, (name, handle, readonly, value) -> callback2Counter.addAndGet(1), true)) {
assertEquals(0, callback1Counter.get(), "Callback 1 called early");
assertEquals(
1,

2
wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooserTest.java
View File

@@ -75,7 +75,7 @@ class SendableChooserTest {
chooser.addOption(String.valueOf(i), i);
}
AtomicInteger currentVal = new AtomicInteger();
chooser.onChange(val -> currentVal.set(val));
chooser.onChange(currentVal::set);
SmartDashboard.putData("changeListenerChooser", chooser);
SmartDashboard.updateValues();