X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_session2.cpp;h=0fd49edfa9b4397fc03c5616c29165cd612a4d4b;hb=c1d953eee6c00432493bc364da6284704ccd9cc2;hp=6e237ad1810db7e6137b68dc84caa8f47c8e415b;hpb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;p=metaproxy-moved-to-github.git

diff --git a/src/test_session2.cpp b/src/test_session2.cpp
index 6e237ad..0fd49ed 100644
--- a/src/test_session2.cpp
+++ b/src/test_session2.cpp
@@ -1,10 +1,23 @@
-/* $Id: test_session2.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2011 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
+*/
 
-%LICENSE%
- */
 #include "config.hpp"
-#include "session.hpp"
+#include <metaproxy/session.hpp>
 
 #include <iostream>
 #include <list>
@@ -13,9 +26,11 @@
 #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;
+namespace mp = metaproxy_1;
 
 boost::mutex io_mutex;
 
@@ -23,12 +38,12 @@ class Worker
 {
     public:
         Worker(int nr = 0) 
-            :  m_nr(nr){};
+            :  m_nr(nr), m_id(0) {};
         
         void operator() (void) {
             for (int i=0; i < 100; ++i)
             {
-                yp2::Session session;
+                mp::Session session;
                 m_id = session.id();   
                 //print();
             }
@@ -48,7 +63,7 @@ class Worker
 
 
 
-BOOST_AUTO_UNIT_TEST( testsession2 ) 
+BOOST_AUTO_TEST_CASE( testsession2 ) 
 {
 
     // test session 
@@ -66,7 +81,7 @@ BOOST_AUTO_UNIT_TEST( testsession2 )
         }
         thrds.join_all();
 
-        yp2::Session session;
+        mp::Session session;
         BOOST_CHECK (session.id() == 10001);
         
     }
@@ -82,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
  */
+