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

Move unit tests from integration test suite (#1170)

Browse Source
This commit is contained in:
Austin Shalit
2019-07-16 01:02:52 -04:00
committed by Peter Johnson
parent dffa1a5cba
commit e488861877
12 changed files with 445 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2019 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. */
@@ -28,7 +28,6 @@ import junit.framework.JUnit4TestAdapter;
import junit.runner.Version;
import edu.wpi.first.wpilibj.WpiLibJTestSuite;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboardTestSuite;
/**
* The WPILibJ Integeration Test Suite collects all of the tests to be run by junit. In order for a
@@ -36,8 +35,7 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboardTestSuite;
* order they are listed in the suite classes annotation.
*/
@RunWith(Suite.class)
// These are listed on separate lines to prevent merge conflicts
@SuiteClasses({WpiLibJTestSuite.class, SmartDashboardTestSuite.class})
@SuiteClasses(WpiLibJTestSuite.class)
public class TestSuite extends AbstractTestSuite {
static {
// Sets up the logging output