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 f36aeb2fcd..d692f96f04 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 @@ -56,7 +56,7 @@ public class Trigger implements BooleanSupplier { * @return whether or not the trigger condition is active. */ public boolean get() { - return this.getAsBoolean(); + return m_isActive.getAsBoolean(); } /** @@ -69,8 +69,8 @@ public class Trigger implements BooleanSupplier { * @return whether or not the trigger condition is active. */ @Override - public boolean getAsBoolean() { - return m_isActive.getAsBoolean(); + public final boolean getAsBoolean() { + return this.get(); } /** diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/ButtonTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/ButtonTest.java index 1a4f05d450..81b12ef865 100644 --- a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/ButtonTest.java +++ b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/ButtonTest.java @@ -195,4 +195,13 @@ class ButtonTest extends CommandTestBase { scheduler.run(); verify(command).schedule(true); } + + @Test + void booleanSupplierTest() { + InternalButton button = new InternalButton(); + + assertFalse(button.getAsBoolean()); + button.setPressed(true); + assertTrue(button.getAsBoolean()); + } }