From e837d9083a4ba2cbc6a913f2b058c60792722aa4 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Thu, 31 Jul 2014 15:49:55 -0400 Subject: [PATCH] Changes the name of the AccelerometerTest to BuiltInAccelerometerTest Change-Id: Iabbfa8c4f3688a126443993b861018068f1969c4 --- .../{AccelerometerTest.cpp => BuiltInAccelerometerTest.cpp} | 2 +- .../{AccelerometerTest.java => BuiltInAccelerometerTest.java} | 4 ++-- .../src/main/java/edu/wpi/first/wpilibj/WpiLibJTestSuite.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename wpilibc/wpilibC++IntegrationTests/src/{AccelerometerTest.cpp => BuiltInAccelerometerTest.cpp} (95%) rename wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/{AccelerometerTest.java => BuiltInAccelerometerTest.java} (94%) diff --git a/wpilibc/wpilibC++IntegrationTests/src/AccelerometerTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp similarity index 95% rename from wpilibc/wpilibC++IntegrationTests/src/AccelerometerTest.cpp rename to wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp index f53d089b8f..33893be9da 100644 --- a/wpilibc/wpilibC++IntegrationTests/src/AccelerometerTest.cpp +++ b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp @@ -13,7 +13,7 @@ static constexpr double kAccelerationTolerance = 0.1; * There's not much we can automatically test with the on-board accelerometer, * but checking for gravity is probably good enough to tell that it's working. */ -TEST(AccelerometerTest, Accelerometer) { +TEST(BuiltInAccelerometerTest, Accelerometer) { BuiltInAccelerometer accelerometer; /* The testbench sometimes shakes a little from a previous test. Give it diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AccelerometerTest.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java similarity index 94% rename from wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AccelerometerTest.java rename to wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java index e6bf598d66..1e1a30ee97 100644 --- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/AccelerometerTest.java +++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java @@ -24,12 +24,12 @@ import edu.wpi.first.wpilibj.BuiltInAccelerometer; import edu.wpi.first.wpilibj.test.AbstractComsSetup; @RunWith(Parameterized.class) -public class AccelerometerTest extends AbstractComsSetup { +public class BuiltInAccelerometerTest extends AbstractComsSetup { private static final Logger logger = Logger.getLogger(PIDTest.class.getName()); private static final double kAccelerationTolerance = 0.1; private BuiltInAccelerometer m_accelerometer; - public AccelerometerTest(Accelerometer.Range range) { + public BuiltInAccelerometerTest(Accelerometer.Range range) { m_accelerometer = new BuiltInAccelerometer(range); } diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/WpiLibJTestSuite.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/WpiLibJTestSuite.java index 536b0e3c52..513075cda9 100644 --- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/WpiLibJTestSuite.java +++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/WpiLibJTestSuite.java @@ -19,7 +19,7 @@ import edu.wpi.first.wpilibj.test.AbstractTestSuite; */ @RunWith(Suite.class) @SuiteClasses({ - AccelerometerTest.class, + BuiltInAccelerometerTest.class, AnalogCrossConnectTest.class, AnalogPotentiometerTest.class, CounterTest.class,