テストコード修正

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

diff --git a/l7vsd/unit_tests/session_test/tcp_session/dummyclass.h b/l7vsd/unit_tests/session_test/tcp_session/dummyclass.h
index 6f2fb54..d7436c9 100644 (file)
--- a/l7vsd/unit_tests/session_test/tcp_session/dummyclass.h
+++ b/l7vsd/unit_tests/session_test/tcp_session/dummyclass.h
@@ -883,9 +883,11 @@ namespace l7vs{
         //! @return         true is handshaked
         //! @return         false is handshake failure
         bool handshake(boost::system::error_code& ec){
+                handshake_call_check = true;
                 ec = handshake_set_ec;
                return handshake_res;
         }
+        bool handshake_call_check;
         bool handshake_res;
         boost::system::error_code handshake_set_ec;
 

diff --git a/l7vsd/unit_tests/session_test/tcp_session/tcp_session_test.cpp b/l7vsd/unit_tests/session_test/tcp_session/tcp_session_test.cpp
index 5b54044..b4089fb 100644 (file)
--- a/l7vsd/unit_tests/session_test/tcp_session/tcp_session_test.cpp
+++ b/l7vsd/unit_tests/session_test/tcp_session/tcp_session_test.cpp
@@ -12915,6 +12915,14 @@ class up_thread_client_accept_test_class : public l7vs::tcp_session{
             return ssl_flag;
         };
 
+        bool& get_ssl_handshake_timer_flag(){
+            return ssl_handshake_timer_flag;
+        };
+
+        int& get_ssl_handshake_time_out(){
+            return ssl_handshake_time_out;
+        };
+
         bool& get_ssl_handshake_time_out_flag(){
             return ssl_handshake_time_out_flag;
         };
@@ -12925,6 +12933,13 @@ class up_thread_client_accept_test_class : public l7vs::tcp_session{
         bool next_func_chk_accept(){
             return up_thread_next_call_function.first == UP_FUNC_CLIENT_ACCEPT;
         };
+        bool next_func_chk_client_disconnect(){
+            return up_thread_next_call_function.first == UP_FUNC_CLIENT_DISCONNECT;
+        };
+
+        tcp_ssl_socket& get_tcp_client_ssl_socket(){
+            return client_ssl_socket;
+        };
 
 };
 void up_thread_client_accept_test(){
@@ -12959,10 +12974,53 @@ void up_thread_client_accept_test(){
     // test case 1 not ssl mode
     test_obj.test_call();
 
+    // unit_test [1] up_thread_client_accept no ssl mode next func check
+    std::cout << "[1] up_thread_client_accept no ssl mode next func check" << std::endl;
     BOOST_CHECK( test_obj.next_func_chk_accept_event() );
 
+    // tset case 2 ssl mode and handshaek time out
+    test_obj.get_ssl_flag() = true;                     //SSL mode
+    test_obj.get_ssl_handshake_time_out_flag = true;    //handshake time out
+
+    test_obj.test_call();
+
+    // unit_test [2] up_thread_client_accept ssl mode time out case next func check
+    std::cout << "[2] up_thread_client_accept ssl mode time out case next func check" << std::endl;
+    BOOST_CHECK( test_obj.next_func_chk_client_disconnect() );
+
+
+    // tset case 3 ssl mode and set timer snd handshake try_again error case check
+    test_obj.get_ssl_flag() = true;                      //SSL mode
+    test_obj.get_ssl_handshake_time_out_flag() = false;  //handshake time out
+    test_obj.get_ssl_handshake_timer_flag() = false;     //timer not set
+    test_obj.get_ssl_handshake_time_out() = 3;          //timer set second
+    test_obj.handle_ssl_handshake_timer_call_chk = false;
+    test_obj.get_tcp_client_ssl_socket().handshake_call_check = false;
+    test_obj.get_tcp_client_ssl_socket().handshake_res = false;
+    test_obj.get_tcp_client_ssl_socket().handshake_set_ec = boost::asio::error::try_again;
+
+    test_obj.test_call();
     
 
+    // unit_test [3] up_thread_client_accept set timer check
+    std::cout << "[3] up_thread_client_accept set timer check" << std::endl;
+    // after 2 second
+    sleep(2);
+    BOOST_CHECK( test_obj.handle_ssl_handshake_timer_call_chk == false );
+    
+    // after 4 second
+    sleep(4);
+    BOOST_CHECK( test_obj.handle_ssl_handshake_timer_call_chk == true );
+
+    // unit_test [4] up_thread_client_accept socket handshake call check
+    std::cout << "[4] up_thread_client_accept socket handshake call check" << std::endl;
+    BOOST_CHECK( test_obj.get_tcp_client_ssl_socket().handshake_call_check == true );
+
+    // unit_test [5] up_thread_client_accept socket handshake try_again error next func check
+    std::cout << "[5] up_thread_client_accept socket handshake try_again error next func check" << std::endl;
+    BOOST_CHECK( test_obj.next_func_chk_accept() );
+
+