テストコードとスタブを修正

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel@9224 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/l7vsd/unit_tests/session_thread_control_test/stc_test.cpp b/l7vsd/unit_tests/session_thread_control_test/stc_test.cpp
index ddbc5ec..7cf4133 100644 (file)
--- a/l7vsd/unit_tests/session_thread_control_test/stc_test.cpp
+++ b/l7vsd/unit_tests/session_thread_control_test/stc_test.cpp
@@ -25,8 +25,9 @@ class    test_thread{
     boost::thread                acc_thread;
     bool                        stop_flag;
     boost::mutex                flag_mutex;
+    unsigned int                call_cnt;
     void    run(){
-        for( unsigned int i = 0; i < UINT_MAX; ++i ){
+        for( unsigned int i = 0; i < call_cnt; ++i ){
             {
                 boost::mutex::scoped_lock( flag_mutex );
                 if( stop_flag )break;
@@ -36,7 +37,7 @@ class    test_thread{
         }
     }
 public:
-    test_thread(){}
+    test_thread(unsigned int set_call_cnt = UINT_MAX){ call_cnt = set_call_cnt; }
     ~test_thread(){ stop(); acc_thread.join(); }
     boost::thread::id    get_id(){ return acc_thread.get_id(); }
     void    start( boost::function<void()>    in_func ){
@@ -202,7 +203,6 @@ void    stc_method_test2(){
     stc_type        stc( new l7vs::session_thread_control( sess,
                          vsnic_cpumask, rsnic_cpumask, 0 ) );
 
-
 // unit_test[12]  上りスレッドと下りスレッドを開始し、順番に停止する(sessionループは自然に終了)
     std::cout << counter++ << std::endl;
     BOOST_MESSAGE( "----12" );
@@ -308,23 +308,9 @@ std::cout << "join 1" << std::endl;
     std::cout << counter++ << std::endl;
     BOOST_MESSAGE( "-----21" );
     std::cout << "downthread id : " << stc->get_downthread_id() << std::endl;
-
-// unit_test[22]  joinを何回も連続で呼ぶ
-    std::cout << counter++ << std::endl;
-    BOOST_MESSAGE( "-----22" );
-    stc->join();
-    stc->join();
-    stc->join();
-    stc->join();
-    stc->join();
-    stc->join();
-    stc->join();
-    stc->join();
-    stc->join();
-    stc->join();
-
 }
 
+
 //test case3
 void    stc_method_test3(){
 // unit_test[23]  joinを呼ばずにオブジェクト廃棄する
@@ -490,7 +476,7 @@ void    stc_method_test6(){
     stc_type        stc( new l7vs::session_thread_control( sess,
                          vsnic_cpumask, rsnic_cpumask, 0 ) );
 
-    test_thread    thread1;
+    test_thread    thread1(1);
 
 // unit_test[29]  上りスレッド停止と同時にjoinを呼ぶ
     std::cout << counter++ << std::endl;
@@ -538,7 +524,7 @@ void    stc_method_test7(){
     stc_type        stc( new l7vs::session_thread_control( sess,
                          vsnic_cpumask, rsnic_cpumask, 0 ) );
 
-    test_thread    thread1;
+    test_thread    thread1(1);
 
 // unit_test[30]  下りスレッド停止と同時にjoinを呼ぶ
     std::cout << counter++ << std::endl;
@@ -584,7 +570,7 @@ void    stc_method_test8(){
     stc_type        stc( new l7vs::session_thread_control( sess,
                          vsnic_cpumask, rsnic_cpumask, 0 ) );
 
-    test_thread    thread1;
+    test_thread    thread1(1);
 
 // unit_test[31]  上下スレッド停止と同時にjoinを呼ぶ
     std::cout << counter++ << std::endl;
@@ -738,15 +724,15 @@ test_suite*    init_unit_test_suite( int argc, char* argv[] ){
     test_suite* ts = BOOST_TEST_SUITE( "stc_test" );
 
     // add test case to test suite
-//    ts->add( BOOST_TEST_CASE( &stc_method_test1 ) ); 
+    ts->add( BOOST_TEST_CASE( &stc_method_test1 ) ); 
     ts->add( BOOST_TEST_CASE( &stc_method_test2 ) );
-//    ts->add( BOOST_TEST_CASE( &stc_method_test3 ) );
-//    ts->add( BOOST_TEST_CASE( &stc_method_test4 ) );
-//    ts->add( BOOST_TEST_CASE( &stc_method_test5 ) );
-//    ts->add( BOOST_TEST_CASE( &stc_method_test6 ) );
-//    ts->add( BOOST_TEST_CASE( &stc_method_test7 ) );
-//    ts->add( BOOST_TEST_CASE( &stc_method_test8 ) );
-//    ts->add( BOOST_TEST_CASE( &stc_method_test9 ) );
+    ts->add( BOOST_TEST_CASE( &stc_method_test3 ) );
+    ts->add( BOOST_TEST_CASE( &stc_method_test4 ) );
+    ts->add( BOOST_TEST_CASE( &stc_method_test5 ) );
+    ts->add( BOOST_TEST_CASE( &stc_method_test6 ) );
+    ts->add( BOOST_TEST_CASE( &stc_method_test7 ) );
+    ts->add( BOOST_TEST_CASE( &stc_method_test8 ) );
+    ts->add( BOOST_TEST_CASE( &stc_method_test9 ) );
 
     framework::master_test_suite().add( ts );
 

diff --git a/l7vsd/unit_tests/session_thread_control_test/stub.cpp b/l7vsd/unit_tests/session_thread_control_test/stub.cpp
index 805b8f8..1310dbf 100644 (file)
--- a/l7vsd/unit_tests/session_thread_control_test/stub.cpp
+++ b/l7vsd/unit_tests/session_thread_control_test/stub.cpp
@@ -3,7 +3,7 @@
 #include "l7vsd.h"
 #include "data_buff_base.h"
 #include "tcp_thread_message.h"
-#include "tcp_thread_message_que.h"
+//#include "tcp_thread_message_que.h"
 #include "tcp_data.h"
 #include "tcp_socket.h"
 #include "tcp_session.h"
@@ -54,6 +54,7 @@ void    l7vs::schedule_module_control::unload_module( schedule_module_base* modu
 
 
 // parameter stub
+
 l7vs::Parameter::Parameter(){}
 
 l7vs::Parameter::~Parameter(){}
@@ -62,7 +63,8 @@ bool    l7vs::Parameter::read_file( const PARAMETER_COMPONENT_TAG in,const std::
 
 int        l7vs::Parameter::get_int(    const PARAMETER_COMPONENT_TAG in_tag,
                                     const std::string& in_str,
-                                    error_code& err ){
+                                    error_code& err,
+                                       const std::string& file_name){
     int    retval = 0;
     if( debugg_flug_struct::getInstance().param_exist_flag() ){
         retval = SESSION_POOL_NUM_PARAM;
@@ -80,7 +82,7 @@ bool l7vs::Parameter::init( const PARAMETER_COMPONENT_TAG in_tag, const std::str
 
 std::string        l7vs::Parameter::get_string(const PARAMETER_COMPONENT_TAG in_tag,
                                             const std::string& in_str,
-                                            error_code& err){
+                                            error_code& err,const std::string& file_name){
     return "";
 }
 
@@ -88,7 +90,7 @@ std::string        l7vs::Parameter::get_string(const PARAMETER_COMPONENT_TAG in_
 void l7vs::Parameter::get_multistring(const PARAMETER_COMPONENT_TAG,
                          const std::string&,
                          std::vector<std::string>&,
-                         error_code& ){
+                         error_code&,const std::string& file_name ){
 
 
 }
@@ -220,14 +222,14 @@ bool    l7vs::tcp_realserver_connect_socket_list::empty(){
 //l7vs::tcp_thread_message_que::tcp_thread_message_que(){}
 //l7vs::tcp_thread_message_que::~tcp_thread_message_que(){}
 
-void    l7vs::tcp_thread_message_que::push(tcp_thread_message_ptr message){}
-l7vs::tcp_thread_message_que::tcp_thread_message_ptr    l7vs::tcp_thread_message_que::front(){
-    return message_que.front();
-}
-bool    l7vs::tcp_thread_message_que::empty(){
-    return true;
-}
-void     l7vs::tcp_thread_message_que::clear(){}
+//void    l7vs::tcp_thread_message_que::push(tcp_thread_message_ptr message){}
+//l7vs::tcp_thread_message_que::tcp_thread_message_ptr    l7vs::tcp_thread_message_que::front(){
+//    return message_que.front();
+//}
+//bool    l7vs::tcp_thread_message_que::empty(){
+//    return true;
+//}
+//void     l7vs::tcp_thread_message_que::clear(){}
 
 /*
 l7vs::tcp_data::tcp_data(){}
@@ -319,6 +321,16 @@ bool    l7vs::tcp_session::is_thread_wait(void){
     return true;
 }
 
+//! handshake timer handler
+void l7vs::tcp_session::handle_ssl_handshake_timer(const boost::system::error_code& error){};
+//! reset ssl object for reuse
+bool l7vs::tcp_session::ssl_clear_keep_cache(SSL *clear_ssl){
+    return true;
+}
+std::string l7vs::tcp_session::endpoint_to_string( const boost::asio::ip::tcp::endpoint& target_endpoint){
+    return "";
+}; 
+
 void    l7vs::tcp_session::set_virtual_service_message(const TCP_VIRTUAL_SERVICE_MESSAGE_TAG  message){
     switch( message ){
     case SORRY_STATE_ENABLE: