!6803 Distributeddatamgr】【master】monthly_20221018分支代码回合；替换p7b文件

Merge pull request !6803 from yanglifeng/master

distributeddatamgr/dataObjectjstest/hap/src/main/config.json

@@ -17,7 +17,8 @@
         "name": ".entry",
         "mainAbility": ".MainAbility",
         "deviceType": [
-      "default",
+            "default",
+            "tablet",
             "phone"
         ],
         "distro": {

distributeddatamgr/dataSharejstest/hap/src/main/config.json

@@ -16,8 +16,8 @@
         "package": "ohos.acts.dataSharejstest",
         "name": ".entry",
         "deviceType": [
-      "tablet",
-      "default",
+            "default",
+            "tablet",
             "phone"
         ],
         "distro": {

distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/config.json

@@ -18,8 +18,9 @@
     "mainAbility": ".MainAbility",
     "srcPath":"",
     "deviceType": [
-      "default",
-      "phone"
+        "default",
+        "tablet",
+        "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -92,4 +93,4 @@
         "srcPath": "TestRunner"
     }
   }
-}
\ No newline at end of file
+}

distributeddatamgr/preferencesjstest/hap/src/main/config.json

@@ -16,9 +16,9 @@
         "package": "ohos.acts.preferencesjstest",
         "name": ".entry",
         "deviceType": [
-      "tablet",
-      "default",
-            "phone"
+           "tablet",
+           "default",
+           "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json

@@ -16,8 +16,9 @@
         "package": "ohos.acts.relationalStorejstest",
         "name": ".entry",
         "deviceType": [
-           "tablet",
-           "default"
+      "tablet",
+      "default",
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,
@@ -91,4 +92,4 @@
         "mainAbility": ".MainAbility",
         "srcPath": ""
     }
-}
+}
\ No newline at end of file

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/List.test.js

@@ -12,35 +12,35 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-// import rdbStoreBackupRestoreCallbackTest from './RdbstoreBackupRestoreCallbackJsunit.test.js'
-// import rdbStoreBackupRestoreWithFAContextTest from './RdbstoreBackupRestoreWithFAContextJsunit.test.js'
-// import rdbStoreDeleteTest from './RdbstoreDeleteJsunit.test.js'
+import rdbStoreBackupRestoreCallbackTest from './RdbstoreBackupRestoreCallbackJsunit.test.js'
+import rdbStoreBackupRestoreWithFAContextTest from './RdbstoreBackupRestoreWithFAContextJsunit.test.js'
+import rdbStoreDeleteTest from './RdbstoreDeleteJsunit.test.js'
 import rdbStoreDistributedTest from './RdbStoreDistributedJsunit.test.js'
-// import rdbstoreInsertTest from './RdbstoreInsertJsunit.test.js'
-// import rdbStorePredicatesJoinTest from './RdbstorePredicatesJoinJsunit.test.js'
-// import rdbPredicatesTest from './RdbstorePredicatesJsunit.test.js'
-// import rdbStoreTest from './RdbstoreRdbstoreJsunit.test.js'
+import rdbstoreInsertTest from './RdbstoreInsertJsunit.test.js'
+import rdbStorePredicatesJoinTest from './RdbstorePredicatesJoinJsunit.test.js'
+import rdbPredicatesTest from './RdbstorePredicatesJsunit.test.js'
+import rdbStoreTest from './RdbstoreRdbstoreJsunit.test.js'
 import rdbResultSetTest from './RdbStoreResultSetJsunit.test.js'
-// import rdbstoreStoreExcuteSqlTest from './RdbstoreStoreExcuteSqlJsunit.test.js'
-// import rdbstoreTransactionTest from './RdbstoreTransactionJsunit.test.js'
-// import rdbStoreUpdateTest from './RdbstoreUpdateJsunit.test.js'
-// import rdbstoreQueryTest from './RdbstoreQuery.test.js'
-// import rdbStoreEncryptionTest from './RdbstoreEncryptionJsunit.test.js'
-// import rdbStorePredicatesComplexFiledTest from './RdbstorePredicatesComplexFiledJsunit.test.js'
+import rdbstoreStoreExcuteSqlTest from './RdbstoreStoreExcuteSqlJsunit.test.js'
+import rdbstoreTransactionTest from './RdbstoreTransactionJsunit.test.js'
+import rdbStoreUpdateTest from './RdbstoreUpdateJsunit.test.js'
+import rdbstoreQueryTest from './RdbstoreQuery.test.js'
+import rdbStoreEncryptionTest from './RdbstoreEncryptionJsunit.test.js'
+import rdbStorePredicatesComplexFiledTest from './RdbstorePredicatesComplexFiledJsunit.test.js'
 export default function testsuite() {
-    // rdbStoreBackupRestoreCallbackTest()
-    // rdbStoreBackupRestoreWithFAContextTest()
-    // rdbStoreDeleteTest()
+    rdbStoreBackupRestoreCallbackTest()
+    rdbStoreBackupRestoreWithFAContextTest()
+    rdbStoreDeleteTest()
     rdbStoreDistributedTest()
-    // rdbstoreInsertTest()
-    // rdbStorePredicatesJoinTest()
-    // rdbPredicatesTest()
-    // rdbStoreTest()
+    rdbstoreInsertTest()
+    rdbStorePredicatesJoinTest()
+    rdbPredicatesTest()
+    rdbStoreTest()
     rdbResultSetTest()
-    // rdbstoreStoreExcuteSqlTest()
-    // rdbstoreTransactionTest()
-    // rdbStoreUpdateTest()
-    // rdbstoreQueryTest()
-    // rdbStoreEncryptionTest()
-    // rdbStorePredicatesComplexFiledTest()
+    rdbstoreStoreExcuteSqlTest()
+    rdbstoreTransactionTest()
+    rdbStoreUpdateTest()
+    rdbstoreQueryTest()
+    rdbStoreEncryptionTest()
+    rdbStorePredicatesComplexFiledTest()
 }

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbStoreDistributedJsunit.test.js

@@ -13,19 +13,63 @@
  * limitations under the License.
  */
 
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium';
 import dataRdb from '@ohos.data.rdb';
 import abilityFeatureAbility from '@ohos.ability.featureAbility';
 
 let context = abilityFeatureAbility.getContext();
+var sqlStatement = "CREATE TABLE IF NOT EXISTS employee (" +
+"id INTEGER PRIMARY KEY AUTOINCREMENT," +
+"name TEXT NOT NULL," +"age INTEGER)"
+sqlStatement = "CREATE TABLE IF NOT EXISTS product (" +
+"id INTEGER PRIMARY KEY AUTOINCREMENT," +
+"name TEXT NOT NULL," +"price REAL," +
+"vendor INTEGER," +"describe TEXT)"
 const TAG = "[RDB_JSKITS_TEST_Distributed]"
 const STORE_NAME = "distributed_rdb.db"
 var rdbStore = undefined;
+const config = {
+    "name": STORE_NAME,
+}
+
+async function executeSql1() {
+    let sqlStatement = "CREATE TABLE IF NOT EXISTS employee (" +
+    "id INTEGER PRIMARY KEY AUTOINCREMENT," +
+    "name TEXT NOT NULL," +
+    "age INTEGER)"
+try {
+    await rdbStore.executeSql(sqlStatement, null)
+    console.info(TAG + "create table employee success")
+} catch (err) {
+    console.info(TAG + "create table employee failed")
+    expect(null).assertFail()
+}
+}
+
+async function executeSql2() {
+    let sqlStatement = "CREATE TABLE IF NOT EXISTS product (" +
+    "id INTEGER PRIMARY KEY AUTOINCREMENT," +
+    "name TEXT NOT NULL," +
+    "price REAL," +
+    "vendor INTEGER," +
+    "describe TEXT)"
+try {
+    await rdbStore.executeSql(sqlStatement, null)
+    console.info(TAG + "create table product success")
+} catch (err) {
+    console.info(TAG + "create table product failed")
+    expect(null).assertFail()
+}
+}
 
 export default function rdbStoreDistributedTest() {
 describe('rdbStoreDistributedTest', function () {
     beforeAll(async function () {
         console.info(TAG + 'beforeAll')
+        rdbStore = await dataRdb.getRdbStore(config, 1);
+        console.info(TAG + "create rdb store success")
+        await executeSql1()
+        await executeSql2()
     })
 
     beforeEach(async function () {
@@ -43,53 +87,6 @@ describe('rdbStoreDistributedTest', function () {
 
     console.info(TAG + "*************Unit Test Begin*************");
 
-    /**
-     * @tc.name rdb open test
-     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_001
-     * @tc.desc rdb open test
-     */
-    it('testRdbStoreDistributed0001', 0, async function (done) {
-        console.info(TAG + "************* testRdbStoreDistributed001 start *************");
-        const config = {
-            "name": STORE_NAME,
-        }
-        try {
-            rdbStore = await dataRdb.getRdbStore(config, 1);
-            console.info(TAG + "create rdb store success")
-            expect(rdbStore).assertEqual(rdbStore)
-            let sqlStatement = "CREATE TABLE IF NOT EXISTS employee (" +
-                "id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "name TEXT NOT NULL," +
-                "age INTEGER)"
-            try {
-                await rdbStore.executeSql(sqlStatement, null)
-                console.info(TAG + "create table employee success")
-            } catch (err) {
-                console.info(TAG + "create table employee failed")
-                expect(null).assertFail()
-            }
-
-            sqlStatement = "CREATE TABLE IF NOT EXISTS product (" +
-                "id INTEGER PRIMARY KEY AUTOINCREMENT," +
-                "name TEXT NOT NULL," +
-                "price REAL," +
-                "vendor INTEGER," +
-                "describe TEXT)"
-            try {
-                await rdbStore.executeSql(sqlStatement, null)
-                console.info(TAG + "create table product success")
-            } catch (err) {
-                console.info(TAG + "create table product failed")
-                expect(null).assertFail()
-            }
-        } catch (err) {
-            console.info(TAG + "create rdb store failed")
-            expect(null).assertFail()
-        }
-        done()
-        console.info(TAG + "************* testRdbStoreDistributed001 end *************");
-    })
-
     /**
      * @tc.name set_distributed_table_none_table
      * @tc.number SUB_DDM_AppDataFWK_JSRDB_Distributed_002
@@ -163,7 +160,7 @@ describe('rdbStoreDistributedTest', function () {
             console.info(TAG + "insert one record success " + rowId)
             expect(1).assertEqual(rowId)
         } catch (err) {
-            console.info(TAG + "insert one record failed");
+            console.info(TAG + "insert one record failed" + err);
             expect(null).assertFail();
         }
         done()
@@ -189,7 +186,7 @@ describe('rdbStoreDistributedTest', function () {
                 console.info(TAG + "update one record success " + rowId)
                 expect(1).assertEqual(rowId)
             } catch (err) {
-                console.info(TAG + "update one record failed");
+                console.info(TAG + "update one record failed" + err);
                 expect(null).assertFail();
             }
         } catch (err) {

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreEncryptionJsunit.test.js

@@ -94,7 +94,7 @@ describe('rdbEncryptTest', function () {
             console.info(TAG + 'afterAll')
         })
 
-        console.log(TAG + "*************Unit Test Begin*************")
+        console.info(TAG + "*************Unit Test Begin*************")
 
         /**
          * @tc.name RDB encrypted test
@@ -102,23 +102,15 @@ 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.info(TAG + "************* RdbEncryptTest_0010 start *************")
             context = ability_featureAbility.getContext()
-            let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT, 1);
-            storePromise.then(async (store) => {
-                try {
-                    await console.log(TAG + "getRdbStore done: " + store);
-                } catch (err) {
-                    expect(null).assertFail();
-                }
+            data_rdb.getRdbStore(context, STORE_CONFIG_ENCRYPT, 1).then((store) => {
+                done()
+                expect(store != null).assertTrue();
             }).catch((err) => {
                 expect(null).assertFail();
             })
-            await storePromise
-            storePromise = null
-
-            done()
-            await console.log(TAG + "************* RdbEncryptTest_0010 end *************")
+            console.info(TAG + "************* RdbEncryptTest_0010 end *************")
         })
 
         /**
@@ -127,23 +119,17 @@ 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.info(TAG + "************* RdbEncryptTest_0020 start *************")
             context = ability_featureAbility.getContext()
             let storePromise = data_rdb.getRdbStore(context, STORE_CONFIG_UNENCRYPT, 1);
-            storePromise.then(async (store) => {
-                try {
-                    await console.log(TAG + "getRdbStore done: " + store);
-                } catch (err) {
-                    expect(null).assertFail();
-                }
+            storePromise.then((store) => {
+                expect(store != null).assertTrue();
+                done()
             }).catch((err) => {
                 expect(null).assertFail();
             })
-            await storePromise
-            storePromise = null
-
-            done()
-            await console.log(TAG + "************* RdbEncryptTest_0020 end *************")
+            
+            console.info(TAG + "************* RdbEncryptTest_0020 end *************")
         })
 
 
@@ -153,14 +139,14 @@ describe('rdbEncryptTest', function () {
          * @tc.desc RDB Encrypt function test
          */
         it('RdbEncryptTest_0030', 0, async function (done) {
-            await console.log(TAG + "************* RdbEncryptTest_0030 start *************")
+            console.info(TAG + "************* RdbEncryptTest_0030 start *************")
             context = ability_featureAbility.getContext()
             rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT)
             let predicates = new data_rdb.RdbPredicates("test")
             predicates.equalTo("name", "zhangsan")
             let resultSet = await rdbStore.query(predicates)
             try {
-                console.log(TAG + "After restore resultSet query done")
+                console.info(TAG + "After restore resultSet query done")
                 expect(true).assertEqual(resultSet.goToFirstRow())
                 const id = resultSet.getLong(resultSet.getColumnIndex("id"))
                 const name = resultSet.getString(resultSet.getColumnIndex("name"))
@@ -174,7 +160,7 @@ describe('rdbEncryptTest', function () {
             resultSet = null
             rdbStore = null
             done()
-            await console.log(TAG + "************* RdbEncryptTest_0030 end *************")
+            console.info(TAG + "************* RdbEncryptTest_0030 end *************")
         })
 
         /**
@@ -183,7 +169,7 @@ describe('rdbEncryptTest', function () {
          * @tc.desc RDB Encrypt function test
          */
         it('RdbEncryptTest_0040', 0, async function (done) {
-            await console.log(TAG + "************* RdbEncryptTest_0040 start *************")
+            console.info(TAG + "************* RdbEncryptTest_0040 start *************")
             context = ability_featureAbility.getContext()
             rdbStore = await CreatRdbStore(context, STORE_CONFIG_ENCRYPT)
             rdbStore = null
@@ -191,9 +177,9 @@ describe('rdbEncryptTest', function () {
             expect(rdbStore).assertNull
 
             done()
-            await console.log(TAG + "************* RdbEncryptTest_0040 end *************")
+            console.info(TAG + "************* RdbEncryptTest_0040 end *************")
         })
-        console.log(TAG + "*************Unit Test End*************")
+        console.info(TAG + "*************Unit Test End*************")
     }
 )
 

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/js/test/RdbstoreQuery.test.js

@@ -12,23 +12,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium';
 import dataRdb from '@ohos.data.rdb';
-import factory from '@ohos.data.distributedData'
-import abilityFeatureAbility from '@ohos.ability.featureAbility'
+import factory from '@ohos.data.distributedData';
+import abilityFeatureAbility from '@ohos.ability.featureAbility';
 
 const TAG = "[RDB_JSKITS_TEST]"
 const CREATE_TABLE_TEST = "CREATE TABLE IF NOT EXISTS test (" + "id INTEGER PRIMARY KEY AUTOINCREMENT, "
     + "name TEXT NOT NULL, " + "age INTEGER, " + "salary REAL, " + "blobType BLOB)"
-const DATABASE_DIR = "/data/storage/el2/database/entry/rdb/"
 const STORE_CONFIG = {
     name: "Query.db",
 }
 const TEST_BUNDLE_NAME="ohos.acts.relationalStorejstest"
 
-var kvManager = null;
-var kvStore = null;
-var localDeviceId = null;
+var kvManager = null
+var kvStore = null
+var localDeviceId = null
 var rdbStore
 let context = abilityFeatureAbility.getContext()
 

distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts

@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-import AbilityStage from "@ohos.app.ability.AbilityStage"
+import AbilityStage from "@ohos.application.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts

@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-import Ability from '@ohos.app.ability.UIAbility'
+import Ability from '@ohos.application.Ability'
 import dataShare from '@ohos.data.dataShare'
 import rpc from "@ohos.rpc";
 
@@ -111,7 +111,7 @@ export default class MainAbility extends Ability {
         console.log("[ttt] [DataShareTest] <<Consumer>> MainAbility onWindowStageCreate")
         globalThis.abilityContext = this.context;
         let context = this.context;
-        dseConnectionId = context.connectServiceExtensionAbility(dseWant, dseConnect);
+        dseConnectionId = context.connectAbility(dseWant, dseConnect);
         globalThis.connectDataShareExtAbility = (async () => {
             console.log("[ttt] [DataShareTest] <<Consumer>> connectDataShareExtAbility begin");
             await dataShare.createDataShareHelper(globalThis.abilityContext, dseUri, (err,data)=>{
@@ -122,7 +122,7 @@ export default class MainAbility extends Ability {
                 console.info("[ttt] [DataShareTest] <<Consumer>> ----- 3 -----, err = " + err);
                 console.info("[ttt] [DataShareTest] <<Consumer>> ----- 4 -----, JSON.stringify(err) = " + JSON.stringify(err));
             });
-            dseConnectionId = await context.connectServiceExtensionAbility(dseWant, dseConnect);
+            dseConnectionId = await context.connectAbility(dseWant, dseConnect);
         })
         windowStage.setUIContent(this.context, "MainAbility/pages/index", null)
     }

distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Ability from '@ohos.app.ability.UIAbility'
+import Ability from '@ohos.application.Ability'
 
 export default class TestAbility extends Ability {
     onCreate(want, launchParam) {

distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/module.json

@@ -8,8 +8,9 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default",
-      "tablet"
+        "default",
+        "tablet",
+        "phone"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,