X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_session2.cpp;h=84b5fe580bd3dfbafc552893691c6244aa8327ed;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=4f4623c0878e9519f847e2f923a8fa5e774f8c1e;hpb=4d5febdded4cf09681bf9491789d1c7bec9cb3a6;p=metaproxy-moved-to-github.git

diff --git a/src/test_session2.cpp b/src/test_session2.cpp
index 4f4623c..84b5fe5 100644
--- a/src/test_session2.cpp
+++ b/src/test_session2.cpp
@@ -1,3 +1,25 @@
+/* $Id: test_session2.cpp,v 1.10 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy 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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
+
+#include "config.hpp"
 #include "session.hpp"
 
 #include <iostream>
@@ -10,19 +32,21 @@
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
+namespace mp = metaproxy_1;
 
 boost::mutex io_mutex;
 
 class Worker 
 {
     public:
-        Worker(yp2::Session *session, int nr = 0) 
-            : m_session(session), m_nr(nr){};
+        Worker(int nr = 0) 
+            :  m_nr(nr){};
         
         void operator() (void) {
             for (int i=0; i < 100; ++i)
             {
-                m_id = m_session->id();   
+                mp::Session session;
+                m_id = session.id();   
                 //print();
             }
         }
@@ -35,31 +59,32 @@ class Worker
         }
         
     private: 
-        yp2::Session *m_session;
         int m_nr;
         int m_id;
 };
 
 
 
-BOOST_AUTO_TEST_CASE( testsession2 ) 
+BOOST_AUTO_UNIT_TEST( testsession2 ) 
 {
 
     // test session 
     try {
-        yp2::Session session;
 
-        const int num_threads = 10;
+        const int num_threads = 100;
         boost::thread_group thrds;
         
+
         for (int i=0; i < num_threads; ++i)
         {
-            Worker w(&session, i);
+            // Notice that each Worker has it's own session object!
+            Worker w(i);
             thrds.add_thread(new boost::thread(w));
         }
         thrds.join_all();
 
-        BOOST_CHECK (session.id() == 1001);
+        mp::Session session;
+        BOOST_CHECK (session.id() == 10001);
         
     }
     catch (std::exception &e) {
@@ -75,6 +100,7 @@ BOOST_AUTO_TEST_CASE( testsession2 )
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */