rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merged 1.3 r1048:1049 into 1.4 and trunk

This commit is contained in:
Nick Bolton 2011-06-19 00:28:22 +00:00
parent baaa240a8c
commit 9104860863
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/integtests/platform/COSXKeyStateTests.cpp
View File

@ -26,6 +26,8 @@ CGKeyCode escKeyCode = 53;
CGKeyCode shiftKeyCode = 56; CGKeyCode shiftKeyCode = 56;
CGKeyCode controlKeyCode = 59; CGKeyCode controlKeyCode = 59;
// TODO: make pollActiveModifiers tests work reliably.
/*
TEST(COSXKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect) TEST(COSXKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect)
{ {
CMockKeyMap keyMap; CMockKeyMap keyMap;
@ -93,3 +95,4 @@ TEST(COSXKeyStateTests, pollActiveModifiers_controlKeyDownThenUp_masksAreCorrect
EXPECT_TRUE((upMask & KeyModifierControl) == 0) EXPECT_TRUE((upMask & KeyModifierControl) == 0)
<< "control key still in mask (" << upMask << ") - make sure no keys are being held down"; << "control key still in mask (" << upMask << ") - make sure no keys are being held down";
} }
*/