!3510 Add the wait interface test cases of the atomics project

Merge pull request !3510 from jiangkai43/master

compileruntime/BUILD.gn

@@ -16,6 +16,7 @@ group("compileruntime") {
   testonly = true
   if (is_standard_system) {
     deps = [
+      "atomics_lib_standard:atomics_js_hap",
       "containerLine_lib_standard:containerLine_js_test",
       "containerRelation_lib_standard:containerRelation_js_test",
       "convertxml_lib_standard:convertxml_js_test",

compileruntime/atomics_lib_standard/BUILD.gn

+# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("atomics_js_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":atomics_js_assets",
+    ":atomics_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsAtomicsJSTest"
+}
+ohos_js_assets("atomics_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("atomics_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

compileruntime/atomics_lib_standard/Test.json

+{
+    "description": "Configuration for startup atomics js api Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "800000",
+        "package": "com.example.atomicsxts",
+        "shell-timeout": "90000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ActsAtomicsJSTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/config.json

+{
+  "app": {
+    "bundleName": "com.example.atomicsxts",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.atomicsxts",
+    "name": ".MyApplication",
+    "mainAbility": "com.example.atomicsxts.MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+	"visible": true,
+        "orientation": "unspecified",
+        "name": "com.example.atomicsxts.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index",
+          "pages/second/second"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/js/default/app.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default {
+    onCreate() {
+        console.info("Application onCreate");
+    },
+    onDestroy() {
+        console.info("Application onDestroy");
+    }
+};

compileruntime/atomics_lib_standard/src/main/js/default/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World",
+    "page": "Second Page",
+    "next": "Next Page",
+    "back": "Back"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/js/default/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界",
+    "page": "第二页",
+    "next": "下一页",
+    "back": "返回"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.css

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+.btn {
+    width: 50%;
+    height: 100px;
+    font-size: 40px;
+}

compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.hml

+<!--
+    Copyright (C) 2022 Huawei Device Co., Ltd.
+    Licensed under the Apache License, Version 2.0 (the 'License');
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an 'AS IS' BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<div class="container" onswipe="touchMove">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+    <input class="btn" type="button" value="{{ $t('strings.next') }}" onclick="onclick"></input>
+</div>

compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import app from '@system.app'
+import device from '@system.device'
+import router from '@system.router'
+import {Core, Constant, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
+
+
+export default {
+    data: {
+        title: ''
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    },
+    onShow() {
+        console.info('onShow finish')
+        const core = Core.getInstance()
+        core.init()
+        require('../../../test/List.test')
+        core.execute()
+    },
+    touchMove(e) {
+        if (e.direction === 'right') {
+            this.appExit();
+        }
+    },
+    appExit() {
+        app.terminate()
+    }
+}
+
+

compileruntime/atomics_lib_standard/src/main/js/default/workers/worker010.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License')
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import worker from '@ohos.worker';
+const parentPort = worker.parentPort;
+
+parentPort.onmessage = function(e) {
+    var int32 = e.data
+    parentPort.postMessage("success")
+    console.info("wait expect 'ok': " + Atomics.wait(int32, 0, 0));
+    parentPort.postMessage("end")
+}

compileruntime/atomics_lib_standard/src/main/js/default/workers/worker011.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License')
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import worker from '@ohos.worker';
+const parentPort = worker.parentPort;
+
+parentPort.onmessage = function(e) {
+    let begTime = new Date().getTime();
+    var int32 = e.data
+    parentPort.postMessage("success")
+    console.info("wait expect 'timed-out' : " + Atomics.wait(int32, 1, 0, 3000));
+    let endTime = new Date().getTime();
+    if(endTime - begTime < 3000) {
+        parentPort.postMessage("end1")
+    } else {
+        parentPort.postMessage("end2")
+    }
+}

compileruntime/atomics_lib_standard/src/main/js/default/workers/worker012.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License')
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import worker from '@ohos.worker';
+const parentPort = worker.parentPort;
+
+parentPort.onmessage = function(e) {
+    var int32 = e.data
+    parentPort.postMessage("success")
+    console.info("wait expect 'not-equal': " + Atomics.wait(int32, 2, 2));
+    parentPort.postMessage("end")
+}
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/js/default/workers/worker020.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License')
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import worker from '@ohos.worker';
+const parentPort = worker.parentPort;
+
+parentPort.onmessage = function(e) {
+    var int32 = e.data
+    parentPort.postMessage("wait")
+    Atomics.wait(int32, 0, 0);
+    Atomics.add(int32, 0 ,1);
+    Atomics.load(int32, 0);
+    parentPort.postMessage(int32[0])
+}
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/js/default/workers/worker030.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License')
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import worker from '@ohos.worker';
+const parentPort = worker.parentPort;
+
+parentPort.onmessage = function(e) {
+    const int32 = new Uint32Array(e.data);
+    for (let i = 0; i < 10; ++i) {
+        Atomics.add(int32, 0, 1);
+    }
+    parentPort.postMessage("03")
+}

compileruntime/atomics_lib_standard/src/main/js/default/workers/worker031.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License')
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import worker from '@ohos.worker';
+const parentPort = worker.parentPort;
+
+parentPort.onmessage = function(e) {
+    const int32 = new Uint32Array(e.data);
+    for (let i = 0; i < 10; ++i) {
+        Atomics.add(int32, 0, 1);
+    }
+    parentPort.postMessage("031")
+}

compileruntime/atomics_lib_standard/src/main/js/test/Atomics.test.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License')
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @ts-nocheck
+import app from '@system.app'
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
+import worker from "@ohos.worker"
+
+describe('workerTest', function () {
+
+    afterAll(function () {
+        console.info('total case over')
+    })
+
+    function promiseCase() {
+        let p = new Promise(function (resolve, reject) {
+            setTimeout(function () {
+                resolve()
+            }, 50)
+        }).then(undefined, (error) => {
+        })
+        return p
+    }
+
+    it('testNotify001', 0, async function (done) {
+        var sab = new SharedArrayBuffer(20);
+        var int32 = new Int32Array(sab);
+        var flag = false
+        var res = 0;
+        var res1 = 0;
+        let ss = new worker.Worker("workers/worker010.js")
+        let tt = new worker.Worker("workers/worker011.js")
+        let uu = new worker.Worker("workers/worker012.js")
+
+        ss.onmessage = function (e) {
+            if(e.data == "end") {
+                res++
+            }
+            flag = true
+        }
+        tt.onmessage = function (e) {
+            if(e.data == "end1") {
+                res1++
+            }
+            if(e.data == "end2")
+            {
+                res1 += 5;
+            }
+            flag = true
+        }
+        uu.onmessage = function (e) {
+            if(e.data == end) {
+                flag = true
+            }
+        }
+
+        ss.onexit = function() {
+            flag = true
+        }
+        tt.onexit = function() {
+            flag = true
+        }
+        uu.onexit = function() {
+            flag = true
+        }
+        
+        ss.postMessage(int32);
+        while(!flag) {
+            await promiseCase()
+        }
+        flag = false
+        tt.postMessage(int32);
+        while(!flag) {
+            await promiseCase()
+        }
+        flag = false
+        uu.postMessage(int32);
+        while(!flag) {
+            await promiseCase()
+        }
+
+        Atomics.notify(int32, 0, 1)
+        Atomics.notify(int32, 2, 1)
+        while(res == 0 || res1 == 0){
+            await promiseCase();
+        }
+
+        flag = false
+        ss.terminate()
+        while(!flag){
+            await promiseCase();
+        }
+        flag = false
+        tt.terminate()
+        while(!flag){
+            await promiseCase();
+        } 
+        flag = false
+        uu.terminate()
+        while(!flag){
+            await promiseCase();
+        }
+
+        expect(res).assertEqual(1)
+        expect(res1).assertEqual(5)
+        done()
+    })
+
+    it('testWait001', 0, async function (done) {
+        var sab = new SharedArrayBuffer(20);
+        var flag = false;
+        var int32 = new Int32Array(sab);
+		var res = 0;
+        const ss = new worker.Worker("workers/worker020.js")
+
+        ss.onmessage = function(e){
+            if (e.data != 'wait'){
+                res = e.data
+            }
+            flag = true
+        }
+
+        ss.onexit = function() {
+            flag = true
+        }
+
+        ss.postMessage(int32);
+        while(!flag){
+            await promiseCase();
+        }
+
+        flag = false
+        Atomics.store(int32, 0, 2);
+        Atomics.load(int32, 0);
+        Atomics.notify(int32, 0, 1)
+        while(!flag){
+            await promiseCase();
+        }
+        
+        flag = false
+        ss.terminate()
+        while(!flag){
+            await promiseCase();
+        }
+
+        expect(res).assertEqual(3)
+        done()
+    })
+
+    it('testAdd001', 0, async function (done) {
+        var sab = new SharedArrayBuffer(20);
+        var int32 = new Uint32Array(sab);
+        int32[0] = 1
+        var flag = false
+        var count = 0
+        let ss = new worker.Worker("workers/worker030.js")
+        let tt = new worker.Worker("workers/worker031.js")
+
+        ss.onmessage = function() {
+            count += 1
+        }
+        tt.onmessage = function() {
+            count += 1
+        }
+
+        ss.onexit = function() {
+            flag = true
+        }
+        tt.onexit = function() {
+            flag = true
+        }
+
+        ss.postMessage(sab);
+        tt.postMessage(sab);
+        while(count != 2) {
+            await promiseCase();
+        }
+    
+        flag = false
+        ss.terminate()
+        while(!flag){
+            await promiseCase();
+        }
+        flag = false
+        tt.terminate()
+        while(!flag){
+            await promiseCase();
+        }
+    
+        expect(int32[0]).assertEqual(21)
+        done()
+    })
+})
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/js/test/List.test.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require('./Atomics.test.js')
\ No newline at end of file

compileruntime/atomics_lib_standard/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "entry_MainAbility"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Empty Ability"
+    }
+  ]
+}
\ No newline at end of file