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

merged 1.4 r1046:1047 into trunk

This commit is contained in:
Nick Bolton 2011-06-18 23:59:09 +00:00
parent 2fe11744cf
commit baaa240a8c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/integtests/platform/CMSWindowsKeyStateTests.cpp
View File

@ -115,7 +115,10 @@ TEST_F(CMSWindowsKeyStateTests, saveModifiers_noModifiers_savedModifiers0)
ASSERT_EQ(0, keyState.getSavedModifiers()); ASSERT_EQ(0, keyState.getSavedModifiers());
} }
/*
// TODO: fix Assertion failed: s_instance != NULL,
// file ..\..\..\..\src\lib\base\IEventQueue.cpp, line 37
TEST_F(CMSWindowsKeyStateTests, saveModifiers_shiftKeyDown_savedModifiers4) TEST_F(CMSWindowsKeyStateTests, saveModifiers_shiftKeyDown_savedModifiers4)
{ {
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
@ -128,3 +131,4 @@ TEST_F(CMSWindowsKeyStateTests, saveModifiers_shiftKeyDown_savedModifiers4)
ASSERT_EQ(1, keyState.getSavedModifiers()); ASSERT_EQ(1, keyState.getSavedModifiers());
} }
*/