From e48edbebd38d1147695f3e83a54feadaae641c30 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 15 Jun 2015 14:40:37 -0400 Subject: [PATCH] Fixed BuiltInAccelerometer Tests, changed expected axis of gravity from the z-axis to the y-axis. Change-Id: Ie88569009d809ba150358a7fa7c6d84726fb32f6 --- .../src/BuiltInAccelerometerTest.cpp | 4 ++-- .../java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp index 33893be9da..c7a1079c47 100644 --- a/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp +++ b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp @@ -21,6 +21,6 @@ TEST(BuiltInAccelerometerTest, Accelerometer) { Wait(1.0); ASSERT_NEAR(0.0, accelerometer.GetX(), kAccelerationTolerance); - ASSERT_NEAR(0.0, accelerometer.GetY(), kAccelerationTolerance); - ASSERT_NEAR(1.0, accelerometer.GetZ(), kAccelerationTolerance); + ASSERT_NEAR(1.0, accelerometer.GetY(), kAccelerationTolerance); + ASSERT_NEAR(0.0, accelerometer.GetZ(), kAccelerationTolerance); } diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java index 075ed9fa08..4f23b25ff4 100644 --- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java +++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java @@ -64,8 +64,8 @@ public class BuiltInAccelerometerTest extends AbstractComsSetup { @Test public void testAccelerometer() { assertEquals(0.0, m_accelerometer.getX(), kAccelerationTolerance); - assertEquals(0.0, m_accelerometer.getY(), kAccelerationTolerance); - assertEquals(1.0, m_accelerometer.getZ(), kAccelerationTolerance); + assertEquals(1.0, m_accelerometer.getY(), kAccelerationTolerance); + assertEquals(0.0, m_accelerometer.getZ(), kAccelerationTolerance); } }