Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
未验证 提交 a7309bd3 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!9840 修改ffrt的xts用例模型 

Merge pull request !9840 from wangyulie/master
上级 43f4eece 5ef898c1
展开全部 隐藏空白更改
内联 并排
Showing with 415 addition and 757 deletion
resourceschedule/resourceschedule_standard/ffrt/.gitignore 已删除 100644 → 0
浏览文件 @ 43f4eece
/node_modules
/oh_modules
/local.properties
/.idea
**/build
/.hvigor
.cxx
/.clangd
/.clang-format
/.clang-tidy
**/.test
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/AppScope/app.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"app": {
"bundleName": "com.actsffrt.napitest",
"vendor": "example",
"versionCode": 1000000,
"versionName": "1.0.0",
"icon": "$media:app_icon",
"label": "$string:app_name"
}
}
resourceschedule/resourceschedule_standard/ffrt/BUILD.gn
浏览文件 @ a7309bd3
...@@ -10,20 +10,31 @@ ...@@ -10,20 +10,31 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//build/ohos.gni")
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_app_assist_suite("acts_ffrt_main") { ohos_js_hap_suite("resourceschedule_ffrt_js_test") {
testonly = true hap_profile = "./entry/src/main/config.json"
certificate_profile = "./signature/openharmony_sx.p7b" deps = [
hap_name = "ActsFfrtMainTest" ":ace_third_ets_assets",
part_name = "ffrt" ":ace_third_ets_resources",
subsystem_name = "resourceschedule" ":ace_third_ets_test_assets",
} ]
ohos_js_app_suite("resourceschedule_ffrt_js_test") { ets2abc = true
test_hap = true
testonly = true
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsFfrtNativeTest" hap_name = "ActsFfrtNativeTest"
part_name = "ffrt"
subsystem_name = "resourceschedule" subsystem_name = "resourceschedule"
deps = [ ":acts_ffrt_main" ] part_name = "ffrt"
shared_libraries = [ "./entry/src/main/cpp:ffrtndk" ]
}
ohos_js_assets("ace_third_ets_assets") {
source_dir = "./entry/src/main/ets/MainAbility"
}
ohos_js_assets("ace_third_ets_test_assets") {
source_dir = "./entry/src/main/ets/TestAbility"
}
ohos_resources("ace_third_ets_resources") {
sources = [ "./entry/src/main/resources" ]
hap_profile = "./entry/src/main/config.json"
} }
resourceschedule/resourceschedule_standard/ffrt/Test.json
浏览文件 @ a7309bd3
...@@ -2,21 +2,18 @@ ...@@ -2,21 +2,18 @@
"description": "Configuration for hjunit demo Tests", "description": "Configuration for hjunit demo Tests",
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "180000", "test-timeout": "600000",
"bundle-name": "com.actsffrt.napitest", "bundle-name": "com.actsffrt.napitest",
"module-name": "entry_test", "package-name": "com.actsffrt.napitest",
"shell-timeout": "600000", "shell-timeout": "600000"
"testcase-timeout": 70000
}, },
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsFfrtNativeTest.hap", "ActsFfrtNativeTest.hap"
"ActsFfrtMainTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
} }
] ]
} }
resourceschedule/resourceschedule_standard/ffrt/entry/.gitignore 已删除 100644 → 0
浏览文件 @ 43f4eece
/node_modules
/oh_modules
/.preview
/build
/.cxx
/.test
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/build-profile.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"apiType": 'stageMode',
"buildOption": {
"externalNativeOptions": {
"path": "./src/main/cpp/CMakeLists.txt",
"arguments": "",
"cppFlags": "",
}
},
"targets": [
{
"name": "default",
},
{
"name": "ohosTest",
}
]
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/hvigorfile.ts 已删除 100644 → 0
浏览文件 @ 43f4eece
// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
export { hapTasks } from '@ohos/hvigor-ohos-plugin';
resourceschedule/resourceschedule_standard/ffrt/entry/node_modules/.package-lock.json 0 → 100644
浏览文件 @ a7309bd3
{
"name": "entry",
"lockfileVersion": 2,
"requires": true,
"packages": {
"node_modules/libffrtndk.so": {
"resolved": "src/main/cpp/types/libffrtndk",
"link": true
},
"src/main/cpp/types/libffrtndk": {
"dev": true
}
}
}
resourceschedule/resourceschedule_standard/ffrt/entry/oh-package.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"license": "",
"devDependencies": {
"@types/libffrtndk.so": "file:./src/main/cpp/types/libffrtndk"
},
"author": "",
"name": "entry",
"description": "Please describe the basic information.",
"main": "",
"version": "1.0.0",
"dependencies": {}
}
resourceschedule/resourceschedule_standard/ffrt/entry/package-lock.json 0 → 100644
浏览文件 @ a7309bd3
{
"name": "entry",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"devDependencies": {
"libffrtndk.so": "file:./src/main/cpp/types/libffrtndk"
}
},
"node_modules/libffrtndk.so": {
"resolved": "src/main/cpp/types/libffrtndk",
"link": true
},
"src/main/cpp/types/libffrtndk": {
"dev": true
}
},
"dependencies": {
"libffrtndk.so": {
"version": "file:src/main/cpp/types/libffrtndk"
}
}
}
resourceschedule/resourceschedule_standard/ffrt/entry/package.json 0 → 100644
浏览文件 @ a7309bd3
{
"name": "entry",
"devDependencies": {
"libffrtndk.so": "file:./src/main/cpp/types/libffrtndk"
}
}
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/config.json 0 → 100644
浏览文件 @ a7309bd3
{
"app": {
"bundleName": "com.actsffrt.napitest",
"vendor": "open",
"version": {
"code": 1000000,
"name": "1.0.0"
},
"apiVersion": {
"compatible": 10,
"releaseType": "Release",
"target": 10
}
},
"deviceConfig": {},
"module": {
"package": "com.actsffrt.napitest",
"name": ".MyApplication",
"mainAbility": "com.actsffrt.napitest.MainAbility",
"deviceType": [
"default",
"tablet",
"phone"
],
"distro": {
"deliveryWithInstall": true,
"moduleName": "entry",
"moduleType": "entry",
"installationFree": false
},
"abilities": [
{
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"orientation": "unspecified",
"visible": true,
"srcPath": "MainAbility",
"name": ".MainAbility",
"srcLanguage": "ets",
"icon": "$media:icon",
"description": "$string:description_mainability",
"formsEnabled": false,
"label": "$string:entry_MainAbility",
"type": "page",
"launchType": "standard"
},
{
"orientation": "unspecified",
"visible": true,
"srcPath": "TestAbility",
"name": ".TestAbility",
"srcLanguage": "ets",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"formsEnabled": false,
"label": "$string:TestAbility_label",
"type": "page",
"launchType": "standard"
}
],
"js": [
{
"mode": {
"syntax": "ets",
"type": "pageAbility"
},
"pages": [
"pages/index"
],
"name": ".MainAbility",
"window": {
"designWidth": 720,
"autoDesignWidth": false
}
},
{
"mode": {
"syntax": "ets",
"type": "pageAbility"
},
"pages": [
"pages/index"
],
"name": ".TestAbility",
"window": {
"designWidth": 720,
"autoDesignWidth": false
}
}
]
}
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/BUILD.gn 0 → 100644
浏览文件 @ a7309bd3
# 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("//build/config/ohos/config.gni")
import("//build/ohos.gni")
import("//foundation/arkui/napi/napi.gni")
config("config") {
visibility = [ ":*" ]
cflags = [
"-Wall",
"-Werror",
"-g3",
"-Wunused-variable",
]
}
config("public_config") {
}
ohos_shared_library("ffrtndk") {
sources = [ "./ffrtndk.cpp" ]
libs = [ rebase_path(libcxx_ndk_shared_file) ]
include_dirs = [
"./",
"../../../../../../../../../../foundation/resourceschedule/ffrt/interfaces/kits",
]
configs = [ ":config" ]
subsystem_name = "resourceschedule"
part_name = "ffrt"
external_deps = [
"hilog:libhilog",
"napi:ace_napi",
]
deps = [
"../../../../../../../../../../foundation/resourceschedule/ffrt:ffrt_ndk",
]
output_extension = "so"
}
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/CMakeLists.txt
浏览文件 @ a7309bd3
# the minimum version of CMake. # the minimum version of CMake.
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.4.1)
project(FfrtTest) project(MyApplication)
set(NATIVERENDER_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set(NATIVERENDER_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
......
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/ffrtndk.cpp
浏览文件 @ a7309bd3
...@@ -14,18 +14,18 @@ ...@@ -14,18 +14,18 @@
*/ */
#include "napi/native_api.h" #include "napi/native_api.h"
#include "hilog/log.h" #include "hilog/log.h"
#include "ffrt/task.h" #include "c/task.h"
#include "ffrt/type_def.h" #include "c/type_def.h"
#include "ffrt/condition_variable.h" #include "c/condition_variable.h"
#include "ffrt/mutex.h" #include "c/mutex.h"
#include "ffrt/queue.h" #include "c/queue.h"
#include "ffrt/sleep.h" #include "c/sleep.h"
#include <string> #include <string>
#include <unistd.h> #include <unistd.h>
void MyPrint(void* arg) void MyPrint(void* arg)
{ {
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "%{public}s", "hello ffrt\n"); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "%{public}s", "hello ffrt\n");
} }
void OnePlusForTest(void* arg) void OnePlusForTest(void* arg)
...@@ -192,25 +192,28 @@ void FfrtCvTask(void* arg) ...@@ -192,25 +192,28 @@ void FfrtCvTask(void* arg)
ffrt_mutex_destroy(&lock_); ffrt_mutex_destroy(&lock_);
} }
/**
* add simple ffrt task submit example
*/
static napi_value SubmitSimpleFfrtTask(napi_env env, napi_callback_info info) static napi_value SubmitSimpleFfrtTask(napi_env env, napi_callback_info info)
{ {
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "%{public}s", "ffrt start\n"); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "%{public}s", "ffrt start\n");
ffrt_task_attr_t attr; ffrt_task_attr_t attr;
ffrt_task_attr_init(&attr); ffrt_task_attr_init(&attr);
ffrt_task_attr_set_qos(&attr, static_cast<ffrt_qos_t>(ffrt_qos_background)); ffrt_task_attr_set_qos(&attr, static_cast<ffrt_qos_t>(ffrt_qos_background));
ffrt_task_attr_set_name(&attr, "ffrt_testA"); ffrt_task_attr_set_name(&attr, "ffrt_testA");
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "task delay is %{public}d", ffrt_task_attr_get_delay(&attr)); ffrt_task_attr_get_delay(&attr);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "task name is %{public}s", ffrt_task_attr_get_name(&attr)); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "task name is %{public}s", ffrt_task_attr_get_name(&attr));
ffrt_task_attr_set_delay(&attr, 1000); ffrt_task_attr_set_delay(&attr, 1000);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "task delay2 is %{public}d", ffrt_task_attr_get_delay(&attr)); ffrt_task_attr_get_delay(&attr);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "qos is %{public}d", ffrt_task_attr_get_qos(&attr)); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "qos is %{public}d", ffrt_task_attr_get_qos(&attr));
ffrt_task_attr_set_qos(&attr, static_cast<ffrt_qos_t>(ffrt_qos_user_initiated)); ffrt_task_attr_set_qos(&attr, static_cast<ffrt_qos_t>(ffrt_qos_user_initiated));
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "qos2 is %{public}d", ffrt_task_attr_get_qos(&attr)); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "qos2 is %{public}d", ffrt_task_attr_get_qos(&attr));
ffrt_submit_c(MyPrint, NULL, NULL, NULL, &attr); ffrt_submit_c(MyPrint, NULL, NULL, NULL, &attr);
int result = ffrt_this_task_update_qos(static_cast<ffrt_qos_t>(ffrt_qos_default)); int result = ffrt_this_task_update_qos(static_cast<ffrt_qos_t>(ffrt_qos_default));
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "update_qos result is %{public}d", result); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "update_qos result is %{public}d", result);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "qos3 is %{public}d", ffrt_task_attr_get_qos(&attr)); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "qos3 is %{public}d", ffrt_task_attr_get_qos(&attr));
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "task id is %{public}d", ffrt_this_task_get_id()); ffrt_this_task_get_id();
ffrt_usleep(10000); ffrt_usleep(10000);
ffrt_yield(); ffrt_yield();
ffrt_task_attr_destroy(&attr); ffrt_task_attr_destroy(&attr);
...@@ -227,13 +230,16 @@ static napi_value SubmitCondFfrtTask(napi_env env, napi_callback_info info) ...@@ -227,13 +230,16 @@ static napi_value SubmitCondFfrtTask(napi_env env, napi_callback_info info)
ffrt_task_handle_t task1 = ffrt_submit_h_c(MyPrint, NULL, NULL, NULL, NULL); ffrt_task_handle_t task1 = ffrt_submit_h_c(MyPrint, NULL, NULL, NULL, NULL);
ffrt_wait_deps(nullptr); ffrt_wait_deps(nullptr);
ffrt_wait(); ffrt_wait();
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "cond task a is %{public}d", a); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "cond task a is %{public}d", a);
napi_value flag = nullptr; napi_value flag = nullptr;
napi_create_double(env, a, &flag); napi_create_double(env, a, &flag);
ffrt_task_handle_destroy(task1); ffrt_task_handle_destroy(task1);
return flag; return flag;
} }
/**
* add simple ffrt queue task submit example
*/
static napi_value SubmitQueueFfrtTask(napi_env env, napi_callback_info info) static napi_value SubmitQueueFfrtTask(napi_env env, napi_callback_info info)
{ {
int a = 0; int a = 0;
...@@ -241,11 +247,10 @@ static napi_value SubmitQueueFfrtTask(napi_env env, napi_callback_info info) ...@@ -241,11 +247,10 @@ static napi_value SubmitQueueFfrtTask(napi_env env, napi_callback_info info)
ffrt_queue_attr_t queue_attr; ffrt_queue_attr_t queue_attr;
(void)ffrt_queue_attr_init(&queue_attr); (void)ffrt_queue_attr_init(&queue_attr);
ffrt_queue_attr_set_qos(&queue_attr, ffrt_qos_default); ffrt_queue_attr_set_qos(&queue_attr, ffrt_qos_default);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "queue task qos is %{public}d", HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "queue task qos is %{public}d",
ffrt_queue_attr_get_qos(&queue_attr)); ffrt_queue_attr_get_qos(&queue_attr));
ffrt_queue_attr_set_timeout(&queue_attr, 10000); ffrt_queue_attr_set_timeout(&queue_attr, 10000);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "queue task time is %{public}d", ffrt_queue_attr_get_timeout(&queue_attr);
ffrt_queue_attr_get_timeout(&queue_attr));
ffrt_queue_attr_set_callback(&queue_attr, ffrt_queue_attr_set_callback(&queue_attr,
ffrt_create_function_wrapper(OnePlusForTest, NULL, &b, ffrt_function_kind_queue)); ffrt_create_function_wrapper(OnePlusForTest, NULL, &b, ffrt_function_kind_queue));
ffrt_queue_attr_get_callback(&queue_attr); ffrt_queue_attr_get_callback(&queue_attr);
...@@ -257,8 +262,8 @@ static napi_value SubmitQueueFfrtTask(napi_env env, napi_callback_info info) ...@@ -257,8 +262,8 @@ static napi_value SubmitQueueFfrtTask(napi_env env, napi_callback_info info)
ffrt_queue_submit(queue_handle, ffrt_queue_submit(queue_handle,
ffrt_create_function_wrapper(SubForTest, nullptr, &a, ffrt_function_kind_queue), nullptr); ffrt_create_function_wrapper(SubForTest, nullptr, &a, ffrt_function_kind_queue), nullptr);
sleep(2); sleep(2);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "queue task a is %{public}d", a); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "queue task a is %{public}d", a);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "queue task b is %{public}d", b); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "queue task b is %{public}d", b);
napi_value flag = nullptr; napi_value flag = nullptr;
napi_create_double(env, a, &flag); napi_create_double(env, a, &flag);
ffrt_task_handle_destroy(task1); ffrt_task_handle_destroy(task1);
...@@ -281,8 +286,8 @@ static napi_value CancelQueueFfrtTask(napi_env env, napi_callback_info info) ...@@ -281,8 +286,8 @@ static napi_value CancelQueueFfrtTask(napi_env env, napi_callback_info info)
ffrt_create_function_wrapper(OnePlusForTest, NULL, &a, ffrt_function_kind_queue), nullptr); ffrt_create_function_wrapper(OnePlusForTest, NULL, &a, ffrt_function_kind_queue), nullptr);
ffrt_queue_cancel(task1); ffrt_queue_cancel(task1);
sleep(2); sleep(2);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "cancel queue task a is %{public}d", a); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "cancel queue task a is %{public}d", a);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "cancel queue task b is %{public}d", b); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "cancel queue task b is %{public}d", b);
napi_value flag = nullptr; napi_value flag = nullptr;
napi_create_double(env, a, &flag); napi_create_double(env, a, &flag);
ffrt_task_handle_destroy(task1); ffrt_task_handle_destroy(task1);
...@@ -305,8 +310,8 @@ static napi_value WaitQueueFfrtTask(napi_env env, napi_callback_info info) ...@@ -305,8 +310,8 @@ static napi_value WaitQueueFfrtTask(napi_env env, napi_callback_info info)
ffrt_create_function_wrapper(OnePlusForTest, NULL, &a, ffrt_function_kind_queue), nullptr); ffrt_create_function_wrapper(OnePlusForTest, NULL, &a, ffrt_function_kind_queue), nullptr);
ffrt_queue_wait(task1); ffrt_queue_wait(task1);
sleep(2); sleep(2);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "wait queue task a is %{public}d", a); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "wait queue task a is %{public}d", a);
OH_LOG_Print(LOG_APP, LOG_INFO, 1, "testFFRT", "wait queue task b is %{public}d", b); HiLogPrint(LOG_APP, LOG_INFO, 1, "testFFRT", "wait queue task b is %{public}d", b);
napi_value flag = nullptr; napi_value flag = nullptr;
napi_create_double(env, a, &flag); napi_create_double(env, a, &flag);
ffrt_task_handle_destroy(task1); ffrt_task_handle_destroy(task1);
......
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/types/libentry/index.d.ts 已删除 100644 → 0
浏览文件 @ 43f4eece
export const add: (a: number, b: number) => number;
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/types/libffrtndk/oh-package.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"name": "libffrtndk.so",
"types": "./index.d.ts",
"version": "",
"description": "Please describe the basic information."
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/types/libffrtndk/package.json 0 → 100644
浏览文件 @ a7309bd3
{
"name": "libffrtndk.so",
"types": "./index.d.ts",
"version": "",
"description": "Please describe the basic information."
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/build-profile.json5 → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/MainAbility/app.ets
浏览文件 @ a7309bd3
/* /**
* Copyright (c) 2021 Huawei Device Co., Ltd. * Copyright (c) 2022 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 not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
...@@ -12,30 +12,21 @@ ...@@ -12,30 +12,21 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
{ import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
"app": { import { Hypium } from '@ohos/hypium'
"signingConfigs": [], import testsuite from '../test/List.test'
"compileSdkVersion": 10,
"compatibleSdkVersion": 10, export default {
"products": [ onCreate() {
{ console.info('Application onCreate')
"name": "default", var abilityDelegator: any
"signingConfig": "default", abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
} var abilityDelegatorArguments: any
] abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
console.info('start run testcase!!!')
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
},
onDestroy() {
console.info('Application onDestroy')
}, },
"modules": [
{
"name": "entry",
"srcPath": "./entry",
"targets": [
{
"name": "default",
"applyToProducts": [
"default"
]
}
]
}
]
} }
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/pages/Index.ets → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/MainAbility/pages/index.ets
浏览文件 @ a7309bd3
/* /**
* Copyright (c) 2021 Huawei Device Co., Ltd. * Copyright (c) 2022 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 not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
...@@ -12,25 +12,25 @@ ...@@ -12,25 +12,25 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import hilog from '@ohos.hilog';
@Entry @Entry
@Component @Component
struct Index { struct MyComponent {
@State message: string = 'Hello World' aboutToAppear() {
}
build() { build() {
Row() { Flex({
Column() { direction: FlexDirection.Column,
Text(this.message) alignItems: ItemAlign.Center,
.fontSize(50) justifyContent: FlexAlign.Center
.fontWeight(FontWeight.Bold) }) {
.onClick(() => { Text('BMS ETS TEST')
hilog.info(0x0000, 'testTag', 'Test NAPI 2 + 3 = %{public}d', 5); .fontSize(50)
}) .fontWeight(FontWeight.Bold)
}
.width('100%')
} }
.width('100%')
.height('100%') .height('100%')
} }
} }
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/types/libentry/oh-package.json5 → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/TestAbility/app.ets
浏览文件 @ a7309bd3
/* /**
* Copyright (c) 2021 Huawei Device Co., Ltd. * Copyright (c) 2022 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 not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
...@@ -12,9 +12,13 @@ ...@@ -12,9 +12,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
{ import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
"name": "libentry.so", import { Hypium } from '@ohos/hypium'
"types": "./index.d.ts",
"version": "", export default {
"description": "Please describe the basic information." onCreate() {
},
onDestroy() {
console.info('Application onDestroy')
},
} }
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/ohosTest/ets/testability/pages/Index.ets → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/TestAbility/pages/index.ets
浏览文件 @ a7309bd3
/* /**
* Copyright (c) 2021 Huawei Device Co., Ltd. * Copyright (c) 2022 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 not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import hilog from '@ohos.hilog'; import router from '@system.router';
@Entry @Entry
@Component @Component
struct Index { struct Index {
aboutToAppear() { aboutToAppear() {
hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear'); console.info('TestAbility index aboutToAppear')
} }
@State message: string = 'Hello World' @State message: string = 'Hello World'
build() { build() {
Row() { Row() {
......
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts 0 → 100644
浏览文件 @ a7309bd3
/**
* 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 TestRunner from '@ohos.application.testRunner'
import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
var abilityDelegator = undefined
var abilityDelegatorArguments = undefined
function translateParamsToString(parameters) {
const keySet = new Set([
'-s class', '-s notClass', '-s suite', '-s itName',
'-s level', '-s testType', '-s size', '-s timeout',
'-s package'
])
let targetParams = '';
for (const key in parameters) {
if (keySet.has(key)) {
targetParams += ' ' + key + ' ' + parameters[key]
}
}
return targetParams.trim()
}
async function onAbilityCreateCallback() {
console.log('onAbilityCreateCallback');
}
async function addAbilityMonitorCallback(err: any) {
console.info('addAbilityMonitorCallback : ' + JSON.stringify(err))
}
export default class OpenHarmonyTestRunner implements TestRunner {
constructor() {
}
onPrepare() {
console.info('OpenHarmonyTestRunner OnPrepare')
}
onRun() {
console.log('OpenHarmonyTestRunner onRun run')
abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
let lMonitor = {
abilityName: testAbilityName,
onAbilityCreate: onAbilityCreateCallback,
};
var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
console.info('cmd : '+cmd)
abilityDelegator.executeShellCommand(cmd,
(err: any, d: any) => {
console.info('executeShellCommand : err : ' + JSON.stringify(err));
console.info('executeShellCommand : data : ' + d.stdResult);
console.info('executeShellCommand : data : ' + d.exitCode);
})
console.info('OpenHarmonyTestRunner onRun call abilityDelegator.getAppContext')
var context = abilityDelegator.getAppContext()
console.info('getAppContext : ' + JSON.stringify(context))
console.info('OpenHarmonyTestRunner onRun end')
}
};
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/entryability/EntryAbility.ts 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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 UIAbility from '@ohos.app.ability.UIAbility';
import hilog from '@ohos.hilog';
import window from '@ohos.window';
export default class EntryAbility extends UIAbility {
onCreate(want, launchParam) {
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate');
}
onDestroy() {
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy');
}
onWindowStageCreate(windowStage: window.WindowStage) {
// Main window is created, set main page for this ability
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
windowStage.loadContent('pages/Index', (err, data) => {
if (err.code) {
hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
return;
}
hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
});
}
onWindowStageDestroy() {
// Main window is destroyed, release UI related resources
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy');
}
onForeground() {
// Ability has brought to foreground
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground');
}
onBackground() {
// Ability has back to background
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground');
}
};
resourceschedule/resourceschedule_standard/ffrt/entry/src/ohosTest/ets/test/Ffrt.test.ets → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/test/Ffrt.test.ets
浏览文件 @ a7309bd3
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import hilog from '@ohos.hilog'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "@ohos/hypium"
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
import ffrtndk from 'libffrtndk.so'; import ffrtndk from 'libffrtndk.so';
export default function ffrtTest() { export default function ffrtTest() {
describe('ActsFfrtTest', function () { describe('ActsFfrtTest', function () {
...@@ -38,31 +37,26 @@ export default function ffrtTest() { ...@@ -38,31 +37,26 @@ export default function ffrtTest() {
}) })
it('submitSimpleFfrtTask',0, function () { it('submitSimpleFfrtTask',0, function () {
// Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
var flag = ffrtndk.submitSimpleFfrtTask(); var flag = ffrtndk.submitSimpleFfrtTask();
expect(flag).assertEqual(1); expect(flag).assertEqual(1);
}) })
it('submitCondFfrtTask',0, function () { it('submitCondFfrtTask',0, function () {
// Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
var flag = ffrtndk.submitCondFfrtTask(); var flag = ffrtndk.submitCondFfrtTask();
expect(flag).assertEqual(3); expect(flag).assertEqual(3);
}) })
it('submitQueueFfrtTask',0, function () { it('submitQueueFfrtTask',0, function () {
// Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
var flag = ffrtndk.submitQueueFfrtTask(); var flag = ffrtndk.submitQueueFfrtTask();
expect(flag).assertEqual(9); expect(flag).assertEqual(9);
}) })
it('cancelQueueFfrtTask',0, function () { it('cancelQueueFfrtTask',0, function () {
// Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
var flag = ffrtndk.cancelQueueFfrtTask(); var flag = ffrtndk.cancelQueueFfrtTask();
expect(flag).assertEqual(0); expect(flag).assertEqual(0);
}) })
it('waitQueueFfrtTask',0, function () { it('waitQueueFfrtTask',0, function () {
// Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
var flag = ffrtndk.waitQueueFfrtTask(); var flag = ffrtndk.waitQueueFfrtTask();
expect(flag).assertEqual(1); expect(flag).assertEqual(1);
}) })
......
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/module.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"module": {
"name": "entry",
"type": "entry",
"description": "$string:module_desc",
"mainElement": "EntryAbility",
"deviceTypes": [
"default",
"tablet"
],
"deliveryWithInstall": true,
"installationFree": false,
"pages": "$profile:main_pages",
"abilities": [
{
"name": "EntryAbility",
"srcEntry": "./ets/entryability/EntryAbility.ts",
"description": "$string:EntryAbility_desc",
"icon": "$media:icon",
"label": "$string:EntryAbility_label",
"startWindowIcon": "$media:icon",
"startWindowBackground": "$color:start_window_background",
"exported": true,
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
]
}
]
}
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/resources/base/element/color.json 已删除 100644 → 0
浏览文件 @ 43f4eece
{
"color": [
{
"name": "start_window_background",
"value": "#FFFFFF"
}
]
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/resources/base/element/string.json
浏览文件 @ a7309bd3
{ {
"string": [ "string": [
{ {
"name": "module_desc", "name": "entry_MainAbility",
"value": "module description" "value": "entry_MainAbility"
}, },
{ {
"name": "EntryAbility_desc", "name": "description_mainability",
"value": "ETS_Empty Ability"
},
{
"name": "TestAbility_desc",
"value": "description" "value": "description"
}, },
{ {
"name": "EntryAbility_label", "name": "TestAbility_label",
"value": "label" "value": "label"
} }
] ]
......
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/resources/en_US/element/string.json 已删除 100644 → 0
浏览文件 @ 43f4eece
{
"string": [
{
"name": "module_desc",
"value": "module description"
},
{
"name": "EntryAbility_desc",
"value": "description"
},
{
"name": "EntryAbility_label",
"value": "label"
}
]
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/main/resources/zh_CN/element/string.json 已删除 100644 → 0
浏览文件 @ 43f4eece
{
"string": [
{
"name": "module_desc",
"value": "模块描述"
},
{
"name": "EntryAbility_desc",
"value": "description"
},
{
"name": "EntryAbility_label",
"value": "label"
}
]
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/ohosTest/ets/testability/TestAbility.ets 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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 UIAbility from '@ohos.app.ability.UIAbility';
import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
import hilog from '@ohos.hilog';
import { Hypium } from '@ohos/hypium';
import testsuite from '../test/List.test';
import window from '@ohos.window';
export default class TestAbility extends UIAbility {
onCreate(want, launchParam) {
hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onCreate');
hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? '');
hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:'+ JSON.stringify(launchParam) ?? '');
var abilityDelegator: any
abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var abilityDelegatorArguments: any
abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!');
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
}
onDestroy() {
hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onDestroy');
}
onWindowStageCreate(windowStage: window.WindowStage) {
hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageCreate');
windowStage.loadContent('testability/pages/Index', (err, data) => {
if (err.code) {
hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
return;
}
hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s',
JSON.stringify(data) ?? '');
});
}
onWindowStageDestroy() {
hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy');
}
onForeground() {
hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground');
}
onBackground() {
hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground');
}
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts 已删除 100644 → 0
浏览文件 @ 43f4eece
import hilog from '@ohos.hilog';
import TestRunner from '@ohos.application.testRunner';
import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
var abilityDelegator = undefined
var abilityDelegatorArguments = undefined
async function onAbilityCreateCallback() {
hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback');
}
async function addAbilityMonitorCallback(err: any) {
hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? '');
}
export default class OpenHarmonyTestRunner implements TestRunner {
constructor() {
}
onPrepare() {
hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare ');
}
async onRun() {
hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run');
abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'
let lMonitor = {
abilityName: testAbilityName,
onAbilityCreate: onAbilityCreateCallback,
};
abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName
var debug = abilityDelegatorArguments.parameters['-D']
if (debug == 'true')
{
cmd += ' -D'
}
hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
abilityDelegator.executeShellCommand(cmd,
(err: any, d: any) => {
hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? '');
hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? '');
hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? '');
})
hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end');
}
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/ohosTest/module.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"module": {
"name": "entry_test",
"type": "feature",
"description": "$string:module_test_desc",
"mainElement": "TestAbility",
"deviceTypes": [
"default",
"tablet",
"phone"
],
"deliveryWithInstall": true,
"installationFree": false,
"pages": "$profile:test_pages",
"abilities": [
{
"name": "TestAbility",
"srcEntry": "./ets/testability/TestAbility.ets",
"description": "$string:TestAbility_desc",
"icon": "$media:icon",
"label": "$string:TestAbility_label",
"exported": true,
"startWindowIcon": "$media:icon",
"startWindowBackground": "$color:start_window_background",
"skills": [
{
"actions": [
"action.system.home"
],
"entities": [
"entity.system.home"
]
}
]
}
]
}
}
resourceschedule/resourceschedule_standard/ffrt/entry/src/ohosTest/resources/base/element/color.json 已删除 100644 → 0
浏览文件 @ 43f4eece
{
"color": [
{
"name": "start_window_background",
"value": "#FFFFFF"
}
]
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/entry/src/ohosTest/resources/base/element/string.json 已删除 100644 → 0
浏览文件 @ 43f4eece
{
"string": [
{
"name": "module_test_desc",
"value": "test ability description"
},
{
"name": "TestAbility_desc",
"value": "the test ability"
},
{
"name": "TestAbility_label",
"value": "test label"
}
]
}
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/hvigor/hvigor-config.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"hvigorVersion": "2.4.2",
"dependencies": {
"@ohos/hvigor-ohos-plugin": "2.4.2"
}
}
resourceschedule/resourceschedule_standard/ffrt/hvigorfile.ts 已删除 100644 → 0
浏览文件 @ 43f4eece
// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
export { appTasks } from '@ohos/hvigor-ohos-plugin';
\ No newline at end of file
resourceschedule/resourceschedule_standard/ffrt/hvigorw 已删除 100644 → 0
浏览文件 @ 43f4eece
#!/bin/bash
# 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.
# ----------------------------------------------------------------------------
# Hvigor startup script, version 1.0.0
#
# Required ENV vars:
# ------------------
# NODE_HOME - location of a Node home dir
# or
# Add /usr/local/nodejs/bin to the PATH environment variable
# ----------------------------------------------------------------------------
HVIGOR_APP_HOME=$(dirname $(readlink -f $0))
HVIGOR_WRAPPER_SCRIPT=${HVIGOR_APP_HOME}/hvigor/hvigor-wrapper.js
warn() {
echo ""
echo -e "\033[1;33m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
}
error() {
echo ""
echo -e "\033[1;31m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
}
fail() {
error "$@"
exit 1
}
# Determine node to start hvigor wrapper script
if [ -n "${NODE_HOME}" ];then
EXECUTABLE_NODE="${NODE_HOME}/bin/node"
if [ ! -x "$EXECUTABLE_NODE" ];then
fail "ERROR: NODE_HOME is set to an invalid directory,check $NODE_HOME\n\nPlease set NODE_HOME in your environment to the location where your nodejs installed"
fi
else
EXECUTABLE_NODE="node"
which ${EXECUTABLE_NODE} > /dev/null 2>&1 || fail "ERROR: NODE_HOME is not set and not 'node' command found in your path"
fi
# Check hvigor wrapper script
if [ ! -r "$HVIGOR_WRAPPER_SCRIPT" ];then
fail "ERROR: Couldn't find hvigor/hvigor-wrapper.js in ${HVIGOR_APP_HOME}"
fi
# start hvigor-wrapper script
exec "${EXECUTABLE_NODE}" \
"${HVIGOR_WRAPPER_SCRIPT}" "$@"
resourceschedule/resourceschedule_standard/ffrt/hvigorw.bat 已删除 100644 → 0
浏览文件 @ 43f4eece
@rem Copyright (c) 2023 Huawei Device Co., Ltd.
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Hvigor startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
set NODE_EXE=node.exe
goto start
:start
@rem Find node.exe
if defined NODE_HOME goto findNodeFromNodeHome
%NODE_EXE% --version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
echo.
echo Please set the NODE_HOME variable in your environment to match the
echo location of your NodeJs installation.
goto fail
:findNodeFromNodeHome
set NODE_HOME=%NODE_HOME:"=%
set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
if exist "%NODE_EXE_PATH%" goto execute
echo.
echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
echo.
echo Please set the NODE_HOME variable in your environment to match the
echo location of your NodeJs installation.
goto fail
:execute
@rem Execute hvigor
"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
if "%ERRORLEVEL%" == "0" goto hvigorwEnd
:fail
exit /b 1
:hvigorwEnd
if "%OS%" == "Windows_NT" endlocal
:end
resourceschedule/resourceschedule_standard/ffrt/oh-package.json5 已删除 100644 → 0
浏览文件 @ 43f4eece
/*
* 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.
*/
{
"license": "",
"devDependencies": {
"@ohos/hypium": "1.0.6"
},
"author": "",
"name": "ffrttest",
"description": "Please describe the basic information.",
"main": "",
"version": "1.0.0",
"dependencies": {}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或