Index: /tests/SystemQueue-tests.cc
===================================================================
--- /tests/SystemQueue-tests.cc	(revision 12748)
+++ /tests/SystemQueue-tests.cc	(revision 12749)
@@ -2,7 +2,9 @@
 #include "ariba/utility/system/SystemQueue.h"
 
+#include <ostream>
+
 using namespace ::testing;
 using namespace ariba::utility;
-
+using namespace std;
 
 /**
@@ -12,4 +14,6 @@
 {
     SystemQueue& sysq = SystemQueue::instance();
+    
+//     cout << &sysq << endl;
     
     EXPECT_FALSE( sysq.isRunning() );
@@ -30,6 +34,79 @@
 
 //     cout << &sysq << endl;
-    ASSERT_TRUE( &sysq == &sysq2 );
+    
+    EXPECT_TRUE( &sysq == &sysq2 );
 }
 
 
+/**
+ *  Start and stop the SystemQueue
+ */
+TEST(SystemQueue, StartStop)
+{
+    SystemQueue& sysq = SystemQueue::instance();
+
+    EXPECT_FALSE( sysq.isRunning() );
+    
+    // start
+    sysq.run();
+    
+    EXPECT_TRUE( sysq.isRunning() );
+    
+    // stop
+    sysq.cancel();
+    
+    EXPECT_FALSE( sysq.isRunning() );
+}
+
+
+/**
+ *  Test fixture
+ * 
+ *  class that can be called by the SystemQueue
+ */
+// To use a test fixture, derive a class from testing::Test.
+class SystemQueueTest : 
+        public testing::Test
+{
+public:
+
+    SystemQueueTest() :
+        checkmark(false)
+    {
+    }
+        
+    void Check()
+    {
+        checkmark = true;
+//         cout << "Hallo Mario ^^" << endl;
+    }
+
+    bool checkmark;
+};
+
+TEST_F(SystemQueueTest, ScheduleCall)
+{
+    SystemQueue& sysq = SystemQueue::instance();
+    checkmark = false;  // just to be sure..
+    
+    // start
+    sysq.run();
+    
+    // scheduleCall
+    sysq.scheduleCall(
+        boost::bind(&SystemQueueTest::Check, this)
+    );
+
+    // FIXME: yes, we have to wait a while here...
+    //   maybe write a function (in the fixture): wait_for_remaining_events(int max_millisecs)
+    
+    // stop
+    sysq.cancel();
+    
+    EXPECT_TRUE( checkmark );
+    
+    /* NOTE: If this fails, maybe we'll have to wait a bit..?
+     *   There should be a possibility to cancel the SystemQueue as soon as it's empty..
+     */
+}
+