Commit Graph

215 Commits

Author SHA1 Message Date
Jerry (Xinyu Hou)
a5c865913f Added expect call time for hasClients #4721 2015-07-31 13:55:09 -07:00
Jerry (Xinyu Hou)
c3d38db053 Made buffer thread wait for notify when no gui #4721 2015-07-31 13:55:00 -07:00
Jerry (Xinyu Hou)
5ec9ccc76e Revert "Made buffer thread wait until there is a GUI client #4721"
This reverts commit 9a4327e44236c0ac30809660dc87a97e984dc84f.
2015-07-31 13:52:56 -07:00
Jerry (Xinyu Hou)
01526bbe78 Revert "Removed unrelated checking #4721"
This reverts commit 2de276cfca71a79df31a1d4a89d412212279a1a5.
2015-07-31 13:52:47 -07:00
Xinyu Hou
88214a0d3c Removed unrelated checking #4721 2015-07-31 13:49:42 -07:00
Xinyu Hou
afdcb9cefe Made buffer thread wait until there is a GUI client #4721
Conflicts:
	src/lib/ipc/IpcLogOutputter.cpp
2015-07-31 13:49:17 -07:00
Jerry (Xinyu Hou)
a8cf9173c8 Revert "Changed note to notify #4745"
This reverts commit 5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp
2015-07-31 13:19:17 -07:00
Nick Bolton
f94e1e1660 Disabled intermittently failing unit test #4651 2015-06-10 07:04:58 -07:00
Jerry (Xinyu Hou)
f36d257495 Updated the comments 2015-06-09 15:48:08 -07:00
Jerry (Xinyu Hou)
81acb96540 Tried to fix random unittest fail (part2) 2015-06-09 15:33:57 -07:00
Jerry (Xinyu Hou)
deb3db93e6 Tried to fix random unittest fail 2015-06-09 13:59:04 -07:00
Jerry (Xinyu Hou)
0680c33909 Added file events #4584 2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou)
4508e10186 Fixed IpcLogOutputterTest #4721 2015-06-03 15:23:33 -07:00
Jerry (Xinyu Hou)
c4e8dc7198 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-02 15:30:33 -07:00
Jerry (Xinyu Hou)
5006adedfe Changed note to notify #4745 2015-06-01 14:46:08 -07:00
Jerry (Xinyu Hou)
bd3a8e9429 Fixed unittest for ipcLogOutputter #4721 2015-05-29 17:48:53 -07:00
Nick Bolton
b71c298163 Changed sleep time to 100ms for unit test (hack) #4651 2015-05-25 15:25:14 +01:00
Jerry (Xinyu Hou)
c22e327eed Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-21 11:37:42 -07:00
Xinyu Hou
49ac320f97 Refactored clipboard event into ClipboardEvent #4601 2015-05-20 19:09:54 +01:00
Nick Bolton
561204b2a7 Disabled threading on most IPC logging tests #4624
Threading was making it very hard to reliably run the IPC logging tests
(many timing issues), so I disabled threading for most of the tests.
2015-05-20 17:42:07 +01:00
Nick Bolton
89a977da66 Positive tests for IPC logging #4624
So far I had only tested what happens when the limits are exceeded.
These new tests are for when usage is within limits.
2015-05-20 16:16:22 +01:00
Nick Bolton
a710b2752b Reintroduced sleep for really fast computers #4624 2015-05-20 16:07:09 +01:00
Nick Bolton
9636af61d6 Solution attempt for timing bugs in write_bufferRateLimit
It's probably better to wait until the buffer is sent, rather than
waiting until its empty. To test the output it has to be sent, but
because of timing, it may be emptied at any point.
2015-05-20 15:51:07 +01:00
Jerry (Xinyu Hou)
2c74a7f5c1 Added stringToSizeType and its unittest #4601 2015-05-19 14:23:43 -07:00
Jerry (Xinyu Hou)
00ceda55dc Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-19 11:37:45 -07:00
Jerry (Xinyu Hou)
c674642181 Used StreamChunker for clipboard and file transfer #4601
Clipboard is not handled at this point
2015-05-19 09:30:35 -07:00
Nick Bolton
2cce60f672 Fixed sleep timing on IPC log rate limit unit tests #4624
Still a little hacky, but seems stable on my dev machine
2015-05-19 10:41:04 +01:00
Nick Bolton
62a501066f Disabled IPC logging tests for Mac and Linux #4624
This is a bit hacky, but IPC logging isn't used on Mac and Linux anyway,
and we're hopefully going to remove it.
2015-05-18 18:19:43 +01:00
Jerry (Xinyu Hou)
30f96b9fbb Renamed FileChunker to StreamChunker #4601 2015-05-18 10:17:22 -07:00
Nick Bolton
9f577ca4f3 Added rate limiting to IPC logging #4624 2015-05-18 18:06:58 +01:00
Nick Bolton
b27b236c07 Disabled failing IPC tests for Mac #4651 2015-05-18 16:39:54 +01:00
Jerry (Xinyu Hou)
44089d55e8 Send clipboard data in small chunks without using thread #4601 2015-05-15 22:28:43 +01:00
Nick Bolton
2e3769c7a6 Added failing test for IpcLogOutputter::write(...) #4651
- Changed behavior of close() to stop the buffer thread
- Fixed code style in IpcLogOutputter.cpp
- Changed MAX_SEND macro to enum
- Added Doxygen @name sections
2015-05-15 14:43:42 +01:00
Nick Bolton
134a15ea8d Modified IpcServer to be mockable #4651
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +01:00
Nigel Armstrong
d71304ee55 Modified header of every file COPYING to LICENSE
Modified to match the updated name of the license file
2015-05-06 22:12:44 -04:00
XinyuHou
1f0adb0d7b Fixed warning on Linux #4570 2015-05-06 12:11:12 +01:00
XinyuHou
c168721d2f Added deprecated args handling #4570 2015-05-06 11:57:42 +01:00
XinyuHou
cf6a6bcd48 Removed dead code #4527 2015-04-20 14:57:59 +01:00
XinyuHou
dd574c4f2c Added unit tests for string operations 2015-04-14 17:51:50 +01:00
XinyuHou
b4665b9cd5 Passed args into client and socket
Conflicts:
	src/lib/client/Client.cpp
	src/lib/client/Client.h
	src/lib/synergy/ClientApp.cpp
	src/test/integtests/net/NetworkTests.cpp
2015-04-14 17:51:31 +01:00
XinyuHou
c4c0fc8a08 added enable crypto argument to synergys/c #4313 2015-02-12 15:50:08 +00:00
XinyuHou
80343c41eb deleted old home brew crypto #4313 2015-02-11 11:12:54 +00:00
XinyuHou
d80aa7c938 resolve #4337 removed IStreamFilterFactory dead code 2015-01-27 11:33:06 +00:00
XinyuHou
f973d1498d dropped prefix C 2015-01-12 10:33:29 +00:00
Xinyu Hou
9fd11da578 Drop C prefix on Windows 2014-11-12 11:44:29 +00:00
Xinyu Hou
e5e0a3b653 Drop C prefix on Linux 2014-11-12 11:28:41 +00:00
Xinyu Hou
67377109f3 Moved Screen class into synergy namespace 2014-11-11 17:45:24 +00:00
Nick Bolton
41d6080028 changed company name in copyright notice 2014-11-11 13:52:03 +00:00
Nick Bolton
e8e156f0e2 dropped "c" prefix from class names 2014-11-11 13:51:47 +00:00
Xinyu Hou
e26ccfdce6 Parse arg refactoring #4124
Added unit testing
2014-10-22 16:52:08 +01:00
Nick Bolton
d9f90e319e changed synergy-foss.org to synergy-project.org 2014-05-08 07:33:35 +00:00
jerry
45c1cde698 fixed: events were added before event queue was ready, caused debug build assert failure.
removed sleep hack in favour of cond var wait.
2014-04-17 10:56:25 +00:00
Nick Bolton
0745d5884b Task #3969 - Merge String.cpp and StringUtil.cpp 2014-03-21 08:32:36 +00:00
Nick Bolton
e34e39a41c fixed XArchEvalUnix using wrong memeber, string_format using c++11 (which we're not ready for yet), code style (indentation and new lines) 2014-03-20 13:34:21 +00:00
Nick Bolton
41c1319134 removed unused test 2014-03-17 16:37:17 +00:00
Nick Bolton
1b5cdecc60 Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders
- reordered include order for winsock2.h (more robust)
- removed Windows.h include from synwinxt.h (not needed)
2014-03-17 14:34:13 +00:00
Nick Bolton
28a6b16875 fixed: Bug #3933 - Plus signs in the email address cause premium login to fail 2014-03-14 20:34:19 +00:00
Nick Bolton
d5b25069be fixed: extending std::runtime_error instead, as std::exception ctor is undefined. also fixed some mac warnings from inheriting runtime_error. 2014-03-14 20:33:18 +00:00
Nick Bolton
ab529fae41 combined windows and unix arch internet test, there can be only one! 2014-03-14 18:32:34 +00:00
Nick Bolton
ad1cdd150a temporarily diabled pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect - causing sigsegv 2014-02-28 16:30:20 +00:00
Nick Bolton
9b9a489efc fixed: tests not compiling on linux 2014-02-28 15:36:51 +00:00
Nick Bolton
f4bb72ce52 fixed:
- (weird) linker error on windows caused by using different include.
- IpcTests using private field which had a public accessor.
- some includes using wrong lib.
2014-02-28 15:04:49 +00:00
Nick Bolton
ad8905ccbf fixed: silenced gtest warning on osx106 2014-02-28 13:56:07 +00:00
Nick Bolton
4675f29a4c code style fixes:
- reordered includes to prevent accidental dependencies.
- moved arch specific files into their own folder (easier to include with cmake).
- renamed non-class files to reflect new code style (lower case with underscores).
- using full relative paths for includes (easier for understanding dependencies).
- using #pragma once instead of classic-style header guards.
2014-02-28 12:36:45 +00:00
Nick Bolton
8e74710dad code style: dropped C prefix 2014-02-27 17:45:17 +00:00
Nick Bolton
f11c660efb used glob instead of manually specifying files. cmake does not recommend this, but we always re-run cmake anyway after adding files since we use vs. 2014-02-26 17:46:02 +00:00
Nick Bolton
50a4f310c9 moved tools to ext - makes more sense, as it contains external libs, not tools 2014-02-26 16:52:54 +00:00
Nick Bolton
8d6a44d1b7 fixed: osx106 warnings 2014-02-26 15:53:28 +00:00
Nick Bolton
78ecdf4c6e fixed: win32 warnings. 2014-02-25 15:50:06 +00:00
Nick Bolton
c44971b43d fixed: warnings on mac os x 2014-02-25 15:03:43 +00:00
Nick Bolton
bdb4c47898 crypto++, gtest and gmock: ignore external lib warnings, not much we can do about them 2014-02-24 16:32:18 +00:00
Nick Bolton
77676d558e potential fix for unit/integ test false positives 2014-02-24 13:45:43 +00:00
Nick Bolton
ad35ccb2dc disabled all COSXKeyStateTests for osx10.6 2014-02-24 13:04:16 +00:00
Nick Bolton
2c2b136a36 disabled fakeAndPoll_shift for osx10.6 2014-02-24 12:13:51 +00:00
Nick Bolton
75d2c5abf1 fixed: nothing happens on osx 10.6 2014-02-17 19:38:26 +00:00
Nick Bolton
2d0d0010d7 fixed: integ tests - drag drop was disabled. 2014-02-07 12:33:26 +00:00
Nick Bolton
f149101d25 fixed: linux client crashes on file drop, even though drag and drop is disabled 2014-02-06 18:39:12 +00:00
Nick Bolton
59cd5ac554 fixed: code style (win) 2014-02-05 16:38:23 +00:00
Nick Bolton
aae76f612a fixed: code style 2014-02-05 16:38:03 +00:00
Nick Bolton
5ca1c17549 native unix http get for premium auth 2014-02-05 14:29:50 +00:00
Nick Bolton
dfe6c3889e fixed: last patch went awry 2014-02-04 19:46:45 +00:00
Nick Bolton
7f08036ff3 native windows http get for premium auth 2014-02-04 19:41:29 +00:00
Nick Bolton
ba78e4b67f disabled CIpcTests and NetworkTests on mac, which are failing intermittently. 2013-09-18 06:52:18 +00:00
Nick Bolton
af04f8b2ef reverted failure test for buildbot. 2013-08-30 18:51:01 +00:00
Nick Bolton
46a33b2d97 fixed: return value from last commit - should be 1, not 0. 2013-08-30 18:39:10 +00:00
Nick Bolton
fcf5940c67 fixed: missing return value from last commit. 2013-08-30 17:53:34 +00:00
Nick Bolton
7b217abe21 temp fail for unit tests to test buildbot failure email 2013-08-30 17:35:37 +00:00
Nick Bolton
d68e472d2f changed sleep hack from 1sec to .2sec to speed up integ tests on build machine (todo: get rid of this hack) 2013-08-30 17:33:35 +00:00
Nick Bolton
93b593f13e hacked osx integ key tests to stop COSXKeyStateTests.fakeAndPoll_charKeyAndModifier from failing 2013-08-30 17:05:52 +00:00
Nick Bolton
024f66e25e fixed unit tests, changed modes to cfb (other modes have been removed). 2013-08-30 15:20:36 +00:00
jerry
ce1b62db14 Feature to drag a file from Windows to Mac:
- On Mac client main thread is used for cocoa application in order to simulate drag.
- Send dragging file dir from Windows server to Mac client while dragging after switching screen.
- Dragging information sending is immature now (need to support multi files dragging in the future).
- Used Cocoa function to monitor dragg pasteboard.
- Changed Mac client to use another thread for event queue instead of the main thread.
- Change fileRecieveComplete to fileRecieveCompleted.
2013-08-30 14:38:43 +00:00
jerry
012fe6ddd8 - Log out dragging file's directory in Synergy (using COM shell extension)
- Change shell extension dll Main.cpp to synwinxt.cpp
2013-08-23 09:59:31 +00:00
jerry
63487e565d hacked network integ tests, so they only run once on mac. so that nightly build passes (connection failed after about 7 test repeats) 2013-08-06 16:21:22 +00:00
jerry
dab838ed14 - renamed synrgyhk.dll to synwinhk.dll and moved lib code to separate folder.
- removed game device support (fallen into significant disrepair).
2013-08-02 13:21:06 +00:00
Nick Bolton
811cfd146d Patch by Jerry:
- Measure file transfer speed
- Increased quit timeout in NetworkTests
- Some code duplication, to be fixed in future patch
2013-07-26 12:44:14 +00:00
Nick Bolton
394ece004a Patch by Jerry:
- Fixed line endings
- Integ test for file transfer
- Fixed crashed problem when log info is larger than 2048 bytes
- Fixed compile error caused by std exception (by Feng ye)
- Fixed include path on Mac and linux (by Feng ye)
2013-07-24 16:41:12 +00:00
Nick Bolton
c368013f13 Patch by Jerry for issue 46:
- Unit test for sending file data from server to client.
- Removed singleton pattern from CSocketMultiplexer for easier unit testing.
- Incremented protocol version from 1.4 to 1.5 (new file chunk message).
- Storing pointer to CConfig instead of copying in CServer (so we can mock it).
- Created a common event queue for testing (timeout, quit event, etc).
- Fixed code style.
2013-07-16 19:02:30 +00:00
Nick Bolton
18a3db6843 patch by jerry: fixed new event queue on Mac and Linu 2013-06-29 22:02:04 +00:00
Nick Bolton
608074c041 - made unit testing easier by (mostly) removing the event queue singleton.
- fixed code style in many places (mostly indentation).
2013-06-29 14:17:49 +00:00
Nick Bolton
65b8f480e8 fixed: code style in unit test (missing g_) 2013-05-01 15:57:46 +00:00