Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
9 个月 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 8896fd8e 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!2141 修改Worker.test.js关于Worker的用例。 

Merge pull request !2141 from 杜文博/OpenHarmony-3.0-LTS
上级 c70620d2 6a25154a
隐藏空白更改
内联 并排
Showing with 109 addition and 246 deletion
compileruntime/BUILD.gn
浏览文件 @ 8896fd8e
......@@ -19,7 +19,7 @@ group("compileruntime") {
"process_lib_standard:process_js_test",
"url_lib_standard:url_js_test",
"util_lib_standard:util_js_test",
"worker_lib_standard:worker_js_hap",
# "worker_lib_standard:worker_js_hap",
]
}
}
compileruntime/worker_lib_standard/Test.json
浏览文件 @ 8896fd8e
......@@ -2,9 +2,9 @@
"description": "Configuration for startup worker js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "60000",
"test-timeout": "800000",
"package": "com.example.workerxts",
"shell-timeout": "60000"
"shell-timeout": "90000"
},
"kits": [
{
......
compileruntime/worker_lib_standard/src/main/config.json
浏览文件 @ 8896fd8e
......@@ -37,6 +37,7 @@
]
}
],
"visible": true,
"orientation": "unspecified",
"name": "com.example.workerxts.MainAbility",
"icon": "$media:icon",
......
compileruntime/worker_lib_standard/src/main/js/default/workers/worker.js
浏览文件 @ 8896fd8e
......@@ -13,54 +13,44 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
function foo(x) {return x}
var worker = globalThis.requireNapi('worker');
const parentPort = worker.parentPort;
console.info("worker:: new version")
parentPort.onclose = function() {
console.info("worker::worker.js onclose");
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
console.info("worker:: new version")
parentPort.onclose = function() {
console.info("worker::worker.js onclose");
}
parentPort.onmessage = function(e) {
var data = e.data;
console.info("worker:: worker thread worker data is " + data.data);
switch(data.type) {
case "normal":
console.info("worker:: worker thread receive data " + data.data);
parentPort.postMessage(data);
console.info("worker:: worker thread post back");
break;
case "error":
throw new Error("123");
break;
case "buffer":
console.info("worker:: worker.js receive buffer length is " + data.data.byteLength);
parentPort.postMessage(data, [data.data]);
console.info("worker:: worker.js post buffer length is " + data.data.byteLength);
break;
default:
console.info("worker:: worker.js receive unknow type");
break
}
}
parentPort.onmessage = function(e) {
var data = e.data;
console.info("worker:: worker thread worker data is " + data.data);
switch(data.type) {
case "normal":
console.info("worker:: worker thread receive data " + data.data);
parentPort.postMessage(data);
console.info("worker:: worker thread post back");
break;
case "error":
throw new Error("123");
break;
case "buffer":
console.info("worker:: worker.js receive buffer length is " + data.data.byteLength);
parentPort.postMessage(data, [data.data]);
console.info("worker:: worker.js post buffer length is " + data.data.byteLength);
break;
default:
console.info("worker:: worker.js receive unknow type");
break
}
}
// 反序列错误
parentPort.onmessageerror = function() {
console.info("worker:: worker.js onmessageerror");
}
// 反序列错误
parentPort.onmessageerror = function() {
console.info("worker:: worker.js onmessageerror");
}
// js执行异常
parentPort.onerror = function(data) {
console.info("worker:: worker.js onerror " + data.lineno + ", msg = " + data.message + ", filename = " + data.filename + ", colno = " + data.colno);
}
/******/ })()
;
\ No newline at end of file
// js执行异常
parentPort.onerror = function(data) {
console.info("worker:: worker.js onerror " + data.lineno + ", msg = " + data.message + ", filename = " + data.filename + ", colno = " + data.colno);
}
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/default/workers/worker_002.js
浏览文件 @ 8896fd8e
......@@ -13,20 +13,11 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
console.log("worker:: run script");
var worker = globalThis.requireNapi('worker');
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
const parentPort = worker.parentPort;
parentPort.onmessage = function(e) {
console.log("worker:: worker receive data " + e.data);
var data = e.data + " worker";
parentPort.postMessage(data)
}
/******/ })()
;
\ No newline at end of file
parentPort.onmessage = function(e) {
console.log("worker:: worker receive data " + e.data);
var data = e.data + " worker";
parentPort.postMessage(data)
}
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/default/workers/worker_003.js
浏览文件 @ 8896fd8e
......@@ -13,18 +13,10 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
var worker = globalThis.requireNapi('worker');
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
const parentPort = worker.parentPort;
parentPort.onmessage = function(e) {
var data = e.data * 2 + 1
parentPort.postMessage(data)
}
/******/ })()
;
\ No newline at end of file
parentPort.onmessage = function(e) {
var data = e.data * 2 + 1
parentPort.postMessage(data)
}
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/default/workers/worker_004.js
浏览文件 @ 8896fd8e
......@@ -13,19 +13,11 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
var worker = globalThis.requireNapi('worker');
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
const parentPort = worker.parentPort;
parentPort.onmessage = function(e) {
var data = e.data;
data.message = "hello world " + "worker"
parentPort.postMessage(data)
}
/******/ })()
;
\ No newline at end of file
parentPort.onmessage = function(e) {
var data = e.data;
data.message = "hello world " + "worker"
parentPort.postMessage(data)
}
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/default/workers/worker_005.js
浏览文件 @ 8896fd8e
......@@ -13,17 +13,9 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
var worker = globalThis.requireNapi('worker');
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
const parentPort = worker.parentPort;
parentPort.onmessage = function(e) {
parentPort.postMessage(name)
}
/******/ })()
;
\ No newline at end of file
parentPort.onmessage = function(e) {
parentPort.postMessage(name)
}
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/default/workers/worker_006.js
浏览文件 @ 8896fd8e
......@@ -13,17 +13,9 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
var worker = globalThis.requireNapi('worker');
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
const parentPort = worker.parentPort;
parentPort.onmessage = function(e) {
parentPort.postMessage("hello world")
}
/******/ })()
;
\ No newline at end of file
parentPort.onmessage = function(e) {
parentPort.postMessage("hello world")
}
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/default/workers/worker_007.js
浏览文件 @ 8896fd8e
......@@ -13,17 +13,9 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
var worker = globalThis.requireNapi('worker');
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
const parentPort = worker.parentPort;
parentPort.onmessage = function(e) {
throw new Error(123)
}
/******/ })()
;
\ No newline at end of file
parentPort.onmessage = function(e) {
throw new Error(123)
}
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/default/workers/worker_008.js
浏览文件 @ 8896fd8e
......@@ -13,17 +13,9 @@
* limitations under the License.
*/
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!********************************************************************************************!*\
!*** d:\workspace\my_works\MyApplication\entry\src\main\ets\default\workers\WorkerDemo.js ***!
\********************************************************************************************/
var worker = globalThis.requireNapi('worker');
import worker from '@ohos.worker';
const parentPort = worker.parentPort;
const parentPort = worker.parentPort;
parentPort.onmessage = function(e) {
parentPort.close()
}
/******/ })()
;
\ No newline at end of file
parentPort.onmessage = function(e) {
parentPort.close()
}
compileruntime/worker_lib_standard/src/main/js/test/ExampleJsunit.test.js 已删除 100644 → 0
浏览文件 @ c70620d2
/*
* Copyright (C) 2021 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 {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
describe('appInfoTest', function () {
it('app_info_test_001', 0, function () {
var info = app.getInfo()
expect(info.versionName).assertEqual('1.0.0')
expect(info.versionCode).assertEqual('1000000')
})
})
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/test/List.test.js
浏览文件 @ 8896fd8e
......@@ -13,5 +13,4 @@
* limitations under the License.
*/
require('./ExampleJsunit.test.js')
require("./Worker.test.js")
\ No newline at end of file
compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js
浏览文件 @ 8896fd8e
/*
* Copyright (C) 2021 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* 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,
* 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.
......@@ -16,7 +16,7 @@
// @ts-nocheck
import app from '@system.app'
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
import worker from '@ohos.worker'
import worker from "@ohos.worker";
describe('workerTest', function () {
......@@ -145,7 +145,22 @@ describe('workerTest', function () {
const buffer = new ArrayBuffer(8)
expect(buffer.byteLength).assertEqual(8)
ss.postMessage(buffer, [buffer])
expect(buffer.byteLength).assertEqual(0)
var length = undefined;
var exception = undefined;
try {
length = buffer.byteLength;
} catch (e) {
exception = e.message;
}
console.log("worker:: length is " + length)
console.log("worker:: exception is " + exception)
if (typeof exception == "undefined") {
expect(length).assertEqual(0)
} else {
expect(exception).assertEqual("IsDetachedBuffer")
}
})
// check worker handle error is ok
......@@ -463,6 +478,7 @@ describe('workerTest', function () {
ss.dispatchEvent({type: "zhangsan"})
expect(zhangsanTimes).assertEqual(2)
})
// check worker removeAllListener function is ok
......@@ -501,65 +517,23 @@ describe('workerTest', function () {
it('worker_parentPortClose_test_001', 0, async function (done) {
var ss = new worker.Worker("workers/worker_008.js");
var res = 0
var flag = false;
ss.onmessage = function (e) {
ss.onexit = function (e) {
res++;
flag = true;
}
ss.postMessage("abc")
await promiseCase()
expect(res).assertEqual(0)
done()
})
// check parentPort.close is ok
it('worker_parentPortClose_test_002', 0, async function (done) {
var ss1 = new worker.Worker("workers/worker_008.js");
var ss2 = new worker.Worker("workers/worker_008.js");
var res = 0
var times = 0
ss1.onmessage = function (e) {
res++;
}
ss1.postMessage("abc")
await promiseCase()
expect(res).assertEqual(0)
ss2.postMessage("hello world")
await promiseCase()
expect(res).assertEqual(0)
done()
})
// check parentPort.close is ok
it('worker_parentPortClose_test_003', 0, async function (done) {
var ss1 = new worker.Worker("workers/worker_008.js");
var ss2 = new worker.Worker("workers/worker_008.js");
var res = 0
var times = 0
ss1.onmessage = function (e) {
res++;
while (!flag) {
await promiseCase()
}
ss1.postMessage("abc")
await promiseCase()
expect(res).assertEqual(0)
ss2.addEventListener("zhangsan", ()=>{
times++;
})
ss2.dispatchEvent({type: "zhangsan"})
expect(times).assertEqual(1)
expect(res).assertEqual(1)
done()
})
// check parentPort.close is ok
it('worker_parentPortClose_test_004', 0, async function (done) {
it('worker_parentPortClose_test_002', 0, async function (done) {
var ss = new worker.Worker("workers/worker_008.js");
var res = 0
var flag = false;
......@@ -605,23 +579,4 @@ describe('workerTest', function () {
done()
})
// check onmessageerror is ok
it('worker_onmessageerror_test_002', 0, async function (done) {
var ss = new worker.Worker("workers/worker_008.js");
var res = 0
var flag = false;
ss.onmessageerror = function (e) {
flag = true;
res++;
}
function foo() {
}
ss.postMessage(foo)
while (!flag) {
await promiseCase()
}
expect(res).assertEqual(1)
done()
})
})
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或