From: tsukahara <tsukahara@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Date: Tue, 15 Dec 2009 12:53:53 +0000 (+0000)
Subject: スタブ修正
X-Git-Tag: v3.0.1~6^2~221^2~174
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=48b6072404005bc6bddd815288c3ca61882d86e1;p=ultramonkey-l7%2Fultramonkey-l7-v3.git

スタブ修正

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

diff --git a/l7vsd/unit_tests/l7vsd_test/parameter_stub.h b/l7vsd/unit_tests/l7vsd_test/parameter_stub.h
index d452ddb5..2ef48d29 100644
--- a/l7vsd/unit_tests/l7vsd_test/parameter_stub.h
+++ b/l7vsd/unit_tests/l7vsd_test/parameter_stub.h
@@ -122,16 +122,17 @@ public:
     void set_int( const l7vs::PARAMETER_COMPONENT_TAG comp,
                                   const std::string& key,
                                   int set_value,
-                                  l7vs::error_code& err ){
+                                  l7vs::error_code& err,
+                                  const std::string& file_name ){
         // find section
         std::map<PARAMETER_COMPONENT_TAG, std::string>::iterator
             section_table_iterator = tag_section_table_map.find( comp );
         int_map_type::iterator intmap_iterator =
-            intMap.find( section_table_iterator->second + "." + key );
+            intMap.find( file_name + "#" + section_table_iterator->second + "." + key );
         if( intmap_iterator != intMap.end() ) {
             intmap_iterator->second = set_value;
         } else {
-            std::string str_key = section_table_iterator->second + "." + key;
+            std::string str_key = file_name + "#" + section_table_iterator->second + "." + key;
             std::pair< std::string, int > add_para;
             add_para.first = str_key;
             add_para.second = set_value;
@@ -142,14 +143,15 @@ public:
 
     void rm_int_parameter( const l7vs::PARAMETER_COMPONENT_TAG comp,
                                   const std::string& key,
-                                  l7vs::error_code& err ){
+                                  l7vs::error_code& err,
+                                  const std::string& file_name ){
         // find section
         std::map<PARAMETER_COMPONENT_TAG, std::string>::iterator
             section_table_iterator = tag_section_table_map.find( comp );
         int_map_type::iterator intmap_iterator =
-            intMap.find( section_table_iterator->second + "." + key );
+            intMap.find( file_name +"#" + section_table_iterator->second + "." + key );
         if( intmap_iterator != intMap.end() ) {
-            intMap.erase(section_table_iterator->second + "." + key);
+            intMap.erase( file_name +"#" + section_table_iterator->second + "." + key);
         }
     };
 };
@@ -259,21 +261,21 @@ public:
                          const std::string& = PARAMETER_FILE );
 
 
-
-
     void set_int( const l7vs::PARAMETER_COMPONENT_TAG comp,
                                   const std::string& key,
                                   int set_value,
-                                  l7vs::error_code& err ){
+                                  l7vs::error_code& err,
+                                  const std::string& file_name = PARAMETER_FILE  ){
         ParameterImpl& impl = ParameterImpl::get_instance();
-        impl.set_int( comp, key, set_value, err );
+        impl.set_int( comp, key, set_value, err ,file_name);
     };
 
     void rm_int_parameter( const l7vs::PARAMETER_COMPONENT_TAG comp,
                                   const std::string& key,
-                                  l7vs::error_code& err ){
+                                  l7vs::error_code& err,
+                                  const std::string& file_name = PARAMETER_FILE  ){
         ParameterImpl& impl = ParameterImpl::get_instance();
-        impl.rm_int_parameter( comp, key, err );
+        impl.rm_int_parameter( comp, key, err ,file_name);
     };