From 6c91a2614a1a14b1e2570cfb0d6cd2f7dea7e626 Mon Sep 17 00:00:00 2001 From: htt1997 Date: Sat, 29 Mar 2025 17:26:31 +0800 Subject: [PATCH] update Signed-off-by: htt1997 --- .../js/napi/common/src/js_uv_queue.cpp | 5 +- .../native/gdb/include/transaction_impl.h | 8 +- .../frameworks/native/gdb/src/transaction.cpp | 2 +- .../native/gdb/src/transaction_impl.cpp | 16 +- .../native/rdb/src/rdb_store_config.cpp | 2 +- .../native/rdb/src/sqlite_statement.cpp | 7 +- .../inner_api/rdb/include/rdb_store_config.h | 2 +- .../ndk/include/relational_store_error_code.h | 34 +-- .../src/RdbStoreDistributedJsunit.test.js | 6 +- .../unittest/src/RdbStoreTransaction.test.js | 6 +- ...reBackupRestoreWithFAContextJsunit.test.js | 16 +- ...oreCreateDeleteWithFAContextJsunit.test.js | 10 +- .../unittest/src/RdbstoreDeleteJsunit.test.js | 10 +- .../src/RdbstoreEncryptionJsunit.test.js | 20 +- .../src/RdbstoreLockRowJsunit.test.js | 18 +- .../src/RdbstoreMemoryDbJsunit.test.js | 54 ++-- ...bstorePredicatesComplexFiledJsunit.test.js | 8 +- .../src/RdbstoreStoreExcuteSqlJsunit.test.js | 10 +- .../unittest/src/RdbstoreUpdateJsunit.test.js | 230 +++++++++--------- .../src/RdbstoreUpdateSyncJsunit.test.js | 230 +++++++++--------- 20 files changed, 344 insertions(+), 350 deletions(-) diff --git a/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp b/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp index 87fbd98f..7996b287 100644 --- a/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp +++ b/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp @@ -319,7 +319,10 @@ void UvQueue::UvEntry::BindPromise(napi_value promise) napi_create_function(env_, REJECTED, REJECTED_SIZE, Rejected, object, &argv[1]); napi_value result = nullptr; // Enter 2 parameters argv[0] and argv[1] - napi_call_function(env_, promise, then, 2, argv, &result); + status = napi_call_function(env_, promise, then, 2, argv, &result); + if (status != napi_ok && object != nullptr) { + delete object; + } } UvQueue::Result *UvQueue::UvEntry::StealResult() diff --git a/relational_store/frameworks/native/gdb/include/transaction_impl.h b/relational_store/frameworks/native/gdb/include/transaction_impl.h index 9673bfd2..fdaaa64a 100644 --- a/relational_store/frameworks/native/gdb/include/transaction_impl.h +++ b/relational_store/frameworks/native/gdb/include/transaction_impl.h @@ -30,16 +30,16 @@ class TransactionImpl : public Transaction { public: TransactionImpl(std::shared_ptr connection); ~TransactionImpl() override; - + int32_t Commit() override; int32_t Rollback() override; int32_t Close() override; - + std::pair> Query(const std::string &gql) override; std::pair> Execute(const std::string &gql) override; - + static std::pair> Create(std::shared_ptr conn); - + private: int32_t Start(); int32_t CloseInner(); diff --git a/relational_store/frameworks/native/gdb/src/transaction.cpp b/relational_store/frameworks/native/gdb/src/transaction.cpp index de75d1b8..f3e2eedb 100644 --- a/relational_store/frameworks/native/gdb/src/transaction.cpp +++ b/relational_store/frameworks/native/gdb/src/transaction.cpp @@ -23,7 +23,7 @@ std::pair> Transaction::Create(std::shared } return { E_ERROR, nullptr }; } - + int32_t Transaction::RegisterCreator(Creator creator) { creator_ = std::move(creator); diff --git a/relational_store/frameworks/native/gdb/src/transaction_impl.cpp b/relational_store/frameworks/native/gdb/src/transaction_impl.cpp index a593a4ec..22faf2b3 100644 --- a/relational_store/frameworks/native/gdb/src/transaction_impl.cpp +++ b/relational_store/frameworks/native/gdb/src/transaction_impl.cpp @@ -14,14 +14,14 @@ */ #define LOG_TAG "GdbTrans" #include "transaction_impl.h" - + #include #include "gdb_errors.h" #include "db_trace.h" #include "logger.h" #include "trans_db.h" - + namespace OHOS::DistributedDataAip { constexpr const char *START_GQL = "START TRANSACTION;"; @@ -30,17 +30,17 @@ constexpr const char *ROLLBACK_GQL = "ROLLBACK;"; __attribute__((used)) const int32_t TransactionImpl::regCreator_ = Transaction::RegisterCreator(TransactionImpl::Create); - + TransactionImpl::TransactionImpl(std::shared_ptr connection) : connection_(std::move(connection)) { } - + TransactionImpl::~TransactionImpl() { CloseInner(); } - + std::pair> TransactionImpl::Create(std::shared_ptr conn) { if (conn == nullptr) { @@ -88,7 +88,7 @@ int32_t TransactionImpl::Start() } return E_OK; } - + int32_t TransactionImpl::Commit() { DISTRIBUTED_DATA_HITRACE(std::string(__FUNCTION__)); @@ -113,7 +113,7 @@ int32_t TransactionImpl::Commit() } return E_OK; } - + int32_t TransactionImpl::Rollback() { DISTRIBUTED_DATA_HITRACE(std::string(__FUNCTION__)); @@ -138,7 +138,7 @@ int32_t TransactionImpl::Rollback() } return E_OK; } - + int32_t TransactionImpl::CloseInner() { std::lock_guard lock(mutex_); diff --git a/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp b/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp index c465419d..a8cf560c 100644 --- a/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp +++ b/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp @@ -675,7 +675,7 @@ int32_t RdbStoreConfig::GetSubUser() const { return subUser_; } - + void RdbStoreConfig::SetSubUser(int32_t subUser) { subUser_ = subUser; diff --git a/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp b/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp index 5ba7a10f..429ab25d 100644 --- a/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp +++ b/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp @@ -566,10 +566,13 @@ std::pair SqliteStatement::GetSize(int index) const return { errCode, 0 }; } - if (type == int32_t(ColumnType::TYPE_STRING) || type == int32_t(ColumnType::TYPE_BLOB) || - type == int32_t(ColumnType::TYPE_NULL)) { + if (type == static_cast(ColumnType::TYPE_BLOB) || type == static_cast(ColumnType::TYPE_NULL)) { auto size = static_cast(sqlite3_column_bytes(stmt_, index)); return { E_OK, size }; + } else if (type == static_cast(ColumnType::TYPE_STRING)) { + // Add 1 to size for the string terminator (null character). + auto size = static_cast(sqlite3_column_bytes(stmt_, index) + 1); + return { E_OK, size }; } return { E_INVALID_COLUMN_TYPE, 0 }; } diff --git a/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h b/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h index 89323006..56416e4b 100644 --- a/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h +++ b/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h @@ -676,7 +676,7 @@ public: return path_ == config.path_ && securityLevel_ == config.securityLevel_; } } - + /** * @brief Checks whether the database isSearchable necessary. */ diff --git a/relational_store/interfaces/ndk/include/relational_store_error_code.h b/relational_store/interfaces/ndk/include/relational_store_error_code.h index ff98a52b..c8bf5108 100644 --- a/relational_store/interfaces/ndk/include/relational_store_error_code.h +++ b/relational_store/interfaces/ndk/include/relational_store_error_code.h @@ -299,7 +299,7 @@ typedef enum OH_Rdb_ErrCode { /** * @brief The error when the wal file size over default limit. - */ + */ RDB_E_WAL_SIZE_OVER_LIMIT = (E_BASE + 47), /** @@ -315,112 +315,112 @@ typedef enum OH_Rdb_ErrCode { /** * @brief Database already closed. * - * @since 16 + * @since 18 */ RDB_E_ALREADY_CLOSED = (E_BASE + 50), /** * @brief The database does not respond. * - * @since 16 + * @since 18 */ RDB_E_DATABASE_BUSY = (E_BASE + 51), /** * @brief Database corrupted. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_CORRUPT = (E_BASE + 52), /** * @brief SQLite: Access permission denied. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_PERM = (E_BASE + 53), /** * @brief SQLite: The database file is locked. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_BUSY = (E_BASE + 54), /** * @brief SQLite: A table in the database is locked. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_LOCKED = (E_BASE + 55), /** * @brief SQLite: The database is out of memory. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_NOMEM = (E_BASE + 56), /** * @brief SQLite: Attempt to write a readonly database. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_READONLY = (E_BASE + 57), /** * @brief SQLite: Some kind of disk I/O error occurred. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_IOERR = (E_BASE + 58), /** * @brief SQLite: The database is full. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_FULL = (E_BASE + 59), /** * @brief SQLite: Unable to open the database file. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_CANT_OPEN = (E_BASE + 60), /** * @brief SQLite: TEXT or BLOB exceeds size limit. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_TOO_BIG = (E_BASE + 61), /** * @brief SQLite: Data type mismatch. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_MISMATCH = (E_BASE + 62), /** * @brief Data value type is null. * - * @since 16 + * @since 18 */ RDB_E_DATA_TYPE_NULL = (E_BASE + 63), /** * @brief Data value type mismatch. * - * @since 16 + * @since 18 */ RDB_E_TYPE_MISMATCH = (E_BASE + 64), /** * @brief SQLite: Abort due to constraint violation. * - * @since 16 + * @since 18 */ RDB_E_SQLITE_CONSTRAINT = (E_BASE + 65), } OH_Rdb_ErrCode; diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbStoreDistributedJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbStoreDistributedJsunit.test.js index b40836f9..ff58851e 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbStoreDistributedJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbStoreDistributedJsunit.test.js @@ -210,9 +210,9 @@ describe('rdbStoreDistributedTest', function () { const name = await resultSet.getString(resultSet.getColumnIndex("name")) const age = await resultSet.getLong(resultSet.getColumnIndex("age")) - await expect(1).assertEqual(id); - await expect("Jim").assertEqual(name); - await expect(30).assertEqual(age); + expect(1).assertEqual(id); + expect("Jim").assertEqual(name); + expect(30).assertEqual(age); resultSet.close(); expect(true).assertEqual(resultSet.isClosed) } catch (e) { diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbStoreTransaction.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbStoreTransaction.test.js index 3bd8700e..4262cdb1 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbStoreTransaction.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbStoreTransaction.test.js @@ -443,7 +443,7 @@ describe('rdbStoreTransactionTest', function () { predicates.equalTo("name", nameStr) let querySqlPromise = transaction.query(predicates) querySqlPromise.then(async (resultSet) => { - await expect(2).assertEqual(resultSet.rowCount) + expect(2).assertEqual(resultSet.rowCount) resultSet.close() }).catch((err) => { expect(null).assertFail(); @@ -453,7 +453,7 @@ describe('rdbStoreTransactionTest', function () { { let executeSqlPromise = transaction.execute("DELETE FROM test WHERE age = 19 AND name ='" + nameStr + "'") executeSqlPromise.then(async () => { - await console.log(TAG + "executeSql done."); + console.log(TAG + "executeSql done."); }).catch((err) => { console.log(TAG + "executeSql failed. " + err); expect(null).assertFail(); @@ -467,7 +467,7 @@ describe('rdbStoreTransactionTest', function () { let querySqlPromise = rdbStore.query(predicates) querySqlPromise.then(async (resultSet) => { console.log(TAG + "testExecute0003 rdbStore.querySql result count " + resultSet.rowCount) - await expect(1).assertEqual(resultSet.rowCount) + expect(1).assertEqual(resultSet.rowCount) expect(true).assertEqual(resultSet.goToFirstRow()) const name = resultSet.getString(resultSet.getColumnIndex("name")) expect(nameStr).assertEqual(name) diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreBackupRestoreWithFAContextJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreBackupRestoreWithFAContextJsunit.test.js index d5d89990..1a9c857d 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreBackupRestoreWithFAContextJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreBackupRestoreWithFAContextJsunit.test.js @@ -125,7 +125,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { * @tc.desc RDB backup and restore function test */ it('RdbBackupRestoreTest_0010', 0, async function (done) { - await console.log(TAG + "************* RdbBackupRestoreTest_0010 start *************") + console.log(TAG + "************* RdbBackupRestoreTest_0010 start *************") try { await rdbStore.backup(DATABASE_BACKUP_NAME) @@ -157,7 +157,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { resultSet.close() resultSet = null done() - await console.log(TAG + "************* RdbBackupRestoreTest_0010 end *************") + console.log(TAG + "************* RdbBackupRestoreTest_0010 end *************") }) /** @@ -166,7 +166,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { * @tc.desc RDB backup function test */ it('RdbBackupRestoreTest_0020', 0, async function (done) { - await console.log(TAG + "************* RdbBackupRestoreTest_0020 start *************") + console.log(TAG + "************* RdbBackupRestoreTest_0020 start *************") // RDB backup function test, backup file name empty BackupTest("") @@ -174,7 +174,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { BackupTest(STORE_CONFIG.name) done() - await console.log(TAG + "************* RdbBackupRestoreTest_0020 end *************") + console.log(TAG + "************* RdbBackupRestoreTest_0020 end *************") }) /** @@ -183,7 +183,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { * @tc.desc RDB restore function test */ it('RdbBackupRestoreTest_0030', 0, async function (done) { - await console.log(TAG + "************* RdbBackupRestoreTest_0030 start *************") + console.log(TAG + "************* RdbBackupRestoreTest_0030 start *************") await rdbStore.backup(DATABASE_BACKUP_NAME) // RDB restore function test, backup file name empty @@ -193,7 +193,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { RestoreTest(STORE_CONFIG.name) done() - await console.log(TAG + "************* RdbBackupRestoreTest_0030 end *************") + console.log(TAG + "************* RdbBackupRestoreTest_0030 end *************") }) /** @@ -202,7 +202,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { * @tc.desc RDB restore function test */ it('RdbBackupRestoreTest_0040', 0, async function (done) { - await console.log(TAG + "************* RdbBackupRestoreTest_0040 start *************") + console.log(TAG + "************* RdbBackupRestoreTest_0040 start *************") let dbName = "notExistName.db" // RDB restore function test, backup file does not exists @@ -213,7 +213,7 @@ describe('rdbStoreBackupRestoreWithFAContextTest', function () { } RestoreTest(dbName) done() - await console.log(TAG + "************* RdbBackupRestoreTest_0040 end *************") + console.log(TAG + "************* RdbBackupRestoreTest_0040 end *************") }) /** diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreCreateDeleteWithFAContextJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreCreateDeleteWithFAContextJsunit.test.js index f816b62d..80ab0328 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreCreateDeleteWithFAContextJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreCreateDeleteWithFAContextJsunit.test.js @@ -100,14 +100,8 @@ describe('rdbStoreCreateDeleteWithFAContextTest', function () { { let predicates = await new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "zhangsan") - let deletePromise = rdbStore.delete(predicates) - deletePromise.then(async (ret) => { - await expect(1).assertEqual(ret) - await console.log(TAG + "Delete done: " + ret) - }).catch((err) => { - expect(null).assertFail() - }) - await deletePromise + let ret = await rdbStore.delete(predicates) + expect(1).assertEqual(ret) } await rdbStore.executeSql("DELETE FROM test"); rdbStore = null diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreDeleteJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreDeleteJsunit.test.js index 68ed97ab..d9d42f63 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreDeleteJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreDeleteJsunit.test.js @@ -141,14 +141,8 @@ describe('rdbStoreDeleteTest', function () { { let predicates = await new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "zhangsan") - let deletePromise = rdbStore.delete(predicates) - deletePromise.then(async (ret) => { - await expect(1).assertEqual(ret) - await console.log(TAG + "Delete done: " + ret) - }).catch((err) => { - expect(null).assertFail() - }) - await deletePromise + let ret = await rdbStore.delete(predicates) + expect(1).assertEqual(ret) } done() console.log(TAG + "************* testRdbStoreDelete0002 end *************"); diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreEncryptionJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreEncryptionJsunit.test.js index b743503a..a62a80d5 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreEncryptionJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreEncryptionJsunit.test.js @@ -162,11 +162,11 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB create encrypt db test */ it('RdbEncryptTest_0010', 0, async function (done) { - await console.log(TAG + "************* RdbEncryptTest_0010 start *************") + console.log(TAG + "************* RdbEncryptTest_0010 start *************") let storePromise = data_relationalStore.getRdbStore(context, STORE_CONFIG_ENCRYPT); storePromise.then(async (store) => { try { - await console.log(TAG + "getRdbStore done: " + store); + console.log(TAG + "getRdbStore done: " + store); } catch (err) { expect(null).assertFail(); } @@ -178,7 +178,7 @@ describe('rdbEncryptTest', function () { storePromise = null done() - await console.log(TAG + "************* RdbEncryptTest_0010 end *************") + console.log(TAG + "************* RdbEncryptTest_0010 end *************") }) /** @@ -187,11 +187,11 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB create unencrypted db test */ it('RdbEncryptTest_0020', 0, async function (done) { - await console.log(TAG + "************* RdbEncryptTest_0020 start *************") + console.log(TAG + "************* RdbEncryptTest_0020 start *************") let storePromise = data_relationalStore.getRdbStore(context, STORE_CONFIG_UNENCRYPT); storePromise.then(async (store) => { try { - await console.log(TAG + "getRdbStore done: " + store); + console.log(TAG + "getRdbStore done: " + store); } catch (err) { expect(null).assertFail(); } @@ -203,7 +203,7 @@ describe('rdbEncryptTest', function () { storePromise = null done() - await console.log(TAG + "************* RdbEncryptTest_0020 end *************") + console.log(TAG + "************* RdbEncryptTest_0020 end *************") }) @@ -213,7 +213,7 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB Encrypt function test */ it('RdbEncryptTest_0030', 0, async function (done) { - await console.log(TAG + "************* RdbEncryptTest_0030 start *************") + console.log(TAG + "************* RdbEncryptTest_0030 start *************") let rdbStore = await CreateRdbStore(context, STORE_CONFIG_ENCRYPT) let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "zhangsan") @@ -234,7 +234,7 @@ describe('rdbEncryptTest', function () { resultSet = null rdbStore = null done() - await console.log(TAG + "************* RdbEncryptTest_0030 end *************") + console.log(TAG + "************* RdbEncryptTest_0030 end *************") }) /** @@ -286,7 +286,7 @@ describe('rdbEncryptTest', function () { * @tc.desc RDB Encrypt function test for setDistributedTables and insert. */ it('RdbEncryptTest_0050', 0, async function () { - await console.log(TAG + "************* RdbEncryptTest_0050 start *************") + console.log(TAG + "************* RdbEncryptTest_0050 start *************") try { let rdbStore = await data_relationalStore.getRdbStore(context, STORE_CONFIG_ENCRYPT) await rdbStore.executeSql(CREATE_TABLE_TEST, null) @@ -317,7 +317,7 @@ describe('rdbEncryptTest', function () { * 4. query db1 and db2 */ it('RdbEncryptTest_0060', 0, async function () { - await console.info(TAG + "************* RdbEncryptTest_0060 start *************") + console.info(TAG + "************* RdbEncryptTest_0060 start *************") context = ability_featureAbility.getContext() let rdbStore1; let rdbStore2; diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreLockRowJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreLockRowJsunit.test.js index 08abbb00..056b5ff8 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreLockRowJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreLockRowJsunit.test.js @@ -193,7 +193,7 @@ describe('rdbStoreLockRowTest', function () { let predicates = new data_relationalStore.RdbPredicates(TABLE) predicates.equalTo("name", checkName) let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); + expect(1).assertEqual(ret); // check default status checkStatus(checkName, UNLOCK) } catch (err) { @@ -404,7 +404,7 @@ describe('rdbStoreLockRowTest', function () { let predicates = new data_relationalStore.RdbPredicates(TABLE) predicates.equalTo("name", checkName) let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); + expect(1).assertEqual(ret); console.log(TAG + "update done: " + ret); // check default status @@ -453,8 +453,8 @@ describe('rdbStoreLockRowTest', function () { let predicates = new data_relationalStore.RdbPredicates(TABLE) predicates.equalTo("name", checkName) let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); // check default status await checkStatus(checkName, LOCK_CHANGE) @@ -563,7 +563,7 @@ describe('rdbStoreLockRowTest', function () { let predicates = new data_relationalStore.RdbPredicates(TABLE) predicates.equalTo("name", checkName2) let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); + expect(1).assertEqual(ret); // check default status await checkStatus(checkName2, UNLOCK) console.log(TAG + `update success`) @@ -682,8 +682,8 @@ describe('rdbStoreLockRowTest', function () { let predicates = new data_relationalStore.RdbPredicates(TABLE) predicates.equalTo("name", checkName2) let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); // check default status await checkStatus(checkName2, LOCK_CHANGE) @@ -734,8 +734,8 @@ describe('rdbStoreLockRowTest', function () { let predicates = new data_relationalStore.RdbPredicates(TABLE) predicates.equalTo("name", checkName2) let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); // check default status await checkStatus(checkName2, LOCK_CHANGE) diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreMemoryDbJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreMemoryDbJsunit.test.js index da7b8913..86423faf 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreMemoryDbJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreMemoryDbJsunit.test.js @@ -824,8 +824,8 @@ describe('rdbStoreMemoryDbTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("id", "1") let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) @@ -891,8 +891,8 @@ describe('rdbStoreMemoryDbTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "xiaoming") let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", 20) @@ -900,7 +900,7 @@ describe('rdbStoreMemoryDbTest', function () { try { expect(true).assertEqual(resultSet.goToFirstRow()) const name = await resultSet.getString(resultSet.getColumnIndex("name")) - await expect(nameStr).assertEqual(name); + expect(nameStr).assertEqual(name); } finally { resultSet.close() resultSet = null @@ -962,8 +962,8 @@ describe('rdbStoreMemoryDbTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = rdbStore.updateSync(valueBucket, predicates, data_relationalStore.ConflictResolution.ON_CONFLICT_REPLACE); - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) try { @@ -977,15 +977,15 @@ describe('rdbStoreMemoryDbTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); - - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); + + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -994,14 +994,14 @@ describe('rdbStoreMemoryDbTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(3).assertEqual(id_1); - await expect("wangjing").assertEqual(name_1); - await expect(20).assertEqual(age_1); - await expect(300.5).assertEqual(salary_1); - await expect(7).assertEqual(blobType_1[0]); - await expect(8).assertEqual(blobType_1[1]); - await expect(9).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(3).assertEqual(id_1); + expect("wangjing").assertEqual(name_1); + expect(20).assertEqual(age_1); + expect(300.5).assertEqual(salary_1); + expect(7).assertEqual(blobType_1[0]); + expect(8).assertEqual(blobType_1[1]); + expect(9).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -1289,7 +1289,7 @@ describe('rdbStoreMemoryDbTest', function () { predicates.equalTo("name", nameStr) let querySqlPromise = rdbStore.query(predicates) querySqlPromise.then(async (resultSet) => { - await expect(2).assertEqual(resultSet.rowCount) + expect(2).assertEqual(resultSet.rowCount) resultSet.close() }).catch((err) => { console.error(TAG + `testMemoryDbExecuteSqlTest0002 failed, err code:${err.code}, message:${err.message}`) @@ -1300,7 +1300,7 @@ describe('rdbStoreMemoryDbTest', function () { { let executeSqlPromise = rdbStore.executeSql("DELETE FROM test WHERE age = 19 AND name ='" + nameStr + "'") executeSqlPromise.then(async () => { - await console.log(TAG + "executeSql done."); + console.log(TAG + "executeSql done."); }).catch((err) => { console.error(TAG + `testMemoryDbExecuteSqlTest0002 failed, err code:${err.code}, message:${err.message}`) expect(null).assertFail(); @@ -1310,7 +1310,7 @@ describe('rdbStoreMemoryDbTest', function () { { let querySqlPromise = rdbStore.querySql("SELECT * FROM test WHERE name ='" + nameStr + "'") querySqlPromise.then(async (resultSet) => { - await expect(1).assertEqual(resultSet.rowCount) + expect(1).assertEqual(resultSet.rowCount) expect(true).assertEqual(resultSet.goToFirstRow()) const name = resultSet.getString(resultSet.getColumnIndex("name")) const age = resultSet.getLong(resultSet.getColumnIndex("age")) diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstorePredicatesComplexFiledJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstorePredicatesComplexFiledJsunit.test.js index 68a4cac9..388a4aeb 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstorePredicatesComplexFiledJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstorePredicatesComplexFiledJsunit.test.js @@ -78,12 +78,12 @@ describe('rdbStorePredicatesComplexFiledTest', function () { let count = await resultSet.getLong(resultSet.getColumnIndex("num count")) let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday")) expect(2).assertEqual(count); - await expect("2022-09-01").assertEqual(birthday) + expect("2022-09-01").assertEqual(birthday) expect(true).assertEqual(resultSet.goToNextRow()) count = await resultSet.getLong(resultSet.getColumnIndex("num count")) birthday = await resultSet.getString(resultSet.getColumnIndex("birthday")) expect(3).assertEqual(count); - await expect("2022-09-02").assertEqual(birthday) + expect("2022-09-02").assertEqual(birthday) expect(false).assertEqual(resultSet.goToNextRow()) resultSet.close() done(); @@ -105,12 +105,12 @@ describe('rdbStorePredicatesComplexFiledTest', function () { let count = await resultSet.getLong(resultSet.getColumnIndex("numcount")) let birthday = await resultSet.getString(resultSet.getColumnIndex("birthday")) expect(3).assertEqual(count); - await expect("2022-09-02").assertEqual(birthday) + expect("2022-09-02").assertEqual(birthday) expect(true).assertEqual(resultSet.goToNextRow()) count = await resultSet.getLong(resultSet.getColumnIndex("numcount")) birthday = await resultSet.getString(resultSet.getColumnIndex("birthday")) expect(2).assertEqual(count); - await expect("2022-09-01").assertEqual(birthday) + expect("2022-09-01").assertEqual(birthday) expect(false).assertEqual(resultSet.goToNextRow()) resultSet.close() done(); diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js index 798db5c2..6d8c3a2e 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js @@ -93,7 +93,7 @@ describe('rdbStoreExecuteSqlTest', function () { let querySqlPromise = rdbStore.querySql("SELECT * FROM test") querySqlPromise.then(async (resultSet) => { - await expect(0).assertEqual(resultSet.rowCount) + expect(0).assertEqual(resultSet.rowCount) resultSet.close() done(); }).catch((err) => { @@ -146,7 +146,7 @@ describe('rdbStoreExecuteSqlTest', function () { await rdbStore.executeSql("DELETE FROM test WHERE name = 'lisi'") let querySqlPromise = rdbStore.querySql("SELECT * FROM test") querySqlPromise.then(async (resultSet) => { - await expect(1).assertEqual(resultSet.rowCount) + expect(1).assertEqual(resultSet.rowCount) resultSet.close() done(); }).catch((err) => { @@ -203,7 +203,7 @@ describe('rdbStoreExecuteSqlTest', function () { predicates.equalTo("name", nameStr) let querySqlPromise = rdbStore.query(predicates) querySqlPromise.then(async (resultSet) => { - await expect(2).assertEqual(resultSet.rowCount) + expect(2).assertEqual(resultSet.rowCount) resultSet.close() }).catch((err) => { expect(null).assertFail(); @@ -213,7 +213,7 @@ describe('rdbStoreExecuteSqlTest', function () { { let executeSqlPromise = rdbStore.executeSql("DELETE FROM test WHERE age = 19 AND name ='" + nameStr + "'") executeSqlPromise.then(async () => { - await console.log(TAG + "executeSql done."); + console.log(TAG + "executeSql done."); }).catch((err) => { expect(null).assertFail(); }) @@ -222,7 +222,7 @@ describe('rdbStoreExecuteSqlTest', function () { { let querySqlPromise = rdbStore.querySql("SELECT * FROM test WHERE name ='" + nameStr + "'") querySqlPromise.then(async (resultSet) => { - await expect(1).assertEqual(resultSet.rowCount) + expect(1).assertEqual(resultSet.rowCount) expect(true).assertEqual(resultSet.goToFirstRow()) const name = resultSet.getString(resultSet.getColumnIndex("name")) const age = resultSet.getLong(resultSet.getColumnIndex("age")) diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateJsunit.test.js index c09b0a6a..39bd539e 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateJsunit.test.js @@ -83,8 +83,8 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("id", "1") let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) @@ -96,14 +96,14 @@ describe('rdbStoreUpdateTest', function () { const salary = await resultSet.getDouble(resultSet.getColumnIndex("salary")) const blobType = await resultSet.getBlob(resultSet.getColumnIndex("blobType")) - await expect(1).assertEqual(id); - await expect("lisi").assertEqual(name); - await expect(20).assertEqual(age); - await expect(200.5).assertEqual(salary); - await expect(4).assertEqual(blobType[0]); - await expect(5).assertEqual(blobType[1]); - await expect(6).assertEqual(blobType[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(1).assertEqual(id); + expect("lisi").assertEqual(name); + expect(20).assertEqual(age); + expect(200.5).assertEqual(salary); + expect(4).assertEqual(blobType[0]); + expect(5).assertEqual(blobType[1]); + expect(6).assertEqual(blobType[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -278,8 +278,8 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "xiaoming") let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", 20) @@ -287,7 +287,7 @@ describe('rdbStoreUpdateTest', function () { try { expect(true).assertEqual(resultSet.goToFirstRow()) const name = await resultSet.getString(resultSet.getColumnIndex("name")) - await expect(nameStr).assertEqual(name); + expect(nameStr).assertEqual(name); } finally { resultSet.close() resultSet = null @@ -333,15 +333,15 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "xiaohua") let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", 19) let resultSet = await rdbStore.query(predicates) try { expect(true).assertEqual(resultSet.goToFirstRow()) const name = await resultSet.getString(resultSet.getColumnIndex("name")) - await expect(nameStr).assertEqual(name); + expect(nameStr).assertEqual(name); } finally { resultSet.close() resultSet = null @@ -387,15 +387,15 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "xiaocan") let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", 21) let resultSet = await rdbStore.query(predicates) try { expect(true).assertEqual(resultSet.goToFirstRow()) const name = await resultSet.getString(resultSet.getColumnIndex("name")) - await expect(nameStr).assertEqual(name); + expect(nameStr).assertEqual(name); } finally { resultSet.close() resultSet = null @@ -549,8 +549,8 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = await rdbStore.update(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) @@ -564,15 +564,15 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -581,14 +581,14 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(3).assertEqual(id_1); - await expect("wangjing").assertEqual(name_1); - await expect(20).assertEqual(age_1); - await expect(300.5).assertEqual(salary_1); - await expect(7).assertEqual(blobType_1[0]); - await expect(8).assertEqual(blobType_1[1]); - await expect(9).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(3).assertEqual(id_1); + expect("wangjing").assertEqual(name_1); + expect(20).assertEqual(age_1); + expect(300.5).assertEqual(salary_1); + expect(7).assertEqual(blobType_1[0]); + expect(8).assertEqual(blobType_1[1]); + expect(9).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -668,15 +668,15 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -685,14 +685,14 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(2).assertEqual(id_1); - await expect("lisi").assertEqual(name_1); - await expect(19).assertEqual(age_1); - await expect(200.5).assertEqual(salary_1); - await expect(4).assertEqual(blobType_1[0]); - await expect(5).assertEqual(blobType_1[1]); - await expect(6).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(2).assertEqual(id_1); + expect("lisi").assertEqual(name_1); + expect(19).assertEqual(age_1); + expect(200.5).assertEqual(salary_1); + expect(4).assertEqual(blobType_1[0]); + expect(5).assertEqual(blobType_1[1]); + expect(6).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } catch (err) { console.log(TAG + `failed, err: ${JSON.stringify(err)}`) expect().assertFail(); @@ -753,8 +753,8 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = await rdbStore.update(valueBucket, predicates, data_relationalStore.ConflictResolution.ON_CONFLICT_ROLLBACK); - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) @@ -768,15 +768,15 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -785,14 +785,14 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(3).assertEqual(id_1); - await expect("wangjing").assertEqual(name_1); - await expect(20).assertEqual(age_1); - await expect(300.5).assertEqual(salary_1); - await expect(7).assertEqual(blobType_1[0]); - await expect(8).assertEqual(blobType_1[1]); - await expect(9).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(3).assertEqual(id_1); + expect("wangjing").assertEqual(name_1); + expect(20).assertEqual(age_1); + expect(300.5).assertEqual(salary_1); + expect(7).assertEqual(blobType_1[0]); + expect(8).assertEqual(blobType_1[1]); + expect(9).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -889,15 +889,15 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -906,14 +906,14 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(2).assertEqual(id_1); - await expect("lisi").assertEqual(name_1); - await expect(19).assertEqual(age_1); - await expect(200.5).assertEqual(salary_1); - await expect(4).assertEqual(blobType_1[0]); - await expect(5).assertEqual(blobType_1[1]); - await expect(6).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(2).assertEqual(id_1); + expect("lisi").assertEqual(name_1); + expect(19).assertEqual(age_1); + expect(200.5).assertEqual(salary_1); + expect(4).assertEqual(blobType_1[0]); + expect(5).assertEqual(blobType_1[1]); + expect(6).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -975,8 +975,8 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = await rdbStore.update(valueBucket, predicates, data_relationalStore.ConflictResolution.ON_CONFLICT_REPLACE); - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) try { @@ -990,15 +990,15 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -1007,14 +1007,14 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(3).assertEqual(id_1); - await expect("wangjing").assertEqual(name_1); - await expect(20).assertEqual(age_1); - await expect(300.5).assertEqual(salary_1); - await expect(7).assertEqual(blobType_1[0]); - await expect(8).assertEqual(blobType_1[1]); - await expect(9).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(3).assertEqual(id_1); + expect("wangjing").assertEqual(name_1); + expect(20).assertEqual(age_1); + expect(300.5).assertEqual(salary_1); + expect(7).assertEqual(blobType_1[0]); + expect(8).assertEqual(blobType_1[1]); + expect(9).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -1074,8 +1074,8 @@ describe('rdbStoreUpdateTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = await rdbStore.update(valueBucket, predicates, data_relationalStore.ConflictResolution.ON_CONFLICT_REPLACE); - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) try { @@ -1088,15 +1088,15 @@ describe('rdbStoreUpdateTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(2).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(20).assertEqual(age); - await expect(300.5).assertEqual(salary); - await expect(4).assertEqual(blobType[0]); - await expect(5).assertEqual(blobType[1]); - await expect(6).assertEqual(blobType[2]); + expect(2).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(20).assertEqual(age); + expect(300.5).assertEqual(salary); + expect(4).assertEqual(blobType[0]); + expect(5).assertEqual(blobType[1]); + expect(6).assertEqual(blobType[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateSyncJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateSyncJsunit.test.js index 5abe18e8..77148545 100644 --- a/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateSyncJsunit.test.js +++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreUpdateSyncJsunit.test.js @@ -83,8 +83,8 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("id", "1") let ret = rdbStore.updateSync(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) @@ -96,14 +96,14 @@ describe('rdbStoreUpdateSyncTest', function () { const salary = await resultSet.getDouble(resultSet.getColumnIndex("salary")) const blobType = await resultSet.getBlob(resultSet.getColumnIndex("blobType")) - await expect(1).assertEqual(id); - await expect("lisi").assertEqual(name); - await expect(20).assertEqual(age); - await expect(200.5).assertEqual(salary); - await expect(4).assertEqual(blobType[0]); - await expect(5).assertEqual(blobType[1]); - await expect(6).assertEqual(blobType[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(1).assertEqual(id); + expect("lisi").assertEqual(name); + expect(20).assertEqual(age); + expect(200.5).assertEqual(salary); + expect(4).assertEqual(blobType[0]); + expect(5).assertEqual(blobType[1]); + expect(6).assertEqual(blobType[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -278,8 +278,8 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "xiaoming") let ret = rdbStore.updateSync(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", 20) @@ -287,7 +287,7 @@ describe('rdbStoreUpdateSyncTest', function () { try { expect(true).assertEqual(resultSet.goToFirstRow()) const name = await resultSet.getString(resultSet.getColumnIndex("name")) - await expect(nameStr).assertEqual(name); + expect(nameStr).assertEqual(name); } finally { resultSet.close() resultSet = null @@ -333,15 +333,15 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "xiaohua") let ret = rdbStore.updateSync(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", 19) let resultSet = await rdbStore.query(predicates) try { expect(true).assertEqual(resultSet.goToFirstRow()) const name = await resultSet.getString(resultSet.getColumnIndex("name")) - await expect(nameStr).assertEqual(name); + expect(nameStr).assertEqual(name); } finally { resultSet.close() resultSet = null @@ -387,15 +387,15 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("name", "xiaocan") let ret = rdbStore.updateSync(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", 21) let resultSet = await rdbStore.query(predicates) try { expect(true).assertEqual(resultSet.goToFirstRow()) const name = await resultSet.getString(resultSet.getColumnIndex("name")) - await expect(nameStr).assertEqual(name); + expect(nameStr).assertEqual(name); } finally { resultSet.close() resultSet = null @@ -547,8 +547,8 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = rdbStore.updateSync(valueBucket, predicates) - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) @@ -562,15 +562,15 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -579,14 +579,14 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(3).assertEqual(id_1); - await expect("wangjing").assertEqual(name_1); - await expect(20).assertEqual(age_1); - await expect(300.5).assertEqual(salary_1); - await expect(7).assertEqual(blobType_1[0]); - await expect(8).assertEqual(blobType_1[1]); - await expect(9).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(3).assertEqual(id_1); + expect("wangjing").assertEqual(name_1); + expect(20).assertEqual(age_1); + expect(300.5).assertEqual(salary_1); + expect(7).assertEqual(blobType_1[0]); + expect(8).assertEqual(blobType_1[1]); + expect(9).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -666,15 +666,15 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -683,14 +683,14 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(2).assertEqual(id_1); - await expect("lisi").assertEqual(name_1); - await expect(19).assertEqual(age_1); - await expect(200.5).assertEqual(salary_1); - await expect(4).assertEqual(blobType_1[0]); - await expect(5).assertEqual(blobType_1[1]); - await expect(6).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(2).assertEqual(id_1); + expect("lisi").assertEqual(name_1); + expect(19).assertEqual(age_1); + expect(200.5).assertEqual(salary_1); + expect(4).assertEqual(blobType_1[0]); + expect(5).assertEqual(blobType_1[1]); + expect(6).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } catch (err) { console.log(TAG + `failed, err: ${JSON.stringify(err)}`) expect().assertFail(); @@ -751,8 +751,8 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = rdbStore.updateSync(valueBucket, predicates, data_relationalStore.ConflictResolution.ON_CONFLICT_ROLLBACK); - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) @@ -766,15 +766,15 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -783,14 +783,14 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(3).assertEqual(id_1); - await expect("wangjing").assertEqual(name_1); - await expect(20).assertEqual(age_1); - await expect(300.5).assertEqual(salary_1); - await expect(7).assertEqual(blobType_1[0]); - await expect(8).assertEqual(blobType_1[1]); - await expect(9).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(3).assertEqual(id_1); + expect("wangjing").assertEqual(name_1); + expect(20).assertEqual(age_1); + expect(300.5).assertEqual(salary_1); + expect(7).assertEqual(blobType_1[0]); + expect(8).assertEqual(blobType_1[1]); + expect(9).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -887,15 +887,15 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -904,14 +904,14 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(2).assertEqual(id_1); - await expect("lisi").assertEqual(name_1); - await expect(19).assertEqual(age_1); - await expect(200.5).assertEqual(salary_1); - await expect(4).assertEqual(blobType_1[0]); - await expect(5).assertEqual(blobType_1[1]); - await expect(6).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(2).assertEqual(id_1); + expect("lisi").assertEqual(name_1); + expect(19).assertEqual(age_1); + expect(200.5).assertEqual(salary_1); + expect(4).assertEqual(blobType_1[0]); + expect(5).assertEqual(blobType_1[1]); + expect(6).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -973,8 +973,8 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = rdbStore.updateSync(valueBucket, predicates, data_relationalStore.ConflictResolution.ON_CONFLICT_REPLACE); - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) try { @@ -988,15 +988,15 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(1).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(18).assertEqual(age); - await expect(100.5).assertEqual(salary); - await expect(1).assertEqual(blobType[0]); - await expect(2).assertEqual(blobType[1]); - await expect(3).assertEqual(blobType[2]); + expect(1).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(18).assertEqual(age); + expect(100.5).assertEqual(salary); + expect(1).assertEqual(blobType[0]); + expect(2).assertEqual(blobType[1]); + expect(3).assertEqual(blobType[2]); - await expect(true).assertEqual(resultSet.goToNextRow()) + expect(true).assertEqual(resultSet.goToNextRow()) const id_1 = await resultSet.getLong(resultSet.getColumnIndex("id")) const name_1 = await resultSet.getString(resultSet.getColumnIndex("name")) const age_1 = await resultSet.getLong(resultSet.getColumnIndex("age")) @@ -1005,14 +1005,14 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id_1 + ", name=" + name_1 + ", age=" + age_1 + ", salary=" + salary_1 + ", blobType=" + blobType_1); - await expect(3).assertEqual(id_1); - await expect("wangjing").assertEqual(name_1); - await expect(20).assertEqual(age_1); - await expect(300.5).assertEqual(salary_1); - await expect(7).assertEqual(blobType_1[0]); - await expect(8).assertEqual(blobType_1[1]); - await expect(9).assertEqual(blobType_1[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(3).assertEqual(id_1); + expect("wangjing").assertEqual(name_1); + expect(20).assertEqual(age_1); + expect(300.5).assertEqual(salary_1); + expect(7).assertEqual(blobType_1[0]); + expect(8).assertEqual(blobType_1[1]); + expect(9).assertEqual(blobType_1[2]); + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null @@ -1072,8 +1072,8 @@ describe('rdbStoreUpdateSyncTest', function () { let predicates = new data_relationalStore.RdbPredicates("test") predicates.equalTo("age", "19") let ret = rdbStore.updateSync(valueBucket, predicates, data_relationalStore.ConflictResolution.ON_CONFLICT_REPLACE); - await expect(1).assertEqual(ret); - await console.log(TAG + "update done: " + ret); + expect(1).assertEqual(ret); + console.log(TAG + "update done: " + ret); predicates = new data_relationalStore.RdbPredicates("test") let resultSet = await rdbStore.query(predicates) try { @@ -1086,15 +1086,15 @@ describe('rdbStoreUpdateSyncTest', function () { console.log(TAG + "{id=" + id + ", name=" + name + ", age=" + age + ", salary=" + salary + ", blobType=" + blobType); - await expect(2).assertEqual(id); - await expect("zhangsan").assertEqual(name); - await expect(20).assertEqual(age); - await expect(300.5).assertEqual(salary); - await expect(4).assertEqual(blobType[0]); - await expect(5).assertEqual(blobType[1]); - await expect(6).assertEqual(blobType[2]); + expect(2).assertEqual(id); + expect("zhangsan").assertEqual(name); + expect(20).assertEqual(age); + expect(300.5).assertEqual(salary); + expect(4).assertEqual(blobType[0]); + expect(5).assertEqual(blobType[1]); + expect(6).assertEqual(blobType[2]); - await expect(false).assertEqual(resultSet.goToNextRow()) + expect(false).assertEqual(resultSet.goToNextRow()) } finally { resultSet.close() resultSet = null -- Gitee