3 files changed, 128 insertions, 0 deletions
diff --git a/Swiften/EventLoop/UnitTest/EventLoopTest.cpp b/Swiften/EventLoop/UnitTest/EventLoopTest.cpp
new file mode 100644
index 0000000..c64d1ad
--- /dev/null
+++ b/Swiften/EventLoop/UnitTest/EventLoopTest.cpp
@@ -0,0 +1,63 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <boost/thread.hpp>
+#include <boost/bind.hpp>
+
+#include "Swiften/EventLoop/SimpleEventLoop.h"
+#include "Swiften/Base/sleep.h"
+
+using namespace Swift;
+
+class EventLoopTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(EventLoopTest);
+		CPPUNIT_TEST(testPost);
+		CPPUNIT_TEST(testRemove);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		EventLoopTest() {}
+
+		void setUp() {
+			events_.clear();
+		}
+
+		void testPost() {
+			SimpleEventLoop testling;
+
+			testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 1), 0);
+			testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 2), 0);
+			testling.stop();
+			testling.run();
+
+			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(events_.size()));
+			CPPUNIT_ASSERT_EQUAL(1, events_[0]);
+			CPPUNIT_ASSERT_EQUAL(2, events_[1]);
+		}
+
+		void testRemove() {
+			SimpleEventLoop testling;
+
+			testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 1), &testling);
+			testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 2), this);
+			testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 3), &testling);
+			testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 4), this);
+			testling.removeEventsFromOwner(this);
+			testling.stop();
+			testling.run();
+
+			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(events_.size()));
+			CPPUNIT_ASSERT_EQUAL(1, events_[0]);
+			CPPUNIT_ASSERT_EQUAL(3, events_[1]);
+		}
+	
+	private:
+		void logEvent(int i) {
+			events_.push_back(i);
+		}
+
+	private:
+		std::vector<int> events_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(EventLoopTest);
diff --git a/Swiften/EventLoop/UnitTest/Makefile.inc b/Swiften/EventLoop/UnitTest/Makefile.inc
new file mode 100644
index 0000000..5eec2da
--- /dev/null
+++ b/Swiften/EventLoop/UnitTest/Makefile.inc
@@ -0,0 +1,3 @@
+UNITTEST_SOURCES += \
+  Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp \
+  Swiften/EventLoop/UnitTest/EventLoopTest.cpp
diff --git a/Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp b/Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp
new file mode 100644
index 0000000..a39aa9a
--- /dev/null
+++ b/Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp
@@ -0,0 +1,62 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <boost/thread.hpp>
+#include <boost/bind.hpp>
+
+#include "Swiften/EventLoop/SimpleEventLoop.h"
+#include "Swiften/Base/sleep.h"
+
+using namespace Swift;
+
+class SimpleEventLoopTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(SimpleEventLoopTest);
+		CPPUNIT_TEST(testRun);
+		CPPUNIT_TEST(testPostFromMainThread);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		SimpleEventLoopTest() {}
+
+		void setUp() {
+			counter_ = 0;
+		}
+
+		void testRun() {
+			SimpleEventLoop testling;
+			boost::thread thread(boost::bind(&SimpleEventLoopTest::runIncrementingThread, this, &testling));
+			testling.run();
+
+			CPPUNIT_ASSERT_EQUAL(10, counter_);
+		}
+
+		void testPostFromMainThread() {
+			SimpleEventLoop testling;
+			testling.postEvent(boost::bind(&SimpleEventLoopTest::incrementCounterAndStop, this, &testling), 0);
+			testling.run();
+
+			CPPUNIT_ASSERT_EQUAL(1, counter_);
+		}
+
+	private:
+		void runIncrementingThread(SimpleEventLoop* loop) {
+			for (unsigned int i = 0; i < 10; ++i) {
+        Swift::sleep(1);
+				loop->postEvent(boost::bind(&SimpleEventLoopTest::incrementCounter, this), 0);
+			}
+			loop->stop();
+		}
+
+		void incrementCounter() {
+			counter_++;
+		}
+
+		void incrementCounterAndStop(SimpleEventLoop* loop) {
+			counter_++;
+			loop->stop();
+		}
+
+		int counter_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SimpleEventLoopTest);