modify test case

Signed-off-by: 尹耀德 <yinyaode1@huawei.com>

services/db_operator/src/database.rs

@@ -27,7 +27,7 @@ use asset_log::{loge, logi};
 use lazy_static::lazy_static;
 
 use crate::{
-    database_file_upgrade::{check_and_split_db, construct_splited_db_name, fmt_old_de_db_path},
+    database_file_upgrade::{check_and_split_db, construct_splited_db_name},
     statement::Statement,
     table::Table,
     types::{
@@ -58,7 +58,7 @@ lazy_static! {
 }
 
 pub(crate) fn get_split_db_lock_by_user_id(user_id: i32) -> &'static UserDbLock {
-    let mut map  = SPLIT_DB_LOCK_MAP.lock().unwrap();
+    let mut map = SPLIT_DB_LOCK_MAP.lock().unwrap();
     if let Some(&lock) = map.get(&user_id) {
         return lock;
     }
@@ -321,8 +321,8 @@ impl Database {
 
     /// Delete database file.
     #[allow(dead_code)]
-    pub(crate) fn delete(user_id: i32) -> Result<()> {
-        let path = fmt_old_de_db_path(user_id);
+    pub(crate) fn delete(user_id: i32, db_name: &str) -> Result<()> {
+        let path = fmt_de_db_path_with_name(user_id, db_name);
         let backup_path = fmt_backup_path(&path);
         if let Err(e) = fs::remove_file(path) {
             return log_throw_error!(ErrCode::FileOperationError, "[FATAL][DB]Delete database failed, err={}", e);

services/db_operator/src/test/test_database.rs

@@ -91,7 +91,7 @@ fn create_and_drop_database() {
     ).unwrap();
     backup_db(&db);
     db.close_db();
-    assert!(Database::delete(0).is_ok());
+    assert!(Database::delete(0, &db.db_name).is_ok());
 }
 
 #[test]
@@ -101,10 +101,10 @@ fn database_version() {
     let db = Database::build(
         calling_info.user_id(), calling_info.owner_type_enum(), calling_info.owner_info(), false
     ).unwrap();
-    assert_eq!(1, db.get_version().unwrap());
-    assert!(db.set_version(2).is_ok());
     assert_eq!(2, db.get_version().unwrap());
-    let _ = Database::delete(0);
+    assert!(db.set_version(3).is_ok());
+    assert_eq!(3, db.get_version().unwrap());
+    let _ = Database::delete(0, &db.db_name);
 }
 
 #[test]
@@ -116,7 +116,7 @@ fn error_sql() {
     ).unwrap();
     let sql = "pragma zzz user_version = {} mmm";
     assert!(db.exec(sql).is_err());
-    let _ = Database::delete(0);
+    let _ = Database::delete(0, &db.db_name);
 }
 
 #[test]
@@ -131,7 +131,7 @@ fn create_delete_asset_table() {
     assert!(table.delete().is_ok());
     assert!(!table.exist().unwrap());
     db.close_db();
-    let _ = Database::delete(0);
+    let _ = Database::delete(0, &db.db_name);
 }
 
 #[test]
@@ -266,7 +266,8 @@ fn backup_and_restore() {
     drop(db);
 
     // Destroy the main database.
-    let mut db_file = OpenOptions::new().read(true).write(true).open("/data/asset_test/0/asset.db").unwrap();
+    let mut db_file =
+        OpenOptions::new().read(true).write(true).open("/data/asset_test/0/Native_asset_service_8100.db").unwrap();
     let _ = db_file.write(b"buffer buffer buffer").unwrap();
 
     // Recovery the main database.

services/db_operator/src/test/test_table.rs

@@ -58,11 +58,11 @@ fn table_restore() {
         .unwrap();
     let count = table.insert_row(&DbMap::from([("Id", Value::Number(1))])).unwrap();
     assert_eq!(count, 1);
-    fs::copy("/data/asset_test/0/asset.db", "/data/asset_test/0/asset.db.backup").unwrap();
+    fs::copy("/data/asset_test/0/Native_asset_service_8100.db", "/data/asset_test/0/Native_asset_service_8100.db.backup").unwrap();
     db.close_db();
 
-    fs::remove_file("/data/asset_test/0/asset.db").unwrap();
-    fs::copy("/data/asset_test/0/asset.db.backup", "/data/asset_test/0/asset.db").unwrap();
+    fs::remove_file("/data/asset_test/0/Native_asset_service_8100.db").unwrap();
+    fs::copy("/data/asset_test/0/Native_asset_service_8100.db.backup", "/data/asset_test/0/Native_asset_service_8100.db").unwrap();
     db.open().unwrap();
     let table = Table::new("table_name", &db);
     let count = table.count_datas(&DbMap::new(), false).unwrap();

test/unittest/module_test/src/bms_wrapper_test.cpp

@@ -68,6 +68,6 @@ HWTEST_F(AssetBmsWrapperTest, AssetBmsWrapperTest001, TestSize.Level0)
     processInfo.processName = processName;
     processInfo.processNameLen = processNameLen;
     int32_t ret = GetCallingProcessInfo(userId, uid, &processInfo);
-    ASSERT_EQ(ret, SEC_ASSET_ACCESS_TOKEN_ERROR);
+    ASSERT_EQ(ret, 0);
 }
 }