backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-03 18:37:24 +08:00
Code Issues Projects Releases Wiki Activity

merged 1.4 r1007:1008 into trunk

Browse Source
This commit is contained in:
Nick Bolton
2011-05-21 00:30:08 +00:00
parent bebf8c2c2c
commit 5a315324ca
39 changed files with 808 additions and 2854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/integtests/CMakeLists.txt
View File

@@ -50,7 +50,7 @@ set(inc
../../lib/net
../../lib/platform
../../lib/synergy
../../../tools/gtest-1.6.0/include
../../../tools/gtest-1.6.0/include
../../../tools/gmock-1.6.0/include
)

76
src/test/integtests/platform/CMSWindowsClipboardTests.cpp
View File

@@ -50,33 +50,33 @@ public:
TEST_F(CMSWindowsClipboardTests, emptyUnowned_openCalled_returnsTrue)
{
CMSWindowsClipboard clipboard(NULL);
clipboard.open(0);
bool actual = clipboard.emptyUnowned();
CMSWindowsClipboard clipboard(NULL);
clipboard.open(0);
bool actual = clipboard.emptyUnowned();
EXPECT_EQ(true, actual);
}
TEST_F(CMSWindowsClipboardTests, empty_openCalled_returnsTrue)
{
CMSWindowsClipboard clipboard(NULL);
clipboard.open(0);
bool actual = clipboard.empty();
CMSWindowsClipboard clipboard(NULL);
clipboard.open(0);
bool actual = clipboard.empty();
EXPECT_EQ(true, actual);
}
TEST_F(CMSWindowsClipboardTests, empty_singleFormat_hasReturnsFalse)
{
CMSWindowsClipboard clipboard(NULL);
clipboard.open(0);
clipboard.add(CMSWindowsClipboard::kText, "synergy rocks!");
clipboard.empty();
bool actual = clipboard.has(CMSWindowsClipboard::kText);
CMSWindowsClipboard clipboard(NULL);
clipboard.open(0);
clipboard.add(CMSWindowsClipboard::kText, "synergy rocks!");
clipboard.empty();
bool actual = clipboard.has(CMSWindowsClipboard::kText);
EXPECT_EQ(false, actual);
}
@@ -117,19 +117,19 @@ TEST_F(CMSWindowsClipboardTests, add_replaceValue_valueWasReplaced)
TEST_F(CMSWindowsClipboardTests, open_timeIsZero_returnsTrue)
{
CMSWindowsClipboard clipboard(NULL);
bool actual = clipboard.open(0);
CMSWindowsClipboard clipboard(NULL);
bool actual = clipboard.open(0);
EXPECT_EQ(true, actual);
}
TEST_F(CMSWindowsClipboardTests, open_timeIsOne_returnsTrue)
{
CMSWindowsClipboard clipboard(NULL);
bool actual = clipboard.open(1);
CMSWindowsClipboard clipboard(NULL);
bool actual = clipboard.open(1);
EXPECT_EQ(true, actual);
}
@@ -147,13 +147,13 @@ TEST_F(CMSWindowsClipboardTests, close_isOpen_noErrors)
// * http://buildbot.synergy-foss.org:8000/builders/trunk-win32/builds/246/steps/shell_3/logs/stdio
/*TEST_F(CMSWindowsClipboardTests, getTime_openWithNoEmpty_returnsOne)
{
CMSWindowsClipboard clipboard(NULL);
clipboard.open(1);
CMSWindowsClipboard::Time actual = clipboard.getTime();
// this behavior is different to that of CClipboard which only
// returns the value passed into open(t) after empty() is called.
CMSWindowsClipboard clipboard(NULL);
clipboard.open(1);
CMSWindowsClipboard::Time actual = clipboard.getTime();
// this behavior is different to that of CClipboard which only
// returns the value passed into open(t) after empty() is called.
EXPECT_EQ(1, actual);
}*/
@@ -161,12 +161,12 @@ TEST_F(CMSWindowsClipboardTests, close_isOpen_noErrors)
// http://buildbot.synergy-foss.org:8000/builders/trunk-win32/builds/266/steps/shell_3/logs/stdio
/*TEST_F(CMSWindowsClipboardTests, getTime_openAndEmpty_returnsOne)
{
CMSWindowsClipboard clipboard(NULL);
clipboard.open(1);
clipboard.empty();
CMSWindowsClipboard::Time actual = clipboard.getTime();
CMSWindowsClipboard clipboard(NULL);
clipboard.open(1);
clipboard.empty();
CMSWindowsClipboard::Time actual = clipboard.getTime();
EXPECT_EQ(1, actual);
}*/

4
src/test/integtests/platform/CXWindowsClipboardTests.cpp
View File

@@ -77,7 +77,7 @@ TEST_F(CXWindowsClipboardTests, empty_singleFormat_hasReturnsFalse)
clipboard.empty();
bool actual = clipboard.has(CXWindowsClipboard::kText);
EXPECT_EQ(false, actual);
EXPECT_FALSE(actual);
}
TEST_F(CXWindowsClipboardTests, add_newValue_valueWasStored)
@@ -127,7 +127,7 @@ TEST_F(CXWindowsClipboardTests, has_withNoFormats_returnsFalse)
bool actual = clipboard.has(IClipboard::kText);
EXPECT_EQ(false, actual);
EXPECT_FALSE(actual);
}
TEST_F(CXWindowsClipboardTests, get_withNoFormats_returnsEmpty)