From 232590e9b7695029e90113c3c1352fcf3e5fd41d Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@gmail.com>
Date: Thu, 10 Aug 2023 16:39:00 +0800
Subject: [PATCH] updated MapTest

---
 datatype/MapTest.cpp  | 25 +++++++++++++++++++++++++
 datatype/PoolTest.cpp | 23 -----------------------
 datatype/UserInfo.h   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/datatype/MapTest.cpp b/datatype/MapTest.cpp
index ba7a81f..d709180 100644
--- a/datatype/MapTest.cpp
+++ b/datatype/MapTest.cpp
@@ -88,14 +88,39 @@ void StringMapTest()
     });
 
     cout<<endl;
+}
 
+void StringObjectMapTest()
+{
+    ObjectMap<UTF8String,UserInfoClass> ui_map;
+
+    for(auto &ui:user_info_array)
+    {
+        UserInfoClass *uic=new UserInfoClass;
+
+        uic->Set(ui);
+
+        ui_map.Add(ui.name,uic);
+    }
+
+    ui_map.Enum([](const UTF8String &key,UserInfoClass *&ui)
+    {
+        cout<<"["<<key<<","<<(ui->GetSex()?"male":"female")<<","<<ui->GetAge()<<"]"<<endl;
+    });
+
+    cout<<endl;
 }
 
 int main(int,char **)
 {
+    cout<<"Map<int,int> Test"<<endl;
     IntMapTest();
 
+    cout<<"Map<String,UserInfo> Test"<<endl;
     StringMapTest();
 
+    cout<<"ObjectMap<String,UserInfoClass> Test"<<endl;
+    StringObjectMapTest();
+
     return(0);
 }
diff --git a/datatype/PoolTest.cpp b/datatype/PoolTest.cpp
index d40e309..cb89332 100644
--- a/datatype/PoolTest.cpp
+++ b/datatype/PoolTest.cpp
@@ -54,29 +54,6 @@ void StructPoolTest()
     }
 }
 
-class UserInfoClass
-{
-    UserInfo info;
-
-public:
-
-    UserInfoClass()=default;
-
-    void Set(const UserInfo &ui)
-    {
-        memcpy(&info,&ui,sizeof(UserInfo));
-
-        cout<<"UserInfoClass::Set("<<info.name<<")"<<endl;
-    }
-
-    ~UserInfoClass()
-    {
-        cout<<"~UserInfoClass("<<info.name<<")"<<endl;
-    }
-
-    const char *GetName()const{return info.name;}
-};
-
 void ShowUserInfoArray(const DataArray<UserInfoClass *> &ua)
 {
     cout<<"user info array "<<ua.GetCount()<<" [";
diff --git a/datatype/UserInfo.h b/datatype/UserInfo.h
index 5325fdb..db47cc0 100644
--- a/datatype/UserInfo.h
+++ b/datatype/UserInfo.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include<string.h>
+#include<iostream>
+
+using namespace std;
+
 struct UserInfo
 {
     char name[32];
@@ -39,3 +44,28 @@ static UserInfo user_info_array[]=
     {"Yoyo",false,42},
     {"Zack",true,43}
 };
+
+class UserInfoClass
+{
+    UserInfo info;
+
+public:
+
+    UserInfoClass()=default;
+
+    void Set(const UserInfo &ui)
+    {
+        memcpy(&info,&ui,sizeof(UserInfo));
+
+        cout<<"UserInfoClass::Set("<<info.name<<")"<<endl;
+    }
+
+    ~UserInfoClass()
+    {
+        cout<<"~UserInfoClass("<<info.name<<")"<<endl;
+    }
+
+    const char *GetName()const{return info.name;}
+    const bool GetSex()const{return info.sex;}
+    const int GetAge()const{return info.age;}
+};
\ No newline at end of file