moved integ and unit tests into test dir

src/test/integtests/CMakeLists.txt

@@ -0,0 +1,65 @@
+# synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(src
+	Main.cpp
+)
+
+if (WIN32)
+	
+	# windows
+	list(APPEND src
+		platform/CMSWindowsClipboardTests.cpp
+	)
+
+elseif (APPLE)
+
+	# mac
+	list(APPEND src
+		platform/COSXClipboardTests.cpp
+	)
+
+elseif (UNIX)
+
+	# unix/linux
+	list(APPEND src
+		platform/CXWindowsClipboardTests.cpp
+	)
+
+endif()
+
+set(inc
+	../lib/arch
+	../lib/base
+	../lib/client
+	../lib/common
+	../lib/io
+	../lib/mt
+	../lib/net
+	../lib/platform
+	../lib/synergy
+	../../tools/gtest/include
+)
+
+if (UNIX)
+	list(APPEND inc
+		../..
+	)
+endif()
+
+include_directories(${inc})
+add_executable(integtests ${src})
+target_link_libraries(integtests
+	arch base client common io mt net platform server synergy gtest ${libs})

src/test/integtests/Main.cpp

@@ -0,0 +1,41 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <iostream>
+#include <gtest/gtest.h>
+#include "CArch.h"
+
+#if SYSAPI_WIN32
+#include "CArchMiscWindows.h"
+#endif
+
+int
+main(int argc, char **argv)
+{
+	std::cout << "Synergy integration tests\n";
+
+#if SYSAPI_WIN32
+	// record window instance for tray icon, etc
+	CArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
+#endif
+
+	CArch arch;
+
+	testing::InitGoogleTest(&argc, argv);
+
+	return RUN_ALL_TESTS();
+}

src/test/integtests/platform/CMSWindowsClipboardTests.cpp

@@ -0,0 +1,183 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtest/gtest.h>
+#include "CMSWindowsClipboard.h"
+
+TEST(CMSWindowsClipboardTests, emptyUnowned_openCalled_returnsTrue)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+
+	bool actual = clipboard.emptyUnowned();
+
+	EXPECT_EQ(true, actual);
+}
+
+TEST(CMSWindowsClipboardTests, empty_openCalled_returnsTrue)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+
+	bool actual = clipboard.empty();
+
+	EXPECT_EQ(true, actual);
+}
+
+TEST(CMSWindowsClipboardTests, empty_singleFormat_hasReturnsFalse)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+	clipboard.add(CMSWindowsClipboard::kText, "synergy rocks!");
+
+	clipboard.empty();
+
+	bool actual = clipboard.has(CMSWindowsClipboard::kText);
+	EXPECT_EQ(false, actual);
+}
+
+TEST(CMSWindowsClipboardTests, add_newValue_valueWasStored)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("synergy rocks!", actual);
+}
+
+TEST(CMSWindowsClipboardTests, add_replaceValue_valueWasReplaced)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
+
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("maxivista sucks", actual);
+}
+
+TEST(CMSWindowsClipboardTests, open_timeIsZero_returnsTrue)
+{
+	CMSWindowsClipboard clipboard(NULL);
+
+	bool actual = clipboard.open(0);
+
+	EXPECT_EQ(true, actual);
+}
+
+TEST(CMSWindowsClipboardTests, open_timeIsOne_returnsTrue)
+{
+	CMSWindowsClipboard clipboard(NULL);
+
+	bool actual = clipboard.open(1);
+
+	EXPECT_EQ(true, actual);
+}
+
+TEST(CMSWindowsClipboardTests, close_isOpen_noErrors)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+
+	clipboard.close();
+
+	// can't assert anything
+}
+
+// looks like this test may fail intermittently:
+// * http://buildbot.synergy-foss.org:8000/builders/trunk-win32/builds/246/steps/shell_3/logs/stdio
+TEST(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.
+	EXPECT_EQ(1, actual);
+}
+
+TEST(CMSWindowsClipboardTests, getTime_openAndEmpty_returnsOne)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(1);
+	clipboard.empty();
+
+	CMSWindowsClipboard::Time actual = clipboard.getTime();
+
+	EXPECT_EQ(1, actual);
+}
+
+TEST(CMSWindowsClipboardTests, has_withFormatAdded_returnsTrue)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+	clipboard.empty();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+
+	bool actual = clipboard.has(IClipboard::kText);
+
+	EXPECT_EQ(true, actual);
+}
+
+TEST(CMSWindowsClipboardTests, has_withNoFormats_returnsFalse)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+	clipboard.empty();
+
+	bool actual = clipboard.has(IClipboard::kText);
+
+	EXPECT_EQ(false, actual);
+}
+
+TEST(CMSWindowsClipboardTests, get_withNoFormats_returnsEmpty)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+	clipboard.empty();
+
+	CString actual = clipboard.get(IClipboard::kText);
+
+	EXPECT_EQ("", actual);
+}
+
+TEST(CMSWindowsClipboardTests, get_withFormatAdded_returnsExpected)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+	clipboard.empty();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+
+	CString actual = clipboard.get(IClipboard::kText);
+
+	EXPECT_EQ("synergy rocks!", actual);
+}
+
+TEST(CMSWindowsClipboardTests, isOwnedBySynergy_defaultState_noError)
+{
+	CMSWindowsClipboard clipboard(NULL);
+	clipboard.open(0);
+
+	bool actual = clipboard.isOwnedBySynergy();
+
+	EXPECT_EQ(true, actual);
+}

src/test/integtests/platform/COSXClipboardTests.cpp

@@ -0,0 +1,162 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <iostream>
+#include <gtest/gtest.h>
+#include "COSXClipboard.h"
+
+TEST(COSXClipboardTests, empty_openCalled_returnsTrue)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	
+	bool actual = clipboard.empty();
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST(COSXClipboardTests, empty_singleFormat_hasReturnsFalse)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	clipboard.add(COSXClipboard::kText, "synergy rocks!");
+	
+	clipboard.empty();
+	
+	bool actual = clipboard.has(COSXClipboard::kText);
+	EXPECT_EQ(false, actual);
+}
+
+TEST(COSXClipboardTests, add_newValue_valueWasStored)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("synergy rocks!", actual);
+}
+
+TEST(COSXClipboardTests, add_replaceValue_valueWasReplaced)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("maxivista sucks", actual);
+}
+
+TEST(COSXClipboardTests, open_timeIsZero_returnsTrue)
+{
+	COSXClipboard clipboard;
+	
+	bool actual = clipboard.open(0);
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST(COSXClipboardTests, open_timeIsOne_returnsTrue)
+{
+	COSXClipboard clipboard;
+	
+	bool actual = clipboard.open(1);
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST(COSXClipboardTests, close_isOpen_noErrors)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	
+	clipboard.close();
+	
+	// can't assert anything
+}
+
+TEST(COSXClipboardTests, getTime_openWithNoEmpty_returnsOne)
+{
+	COSXClipboard clipboard;
+	clipboard.open(1);
+	
+	COSXClipboard::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((UInt32)1, actual);
+}
+
+TEST(COSXClipboardTests, getTime_openAndEmpty_returnsOne)
+{
+	COSXClipboard clipboard;
+	clipboard.open(1);
+	clipboard.empty();
+	
+	COSXClipboard::Time actual = clipboard.getTime();
+	
+	EXPECT_EQ((UInt32)1, actual);
+}
+
+TEST(COSXClipboardTests, has_withFormatAdded_returnsTrue)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	clipboard.empty();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	bool actual = clipboard.has(IClipboard::kText);
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST(COSXClipboardTests, has_withNoFormats_returnsFalse)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	clipboard.empty();
+	
+	bool actual = clipboard.has(IClipboard::kText);
+	
+	EXPECT_EQ(false, actual);
+}
+
+TEST(COSXClipboardTests, get_withNoFormats_returnsEmpty)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	clipboard.empty();
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	
+	EXPECT_EQ("", actual);
+}
+
+TEST(COSXClipboardTests, get_withFormatAdded_returnsExpected)
+{
+	COSXClipboard clipboard;
+	clipboard.open(0);
+	clipboard.empty();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	
+	EXPECT_EQ("synergy rocks!", actual);
+}

src/test/integtests/platform/CXWindowsClipboardTests.cpp

@@ -0,0 +1,153 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <iostream>
+#include <gtest/gtest.h>
+#include "CXWindowsClipboard.h"
+
+class CXWindowsClipboardTests : public ::testing::Test
+{
+protected:
+	virtual void
+	SetUp()
+	{
+		m_display = XOpenDisplay(NULL);
+		int screen = DefaultScreen(m_display);
+		Window root = XRootWindow(m_display, screen);
+		
+		XSetWindowAttributes attr;
+		attr.do_not_propagate_mask = 0;
+		attr.override_redirect = True;
+		attr.cursor = Cursor();
+		
+		m_window = XCreateWindow(
+			m_display, root, 0, 0, 1, 1, 0, 0,
+			InputOnly, CopyFromParent,
+			CWDontPropagate | CWEventMask |
+			CWOverrideRedirect | CWCursor,
+			&attr);
+	}
+
+	virtual void
+	TearDown()
+	{
+		XDestroyWindow(m_display, m_window);
+		XCloseDisplay(m_display);
+	}
+
+	CXWindowsClipboard&
+	createClipboard()
+	{
+		CXWindowsClipboard* clipboard;
+		clipboard = new CXWindowsClipboard(m_display, m_window, 0);
+		clipboard->open(0); // needed to empty the clipboard
+		clipboard->empty(); // needed to own the clipboard
+		return *clipboard;
+	}
+
+	Display* m_display;
+	Window m_window;
+};
+
+TEST_F(CXWindowsClipboardTests, empty_openCalled_returnsTrue)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	bool actual = clipboard.empty();
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, empty_singleFormat_hasReturnsFalse)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	clipboard.add(CXWindowsClipboard::kText, "synergy rocks!");
+	
+	clipboard.empty();
+	
+	bool actual = clipboard.has(CXWindowsClipboard::kText);
+	EXPECT_EQ(false, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, add_newValue_valueWasStored)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("synergy rocks!", actual);
+}
+
+TEST_F(CXWindowsClipboardTests, add_replaceValue_valueWasReplaced)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("maxivista sucks", actual);
+}
+
+TEST_F(CXWindowsClipboardTests, close_isOpen_noErrors)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	// clipboard opened in createClipboard()
+	clipboard.close();
+	
+	// can't assert anything
+}
+
+TEST_F(CXWindowsClipboardTests, has_withFormatAdded_returnsTrue)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	bool actual = clipboard.has(IClipboard::kText);
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, has_withNoFormats_returnsFalse)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	bool actual = clipboard.has(IClipboard::kText);
+	
+	EXPECT_EQ(false, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, get_withNoFormats_returnsEmpty)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	
+	EXPECT_EQ("", actual);
+}
+
+TEST_F(CXWindowsClipboardTests, get_withFormatAdded_returnsExpected)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	
+	EXPECT_EQ("synergy rocks!", actual);
+}