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

[wpilibj] Move button tests to button package (#2472)

Browse Source 
Also make CommandTestBase public to facilitate this.
This commit is contained in:
Austin Shalit
2020-04-05 23:05:53 -07:00
committed by GitHub
parent d1d32ada00
commit 0ad0ec0985
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2018-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -21,7 +21,7 @@ import static org.mockito.Mockito.when;
* Basic setup for all {@link Command tests}."
*/
@SuppressWarnings("PMD.AbstractClassWithoutAbstractMethod")
abstract class CommandTestBase {
public abstract class CommandTestBase {
@BeforeEach
void commandSetup() {
CommandScheduler.getInstance().cancelAll();
@@ -32,7 +32,7 @@ abstract class CommandTestBase {
setDSEnabled(true);
}
void setDSEnabled(boolean enabled) {
public void setDSEnabled(boolean enabled) {
DriverStationSim sim = new DriverStationSim();
sim.setDsAttached(true);
@@ -48,44 +48,44 @@ abstract class CommandTestBase {
}
}
class TestSubsystem extends SubsystemBase {
public class TestSubsystem extends SubsystemBase {
}
protected class MockCommandHolder {
public class MockCommandHolder {
private final Command m_mockCommand = mock(Command.class);
MockCommandHolder(boolean runWhenDisabled, Subsystem... requirements) {
public MockCommandHolder(boolean runWhenDisabled, Subsystem... requirements) {
when(m_mockCommand.getRequirements()).thenReturn(Set.of(requirements));
when(m_mockCommand.isFinished()).thenReturn(false);
when(m_mockCommand.runsWhenDisabled()).thenReturn(runWhenDisabled);
}
Command getMock() {
public Command getMock() {
return m_mockCommand;
}
void setFinished(boolean finished) {
public void setFinished(boolean finished) {
when(m_mockCommand.isFinished()).thenReturn(finished);
}
}
protected class Counter {
int m_counter;
public class Counter {
public int m_counter;
void increment() {
public void increment() {
m_counter++;
}
}
protected class ConditionHolder {
public class ConditionHolder {
private boolean m_condition;
void setCondition(boolean condition) {
public void setCondition(boolean condition) {
m_condition = condition;
}
boolean getCondition() {
public boolean getCondition() {
return m_condition;
}
}

8
wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ButtonTest.java → wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/ButtonTest.java
View File

@@ -1,15 +1,17 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2018-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.first.wpilibj2.command;
package edu.wpi.first.wpilibj2.command.button;
import org.junit.jupiter.api.Test;
import edu.wpi.first.wpilibj2.command.button.InternalButton;
import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.CommandScheduler;
import edu.wpi.first.wpilibj2.command.CommandTestBase;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;