修改gn格式相关问题

Signed-off-by: Nhu0475 <huyanqiang5@huawei.com>

distributeddatamgr/BUILD.gn

@@ -16,8 +16,8 @@ group("distributeddatamgr") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "crossplatform/relationalstoreetstest:relationalStore_ets_test",
       "crossplatform/preferencesetstest:preferences_ets_test",
+      "crossplatform/relationalstoreetstest:relationalStore_ets_test",
       "dataObjectjstest/hap:dataObject_js_test",
       "dataSharejstest/hap:dataShare_js_test",
       "distributedKVStoretest:distributedKVStoretest",

distributeddatamgr/crossplatform/preferencesetstest/BUILD.gn

@@ -21,6 +21,7 @@ ohos_js_hap_suite("preferences_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "preferences_ets_test"
   subsystem_name = "distributeddatamgr"
@@ -29,6 +30,7 @@ ohos_js_hap_suite("preferences_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -39,8 +41,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

distributeddatamgr/crossplatform/relationalstoreetstest/BUILD.gn

@@ -21,6 +21,7 @@ ohos_js_hap_suite("relationalStore_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "relationalStore_ets_test"
   subsystem_name = "distributeddatamgr"
@@ -29,6 +30,7 @@ ohos_js_hap_suite("relationalStore_ets_test") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -39,8 +41,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}

distributeddatamgr/crossplatform/relationalstoreetstest/src/main/ets/test/RdbStoreBackupRestore.test.ets

@@ -212,29 +212,29 @@ export default function RdbStoreBackupRestoreCallbackTest() {
       console.info(TAG + "************* testRdbStoreBackup001 end *************");
     });
 
-    // /**
-    //  * @tc.number : TEST_RDB_STORE_BACKUP_002
-    //  * @tc.name   : testRdbStoreBackup002
-    //  * @tc.desc   : RdbStore backup callback test
-    //  * @tc.size   : MediumTest
-    //  * @tc.type   : Function
-    //  * @tc.level  : Level 2
-    //  */
-    // it("testRdbStoreBackup002", 0, async function (done) {
-    //   console.info(TAG + "************* testRdbStoreBackup002 start *************");
-    //   try {
-    //     RdbStore.backup(STORE_CONFIG.name, async (err) => {
-    //       console.info(TAG + "backup err ttt:  " + err.message + "code:  " + err.code);
-    //       expect(err.code == 14800011 && err.message == "Failed to open database by database corrupted").assertTrue();
-    //       done();
-    //     });
-    //   } catch (errInfo) {
-    //     console.info(TAG + "testRdbStoreBackup002 error: " + errInfo);
-    //     expect().assertFail();
-    //     done();
-    //   }
-    //   console.info(TAG + "************* testRdbStoreBackup002 end *************");
-    // });
+    /**
+     * @tc.number : TEST_RDB_STORE_BACKUP_002
+     * @tc.name   : testRdbStoreBackup002
+     * @tc.desc   : RdbStore backup callback test
+     * @tc.size   : MediumTest
+     * @tc.type   : Function
+     * @tc.level  : Level 2
+     */
+    it("testRdbStoreBackup002", 0, async function (done) {
+      console.info(TAG + "************* testRdbStoreBackup002 start *************");
+      try {
+        RdbStore.backup(STORE_CONFIG.name, async (err) => {
+          console.info(TAG + "backup err ttt:  " + err.message + "code:  " + err.code);
+          expect(err.code == 14800011 && err.message == "Failed to open database by database corrupted").assertTrue();
+          done();
+        });
+      } catch (errInfo) {
+        console.info(TAG + "testRdbStoreBackup002 error: " + errInfo);
+        expect().assertFail();
+        done();
+      }
+      console.info(TAG + "************* testRdbStoreBackup002 end *************");
+    });
 
     /**
      * @tc.number : TEST_RDB_STORE_BACKUP_003

distributeddatamgr/crossplatform/relationalstoreetstest/src/main/ets/test/RdbStoreUpdate.test.ets

@@ -136,7 +136,7 @@ export default function rdbStoreUpdateTest() {
         rdbStore.update(emptyBucket, predicates, async (err, rows) => {
           if (err) {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code 14800006").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is 6").assertTrue();
             console.info(TAG + "update with wrong valueBucket");
             done();
           }
@@ -171,7 +171,7 @@ export default function rdbStoreUpdateTest() {
         rdbStore.update(valueBucket, predicates, async (err, rows) => {
           if (err) {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code -1").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is -1").assertTrue();
             console.info(TAG + "update with wrong condition");
             done();
           }
@@ -207,7 +207,7 @@ export default function rdbStoreUpdateTest() {
         rdbStore.update(valueBucket, predicates, async (err, rows) => {
           if (err) {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code -1").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is -1").assertTrue();
             console.info(TAG + "update with wrong table name");
             done();
           }
@@ -243,7 +243,7 @@ export default function rdbStoreUpdateTest() {
         rdbStore.update(valueBucket, predicates, async (err, rows) => {
           if (err) {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code -1").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is -1").assertTrue();
             console.info(TAG + "update with wrong column name");
             done();
           }
@@ -323,7 +323,7 @@ export default function rdbStoreUpdateTest() {
           })
           .catch((err) => {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code 14800006").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is 6").assertTrue();
             console.info(TAG + "update with wrong valueBucket");
             done();
           });
@@ -360,7 +360,7 @@ export default function rdbStoreUpdateTest() {
           })
           .catch((err) => {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code -1").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is -1").assertTrue();
             console.info(TAG + "update with wrong condition");
             done();
           });
@@ -398,7 +398,7 @@ export default function rdbStoreUpdateTest() {
           })
           .catch((err) => {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code -1").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is -1").assertTrue();
             console.info(TAG + "update with null table name");
             done();
           });
@@ -436,7 +436,7 @@ export default function rdbStoreUpdateTest() {
           })
           .catch((err) => {
             console.error(`Updated failed, code is ${err.code},message is ${err.message}`);
-            expect(err.code == 14800000 && err.message == "Inner error. Error code -1").assertTrue();
+            expect(err.code == 14800000 && err.message == "Inner error. Inner code is -1").assertTrue();
             console.info(TAG + "update with wrong column name");
             done();
           });