1 files changed, 25 insertions, 25 deletions
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
index c4813d00a8..533fe92eb5 100755
--- a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
+++ b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
@@ -18,95 +18,95 @@ from generator import Model
 
 EXPECTED_RESULT_REQUEST = (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_CORRELATION_ID] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_RESULT_RESPONSE = (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_CORRELATION_ID] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::kCode] = CObjectSchemaItem::SMember("""
+    u"""strings::kCode] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_RESULT_NOTIFICATION = (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_PRE_FUNCTION_CODE = (
-    u"""  std::map<std::string, CObjectSchemaItem::SMember> """
+    u"""  std::map<std::string, SMember> """
     u"""params_members;\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_CORRELATION_ID] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler"""
-    u"""::strings::kCode] = CObjectSchemaItem::SMember("""
+    u"""::strings::kCode] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::kMessage] = CObjectSchemaItem::SMember("""
+    u"""strings::kMessage] = SMember("""
     u"""CStringSchemaItem::create(), true);\n"""
     u"""\n"""
-    u"""  std::map<std::string, CObjectSchemaItem::SMember> """
+    u"""  std::map<std::string, SMember> """
     u"""root_members_map;\n"""
     u"""  root_members_map[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PARAMS] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PARAMS] = SMember("""
     u"""CObjectSchemaItem::create(params_members), true);\n"""
     u"""\n"""
     u"""  CSmartSchema error_response_schema(CObjectSchemaItem::create("""