提交 195a8b5e 编写于 作者: 1 15929983503

hilogtestjs add debug lable

Signed-off-by: N15929983503 <duanhaizhen@huawei.com>
上级 7b228c66
...@@ -26,7 +26,6 @@ group("hiviewdfxtestacts") { ...@@ -26,7 +26,6 @@ group("hiviewdfxtestacts") {
"hilogtest/hilogdomainofftest:ActsHilogDomainOffJsTest", "hilogtest/hilogdomainofftest:ActsHilogDomainOffJsTest",
"hilogtest/hilogdomainontest:ActsHilogDomainOnJsTest", "hilogtest/hilogdomainontest:ActsHilogDomainOnJsTest",
"hilogtest/hilogjstest:ActsHilogJsTest", "hilogtest/hilogjstest:ActsHilogJsTest",
"hilogtest/hilogndktest:ActsHilogndkTest",
"hisyseventtest/hisyseventjstest:ActsHiSysEventJsTest", "hisyseventtest/hisyseventjstest:ActsHiSysEventJsTest",
"hisyseventtest/hisyseventnormaltest:ActsHiSysEventNormalTest", "hisyseventtest/hisyseventnormaltest:ActsHiSysEventNormalTest",
"hitracechainjstest:ActsHiTraceChainJsTest", "hitracechainjstest:ActsHiTraceChainJsTest",
......
...@@ -21,6 +21,10 @@ ohos_js_hap_suite("ActsHilogJsTest") { ...@@ -21,6 +21,10 @@ ohos_js_hap_suite("ActsHilogJsTest") {
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsHilogJsTest" hap_name = "ActsHilogJsTest"
js_build_mode = "debug"
shared_libraries = [
"./src/main/cpp:hilogndk",
]
} }
ohos_js_assets("hilog_js_assets") { ohos_js_assets("hilog_js_assets") {
js2abc = true js2abc = true
......
...@@ -11,13 +11,15 @@ ...@@ -11,13 +11,15 @@
"target": 5 "target": 5
} }
}, },
"deviceConfig": {}, "deviceConfig": {
"default" :{"debug" : true}
},
"module": { "module": {
"package": "ohos.acts.hiviewdfx.hilog.function", "package": "ohos.acts.hiviewdfx.hilog.function",
"name": ".entry", "name": ".entry",
"deviceType": [ "deviceType": [
"tablet", "tablet",
"default", "default",
"phone" "phone"
], ],
"distro": { "distro": {
......
...@@ -11,24 +11,45 @@ ...@@ -11,24 +11,45 @@
# 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("//test/xts/tools/build/suite.gni") import("//build/config/ohos/config.gni")
module_output_path = "hits/ActsHilogndkTest" import("//build/ohos.gni")
import("//foundation/arkui/napi/napi.gni")
config("hilogndktest_config") { config("config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/kits/include", cflags = [
"//commonlibrary/c_utils/base/include/", "-Wall",
"-Werror",
"-g3",
"-Wunused-variable",
] ]
} }
ohos_moduletest_suite("ActsHilogndkTest") {
module_out_path = module_output_path config("public_config") {
sources = [ "hilogndktest.cpp" ] }
external_deps = [ "c_utils:utils" ]
ohos_shared_library("hilogndk") {
sources = [ "./hilogndk.cpp" ]
if (!(product_name == "m40")) {
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
}
include_dirs = [ "//test/xts/acts/hiviewdfx/hilogtest/hilogjstest/src/main/cpp",
"//base/hiviewdfx/hilog/interfaces/native/kits/include", ]
configs = [ ":config" ]
deps = [ deps = [
"//foundation/arkui/napi:ace_napi",
"//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk", "//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk",
"//base/hiviewdfx/hilog/interfaces/native/kits:libhilog_ndk", "//base/hiviewdfx/hilog/interfaces/native/kits:libhilog_ndk",
"//third_party/googletest:gtest_main",
] ]
configs = [ ":hilogndktest_config" ]
output_extension = "so"
} }
# the minimum version of CMake.
cmake_minimum_required(VERSION 3.4.1)
project(XComponent)
set(NATIVERENDER_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${NATIVERENDER_ROOT_PATH}
${NATIVERENDER_ROOT_PATH}/include)
add_library(hilogndk SHARED hilogndk.cpp)
target_link_libraries(hilogndk PUBLIC libace_napi.z.so libc++.a libhilog_ndk.z.so )
\ No newline at end of file
/** /*
* Copyright (c) 2020-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
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * 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. * 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.
*/ */
#include <gtest/gtest.h> #include "napi/native_api.h"
#include "hilog/log.h" #include "hilog/log.h"
#undef LOG_DOMAIN static napi_value OhIsLoggableTest(napi_env env, napi_callback_info info)
#undef LOG_TAG {
#define LOG_DOMAIN 0xD003e00 napi_value res = nullptr;
bool isLoggable = OH_LOG_IsLoggable(0x3200, "testTag", LOG_DEBUG);
using namespace std; napi_get_boolean(env, isLoggable, &res);
using namespace testing::ext; return res;
}
class hilogndktest : public testing::Test {
public: static napi_value OhPrintTest(napi_env env, napi_callback_info info)
static void SetUpTestCase(); {
static void TearDownTestCase(); napi_value res = nullptr;
void SetUp(); LogType type = LOG_APP;
void TearDown(); LogLevel level = LOG_ERROR;
}; int retLen = OH_LOG_Print(type, level, 0x3200, "testTag", "string for hilog test");
bool ret = (retLen > 0) ? true : false;
void hilogndktest::SetUp() napi_get_boolean(env, ret, &res);
{ return res;
} }
void hilogndktest::TearDown()
{
}
void hilogndktest::SetUpTestCase() EXTERN_C_START
{ static napi_value Init(napi_env env, napi_value exports)
} {
void hilogndktest::TearDownTestCase() napi_property_descriptor desc[] = {
{ { "ohIsLoggableTest", nullptr, OhIsLoggableTest,
} nullptr, nullptr, nullptr, napi_default, nullptr },
{ "ohPrintTest", nullptr, OhPrintTest,
/** nullptr, nullptr, nullptr, napi_default, nullptr }
* @tc.number : DFX_DFT_HILOGNDK_0100 };
* @tc.name : HILOGNDK_TEST napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
* @tc.desc : HILOGNDK_TEST return exports;
*/ }
HWTEST_F(hilogndktest, OH_LOG_Print_CHECK, Function | MediumTest | Level1) EXTERN_C_END
{
LogType type = LOG_APP; static napi_module demoModule = {
LogLevel level = LOG_ERROR; .nm_version =1,
int ret = OH_LOG_Print(type, level, 0xD003e00, "testtag0testtag1testtag2", "string:for hilog test %{private}s", "name"); .nm_flags = 0,
ASSERT_TRUE(ret == 85); .nm_filename = nullptr,
} .nm_register_func = Init,
.nm_modname = "libhilogndk",
/** .nm_priv = ((void*)0),
* @tc.number : DFX_DFT_HILOGNDK_0200 .reserved = { 0 },
* @tc.name : HILOGNDK_TEST };
* @tc.desc : HILOGNDK_TEST
*/ extern "C" __attribute__((constructor)) void RegisterModule(void)
HWTEST_F(hilogndktest, OH_LOG_IsLoggable_CHECK, Function | MediumTest | Level1) {
{ napi_module_register(&demoModule);
LogLevel level = LOG_DEBUG; }
const char *LOG_TAG = "testtag0testtag0testtag0testta";
bool res = OH_LOG_IsLoggable(0xD003e00, LOG_TAG, level);
ASSERT_TRUE(res == false);
}
export const OhIsLoggableTest: () => object;
\ No newline at end of file
{
"name": "libhilogndk.so",
"types": "./index.d.ts"
}
\ No newline at end of file
...@@ -41,7 +41,7 @@ function translateParamsToString(parameters) { ...@@ -41,7 +41,7 @@ function translateParamsToString(parameters) {
var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility' var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName var cmd = 'aa start -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters) cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"] var debug = abilityDelegatorArguments.parameters["-D"]
console.info('debug value : '+debug) console.info('debug value : '+debug)
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
*/ */
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
import hilog from '@ohos.hilog' import hilog from '@ohos.hilog'
import hilogndk from "libhilogndk.so"
export default function HilogJsTest() { export default function HilogJsTest() {
describe('HilogJsTest', function () { describe('HilogJsTest', function () {
...@@ -120,7 +121,7 @@ describe('HilogJsTest', function () { ...@@ -120,7 +121,7 @@ describe('HilogJsTest', function () {
it('testHilogJsApi06', 2, function () { it('testHilogJsApi06', 2, function () {
console.info('testHilogJsApi06 start'); console.info('testHilogJsApi06 start');
const res = hilog.isLoggable(0x3200, "HILOGTEST", hilog.LogLevel.DEBUG); const res = hilog.isLoggable(0x3200, "HILOGTEST", hilog.LogLevel.DEBUG);
expect(res).assertEqual(false); expect(res).assertEqual(true);
console.info('testHilogJsApi06 end'); console.info('testHilogJsApi06 end');
}) })
...@@ -136,7 +137,7 @@ describe('HilogJsTest', function () { ...@@ -136,7 +137,7 @@ describe('HilogJsTest', function () {
for (var i = 0; i < 1000; i++){ for (var i = 0; i < 1000; i++){
tag += "HILOGTEST" tag += "HILOGTEST"
} }
expect(res).assertEqual(false); expect(res).assertEqual(true);
console.info('testHilogJsApi07 end'); console.info('testHilogJsApi07 end');
}) })
...@@ -148,7 +149,7 @@ describe('HilogJsTest', function () { ...@@ -148,7 +149,7 @@ describe('HilogJsTest', function () {
it('testHilogJsApi08', 2, function () { it('testHilogJsApi08', 2, function () {
console.info('testHilogJsApi08 start'); console.info('testHilogJsApi08 start');
const res = hilog.isLoggable(0x3200, "", hilog.LogLevel.DEBUG); const res = hilog.isLoggable(0x3200, "", hilog.LogLevel.DEBUG);
expect(res).assertEqual(false); expect(res).assertEqual(true);
console.info('testHilogJsApi08 end'); console.info('testHilogJsApi08 end');
}) })
...@@ -415,5 +416,30 @@ describe('HilogJsTest', function () { ...@@ -415,5 +416,30 @@ describe('HilogJsTest', function () {
console.info('testHilogJsApi26 end'); console.info('testHilogJsApi26 end');
}) })
/**
* @tc.number DFX_DFT_Hiview_Libhilog_Hilog_JS_3800
* @tc.name hitrace interface test
* @tc.desc hitrace begin interface test.
*/
it('testHilogJsApi27', 2, function () {
console.info('testHilogJsApi27 start');
const res = hilogndk.ohIsLoggableTest();
expect(res).assertEqual(true);
console.info('testHilogJsApi27 end');
})
/**
* @tc.number DFX_DFT_Hiview_Libhilog_Hilog_JS_3800
* @tc.name hitrace interface test
* @tc.desc hitrace begin interface test.
*/
it('testHilogJsApi28', 2, function () {
console.info('testHilogJsApi28 start');
const res = hilogndk.ohPrintTest();
expect(res).assertEqual(true);
console.info('testHilogJsApi28 end');
})
}) })
} }
{
"description": "Configuration for hilogndktest demo Tests",
"driver": {
"type": "CppTest",
"native-test-timeout": "120000",
"module-name": "ActsHilogndkTest",
"runtime-hint": "ls",
"native-test-device-path": "/data/local/tmp"
},
"kits": [
{
"push": [
"ActsHilogndkTest->/data/local/tmp/ActsHilogndkTest"
],
"type": "PushKit"
}
]
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册