Browse Source

Z991239-1122 #comment other:修改部分单元测试

Signed-Off-By: commit-hook
刘文涛174520 4 years ago
parent
commit
9fe76325e5

+ 2 - 1
Module/mod_UpgradeRun/test/TestMod_UpgradeRun.cpp

@@ -16,6 +16,7 @@
 //Handle_GetRunState
 //Handle_UpdateTaskCancel
 
+//测试解压包
 //TEST_CASE_ENTITY_CLASS(CUpgradeRunEntity, "UnZipToDir") 
 //{
 //	LOG_FUNCTION();
@@ -34,7 +35,7 @@
 //	return Error_Succeed;
 //
 //}
-
+//测试获取系统版本号
 TEST_CASE_ENTITY_CLASS(CUpgradeRunEntity, "getOSVersion")
 {
 	LOG_FUNCTION();

+ 15 - 26
Module/mod_upload/test/TestMod_upload.cpp

@@ -4,21 +4,21 @@
 #include "fileutil.h"
 
 
-TEST_CASE_ENTITY_CLASS(CUploadEntity, "upload_create")
-{
-	LOG_FUNCTION();
-
-	struct list_head m_updir_list;//文件夹配置列表
-	INIT_LIST_HEAD(&m_updir_list);
-	CSimpleStringA checkStr = "";
-	CSmartPointer<IConfigInfo> spConfig;
-	this->GetFunction()->OpenConfig(Config_Software, spConfig);
-	ErrorCodeEnum Error  = (ErrorCodeEnum)upload_create(&m_updir_list, this->GetFunction().GetRawPointer(), spConfig.GetRawPointer(), checkStr);
-	if (Error == Error_Succeed) {
-		Dbg("upload_create is success");
-	}
-	return Error;
-}
+//TEST_CASE_ENTITY_CLASS(CUploadEntity, "upload_create")
+//{
+//	LOG_FUNCTION();
+//
+//	struct list_head m_updir_list;//文件夹配置列表
+//	INIT_LIST_HEAD(&m_updir_list);
+//	CSimpleStringA checkStr = "";
+//	CSmartPointer<IConfigInfo> spConfig;
+//	this->GetFunction()->OpenConfig(Config_Software, spConfig);
+//	ErrorCodeEnum Error  = (ErrorCodeEnum)upload_create(&m_updir_list, this->GetFunction().GetRawPointer(), spConfig.GetRawPointer(), checkStr);
+//	if (Error == Error_Succeed) {
+//		Dbg("upload_create is success");
+//	}
+//	return Error;
+//}
 
 TEST_CASE_ENTITY_CLASS(CUploadEntity, "upload_fresh")
 {
@@ -33,19 +33,8 @@ TEST_CASE_ENTITY_CLASS(CUploadEntity, "upload_fresh")
 	if (Error == Error_Succeed) {
 		Dbg("upload_create is success");
 		upload_fresh(&m_updir_list);
-		//upload_dir_t* pos;
-		//list_for_each_entry(pos, &m_updir_list, upload_dir_t, entry) {
-		//	if (!list_empty(&pos->candidate_list)) {
-		//		file_t* filet = list_first_entry(&pos->candidate_list, file_t, entry);
-		//		Dbg("name:[%s] , length[%d] , path[%s] , owner[%s] , create_time[%d]", filet->name, filet->length,filet->path,filet->owner->name,filet->create_time);
-		//		//打印出文件消息
-		//		//list_del(&filet->entry);//从链表删除文件
-		//		//upload_file_destroy(filet);//删除文件内存
-		//	}
-		//}
 	}
 	return Error;
-	
 }
 
 #ifdef RVC_OS_WIN