diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-08-01 17:48:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-01 17:48:21 -0700 |
| commit | 2a2ec87b55d423ae91385d4e9f51725154b7a272 (patch) | |
| tree | 644a5b477891d6e2a6ac71cf3376cb60509f9f4b /libs/ui/tests/InputEvent_test.cpp | |
| parent | 8a2da33c77bae825444fffd326d064225241c7cc (diff) | |
| parent | be1aa8250cee7819c49741e819e81659d1d03823 (diff) | |
| download | frameworks_base-2a2ec87b55d423ae91385d4e9f51725154b7a272.zip frameworks_base-2a2ec87b55d423ae91385d4e9f51725154b7a272.tar.gz frameworks_base-2a2ec87b55d423ae91385d4e9f51725154b7a272.tar.bz2 | |
Merge "Refactor input reader to add stylus support. Bug: 5064702"
Diffstat (limited to 'libs/ui/tests/InputEvent_test.cpp')
| -rw-r--r-- | libs/ui/tests/InputEvent_test.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libs/ui/tests/InputEvent_test.cpp b/libs/ui/tests/InputEvent_test.cpp index e48d5b7..e21c464 100644 --- a/libs/ui/tests/InputEvent_test.cpp +++ b/libs/ui/tests/InputEvent_test.cpp @@ -52,9 +52,6 @@ TEST_F(PointerCoordsTest, AxisValues) { ASSERT_EQ(0, coords.getAxisValue(1)) << "getAxisValue should return zero because axis is not present"; - ASSERT_EQ(NULL, coords.editAxisValue(0)) - << "editAxisValue should return null because axis is not present"; - // Set first axis. ASSERT_EQ(OK, coords.setAxisValue(1, 5)); ASSERT_EQ(0x00000002ULL, coords.bits); @@ -96,26 +93,17 @@ TEST_F(PointerCoordsTest, AxisValues) { ASSERT_EQ(2, coords.getAxisValue(3)) << "getAxisValue should return value of axis"; - // Edit an existing axis value in place. - valuePtr = coords.editAxisValue(1); - ASSERT_EQ(5, *valuePtr) - << "editAxisValue should return pointer to axis value"; - - *valuePtr = 7; - ASSERT_EQ(7, coords.getAxisValue(1)) - << "getAxisValue should return value of axis"; - // Set an axis with an id between the others. (inserting value in the middle) ASSERT_EQ(OK, coords.setAxisValue(2, 1)); ASSERT_EQ(0x0000000fULL, coords.bits); ASSERT_EQ(4, coords.values[0]); - ASSERT_EQ(7, coords.values[1]); + ASSERT_EQ(5, coords.values[1]); ASSERT_EQ(1, coords.values[2]); ASSERT_EQ(2, coords.values[3]); ASSERT_EQ(4, coords.getAxisValue(0)) << "getAxisValue should return value of axis"; - ASSERT_EQ(7, coords.getAxisValue(1)) + ASSERT_EQ(5, coords.getAxisValue(1)) << "getAxisValue should return value of axis"; ASSERT_EQ(1, coords.getAxisValue(2)) << "getAxisValue should return value of axis"; |