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

Remove wpilibj tests from wpilibjIntegrationTests (#1323)

Browse Source 
Since the integration tests are still on junit 4, the wpilibj junit 5 tests fail.
This commit is contained in:
Thad House
2018-09-20 21:57:59 -07:00
committed by Peter Johnson
parent 12c92a822d
commit 0068b6aea3
5 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestSuite.java
View File

@@ -28,7 +28,6 @@ import junit.framework.JUnit4TestAdapter;
import junit.runner.Version;
import edu.wpi.first.wpilibj.WpiLibJTestSuite;
import edu.wpi.first.wpilibj.command.CommandTestSuite;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboardTestSuite;
/**
@@ -38,7 +37,7 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboardTestSuite;
*/
@RunWith(Suite.class)
// These are listed on separate lines to prevent merge conflicts
@SuiteClasses({WpiLibJTestSuite.class, CommandTestSuite.class, SmartDashboardTestSuite.class})
@SuiteClasses({WpiLibJTestSuite.class, SmartDashboardTestSuite.class})
public class TestSuite extends AbstractTestSuite {
static {
// Sets up the logging output