X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_session2.cpp;h=0d1aa41da1fe8753f5da86c5010e31036c3014c3;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=4d18258b694bf8271b9477b1ad2dcf4442e35705;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/test_session2.cpp b/src/test_session2.cpp
index 4d18258..0d1aa41 100644
--- a/src/test_session2.cpp
+++ b/src/test_session2.cpp
@@ -1,10 +1,23 @@
-/* $Id: test_session2.cpp,v 1.8 2006-06-10 14:29:13 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
+
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
-   See the LICENSE file for details
- */
 #include "config.hpp"
-#include "session.hpp"
+#include <metaproxy/session.hpp>
 
 #include <iostream>
 #include <list>
@@ -13,6 +26,7 @@
 #include <boost/thread/thread.hpp>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -20,17 +34,17 @@ namespace mp = metaproxy_1;
 
 boost::mutex io_mutex;
 
-class Worker 
+class Worker
 {
     public:
-        Worker(int nr = 0) 
-            :  m_nr(nr){};
-        
+        Worker(int nr = 0)
+            :  m_nr(nr), m_id(0) {};
+
         void operator() (void) {
             for (int i=0; i < 100; ++i)
             {
                 mp::Session session;
-                m_id = session.id();   
+                m_id = session.id();
                 //print();
             }
         }
@@ -38,26 +52,26 @@ class Worker
         void print()
         {
             boost::mutex::scoped_lock scoped_lock(io_mutex);
-            std::cout << "Worker " << m_nr 
+            std::cout << "Worker " << m_nr
                       << " session.id() " << m_id << std::endl;
         }
-        
-    private: 
+
+    private:
         int m_nr;
         int m_id;
 };
 
 
 
-BOOST_AUTO_UNIT_TEST( testsession2 ) 
+BOOST_AUTO_TEST_CASE( testsession2 )
 {
 
-    // test session 
+    // test session
     try {
 
         const int num_threads = 100;
         boost::thread_group thrds;
-        
+
 
         for (int i=0; i < num_threads; ++i)
         {
@@ -69,7 +83,7 @@ BOOST_AUTO_UNIT_TEST( testsession2 )
 
         mp::Session session;
         BOOST_CHECK (session.id() == 10001);
-        
+
     }
     catch (std::exception &e) {
         std::cout << e.what() << "\n";
@@ -83,8 +97,9 @@ BOOST_AUTO_UNIT_TEST( testsession2 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+