From e0b2aeeccc3cea8035a296626035c0598b1fa592 Mon Sep 17 00:00:00 2001 From: maosiping Date: Thu, 20 Jan 2022 15:13:36 +0800 Subject: [PATCH 1/8] add unittest Signed-off-by: maosiping --- CMakeLists.txt | 3 +- test/napi/http/test_napi_exec.cpp | 30 +- test/napi/log/test_hilog.cpp | 15 +- test/utils/napi_utils/BUILD.gn | 59 +++ test/utils/napi_utils/CMakeLists.txt | 32 ++ test/utils/napi_utils/test_napi_utils.cpp | 443 ++++++++++++++++++++++ 6 files changed, 559 insertions(+), 23 deletions(-) create mode 100644 test/utils/napi_utils/BUILD.gn create mode 100644 test/utils/napi_utils/CMakeLists.txt create mode 100644 test/utils/napi_utils/test_napi_utils.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 147cca212..f03becaa7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,4 +59,5 @@ link_directories(cmake-build-debug/utils) add_subdirectory(frameworks/js/builtin) add_subdirectory(utils) add_subdirectory(test/napi/http) -add_subdirectory(test/napi/socket) \ No newline at end of file +add_subdirectory(test/napi/socket) +add_subdirectory(test/utils/napi_utils) \ No newline at end of file diff --git a/test/napi/http/test_napi_exec.cpp b/test/napi/http/test_napi_exec.cpp index b90eb9b9b..97f7cfbe0 100644 --- a/test/napi/http/test_napi_exec.cpp +++ b/test/napi/http/test_napi_exec.cpp @@ -287,7 +287,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetExtraDataNameValueUrlHasPara, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -315,7 +315,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetExtraDataNameValueUrlHasParaNoEncode, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -343,7 +343,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetExtraDataString, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -351,7 +351,7 @@ DEFINE_TEST_BEGIN(TestHttpModuleMethodGetExtraDataString, true) NapiUtils::SetStringPropertyUtf8(env, header, "no-use", "no use header"); NapiUtils::SetStringPropertyUtf8(env, header, "just-test", "just test header"); - napi_value extraData = NapiUtils::CreateStringUtf8(env, "this-is-my-get-string=mao&this-test=age"); + napi_value extraData = NapiUtils::CreateStringUtf8(env, "this-is-my-get-string=test&this-test=age"); NapiUtils::SetNamedProperty(env, options, std::string(HttpConstant::PARAM_KEY_HEADER), header); NapiUtils::SetNamedProperty(env, options, std::string(HttpConstant::PARAM_KEY_EXTRA_DATA), extraData); @@ -369,7 +369,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetNoExtraData, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -392,7 +392,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetExtraDataNullString, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -418,7 +418,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodAndHeaderByDefaultHasPara, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -441,7 +441,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodAndHeaderByDefault, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value args[2] = {urlValue, callbackTwoParam}; @@ -456,7 +456,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodPostExtraDataString, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -486,7 +486,7 @@ DEFINE_TEST_BEGIN(TestHttpModuleMethodAndHeaderFail, true) { napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP ":7878" - "?name=Mao"); + "?name=test"); napi_value args[2] = {urlValue, callbackTwoParam}; @@ -501,7 +501,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodPostExtraDataArrayBuffer, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -540,7 +540,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetExtraDataNameValueHeaderKeyMultiCase, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value options = NapiUtils::CreateObject(env); @@ -564,7 +564,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetOnHeaderReceiveOnce, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value args[2] = {urlValue, callbackTwoParam}; @@ -581,7 +581,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetOnHeaderReceiveOnOn, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value args[2] = {urlValue, callbackTwoParam}; @@ -598,7 +598,7 @@ DEFINE_TEST_END DEFINE_TEST_BEGIN(TestHttpModuleMethodGetOnHeaderReceiveOff, true) { - napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=Mao"); + napi_value urlValue = NapiUtils::CreateStringUtf8(env, "https://" SERVER_IP "?name=test"); napi_value args[2] = {urlValue, callbackTwoParam}; diff --git a/test/napi/log/test_hilog.cpp b/test/napi/log/test_hilog.cpp index 12c8fa3af..83b45ad38 100644 --- a/test/napi/log/test_hilog.cpp +++ b/test/napi/log/test_hilog.cpp @@ -13,10 +13,11 @@ * limitations under the License. */ +#include + #include "hilog/log.h" #include "netstack_log.h" - -#include +#include "securec.h" namespace OHOS::HiviewDFX { static constexpr uint32_t MAX_BUFFER_SIZE = 4096; @@ -53,7 +54,7 @@ int HiLog::Debug(const HiLogLabel &label, const char *fmt, ...) if (label.domain != NETSTACK_LOG_DOMAIN) { return 0; } - (void)PRINT_LOG(Debug); + PRINT_LOG(Debug); return 0; } int HiLog::Info(const HiLogLabel &label, const char *fmt, ...) @@ -61,7 +62,7 @@ int HiLog::Info(const HiLogLabel &label, const char *fmt, ...) if (label.domain != NETSTACK_LOG_DOMAIN) { return 0; } - (void)PRINT_LOG(Info); + PRINT_LOG(Info); return 0; } int HiLog::Warn(const HiLogLabel &label, const char *fmt, ...) @@ -69,7 +70,7 @@ int HiLog::Warn(const HiLogLabel &label, const char *fmt, ...) if (label.domain != NETSTACK_LOG_DOMAIN) { return 0; } - (void)PRINT_LOG(Warn); + PRINT_LOG(Warn); return 0; } int HiLog::Error(const HiLogLabel &label, const char *fmt, ...) @@ -77,7 +78,7 @@ int HiLog::Error(const HiLogLabel &label, const char *fmt, ...) if (label.domain != NETSTACK_LOG_DOMAIN) { return 0; } - (void)PRINT_LOG(Error); + PRINT_LOG(Error); return 0; } int HiLog::Fatal(const HiLogLabel &label, const char *fmt, ...) @@ -85,7 +86,7 @@ int HiLog::Fatal(const HiLogLabel &label, const char *fmt, ...) if (label.domain != NETSTACK_LOG_DOMAIN) { return 0; } - (void)PRINT_LOG(Fatal); + PRINT_LOG(Fatal); return 0; } } // namespace OHOS::HiviewDFX \ No newline at end of file diff --git a/test/utils/napi_utils/BUILD.gn b/test/utils/napi_utils/BUILD.gn new file mode 100644 index 000000000..15d42b785 --- /dev/null +++ b/test/utils/napi_utils/BUILD.gn @@ -0,0 +1,59 @@ +# 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/test.gni") + +group("unittest") { + testonly = true + deps = [":netstack_napi_utils_unittest"] +} + +SUBSYSTEM_DIR = "//foundation/communication" + +utils_source = [ "$SUBSYSTEM_DIR/netstack/utils/napi_utils/src/netstack_napi_utils.cpp" ] + +utils_include = [ "$SUBSYSTEM_DIR/netstack/utils/napi_utils/include" ] + +common_include = [ + "//foundation/ace/ace_engine/frameworks/base/utils", + "//foundation/ace/napi/interfaces/kits", + "//foundation/ace/napi", + "//third_party/node/src", +] + +common_deps = [ + "//foundation/ace/napi/:ace_napi", + "//utils/native/base:utils", +] + +common_external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", +] + +ohos_unittest("netstack_napi_utils_unittest") { + install_enable = true + subsystem_name = "communication" + part_name = "netstack" + test_module = "netstack_napi_utils_unittest" + module_out_path = part_name + "/" + test_module + + sources = [ "test_napi_utils.cpp" ] + sources += utils_source + + include_dirs = common_include + + deps = common_deps + + external_deps = common_external_deps +} \ No newline at end of file diff --git a/test/utils/napi_utils/CMakeLists.txt b/test/utils/napi_utils/CMakeLists.txt new file mode 100644 index 000000000..4825e4560 --- /dev/null +++ b/test/utils/napi_utils/CMakeLists.txt @@ -0,0 +1,32 @@ +# 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. + +add_executable( + napi_utils_unittest + test_napi_utils.cpp + ../../napi/log/test_hilog.cpp +) + +target_link_libraries(napi_utils_unittest ace_napi_quickjs) +target_link_libraries(napi_utils_unittest quickjs) +target_link_libraries(napi_utils_unittest uv) +target_link_libraries(napi_utils_unittest securec) +target_link_libraries(napi_utils_unittest gtestd) +target_link_libraries(napi_utils_unittest gmockd) +target_link_libraries(napi_utils_unittest gtest_maind) +target_link_libraries(napi_utils_unittest gmock_maind) +target_link_libraries(napi_utils_unittest pthread) +target_link_libraries(napi_utils_unittest dl) +target_link_libraries(napi_utils_unittest netstack_utils) + +set(CMAKE_CXX_FLAGS -g) diff --git a/test/utils/napi_utils/test_napi_utils.cpp b/test/utils/napi_utils/test_napi_utils.cpp new file mode 100644 index 000000000..65a16d26f --- /dev/null +++ b/test/utils/napi_utils/test_napi_utils.cpp @@ -0,0 +1,443 @@ +/* + * 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. + */ + +#include "napi/native_node_api.h" +#include "netstack_napi_utils.h" +#include "securec.h" +#include "test_common.h" + +namespace OHOS::NetStack { + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetValueType, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value undefined = NapiUtils::GetUndefined(env); + ASSERT_EQ(NapiUtils::GetValueType(env, undefined), napi_undefined); + + napi_value jsString = NapiUtils::CreateStringUtf8(env, "test-string"); + ASSERT_EQ(NapiUtils::GetValueType(env, jsString), napi_string); + + ASSERT_EQ(NapiUtils::GetValueType(env, nullptr), napi_undefined); + ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestHasNamedProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + ASSERT_FALSE(NapiUtils::HasNamedProperty(env, obj, "test")); + + NapiUtils::SetNamedProperty(env, obj, "test", NapiUtils::CreateObject(env)); + ASSERT_TRUE(NapiUtils::HasNamedProperty(env, obj, "test")); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + NapiUtils::SetNamedProperty(env, obj, "test", NapiUtils::CreateObject(env)); + napi_value innerObj = NapiUtils::GetNamedProperty(env, obj, "test"); + ASSERT_CHECK_VALUE_TYPE(env, innerObj, napi_object); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + NapiUtils::SetNamedProperty(env, obj, "test", NapiUtils::CreateObject(env)); + napi_value innerObj = NapiUtils::GetNamedProperty(env, obj, "test"); + ASSERT_CHECK_VALUE_TYPE(env, innerObj, napi_object); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetPropertyNames, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + size_t num = 3; + napi_value obj = NapiUtils::CreateObject(env); + NapiUtils::SetNamedProperty(env, obj, "test1", NapiUtils::CreateObject(env)); + NapiUtils::SetNamedProperty(env, obj, "test2", NapiUtils::CreateObject(env)); + NapiUtils::SetNamedProperty(env, obj, "test3", NapiUtils::CreateObject(env)); + + auto names = NapiUtils::GetPropertyNames(env, obj); + ASSERT_EQ(names.size(), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateUint32, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + int num = 100; + napi_value v = NapiUtils::CreateUint32(env, num); + ASSERT_EQ(NapiUtils::GetUint32FromValue(env, v), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32FromValue, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + int num = 100; + napi_value v = NapiUtils::CreateUint32(env, num); + ASSERT_EQ(NapiUtils::GetUint32FromValue(env, v), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + int num = 100; + NapiUtils::SetUint32Property(env, obj, "test", num); + ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test"), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetUint32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + int num = 100; + NapiUtils::SetUint32Property(env, obj, "test", num); + ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test"), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateInt32, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + int num = 100; + napi_value v = NapiUtils::CreateInt32(env, num); + ASSERT_EQ(NapiUtils::GetInt32FromValue(env, v), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32FromValue, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + int num = 100; + napi_value v = NapiUtils::CreateInt32(env, num); + ASSERT_EQ(NapiUtils::GetInt32FromValue(env, v), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + int num = 100; + NapiUtils::SetInt32Property(env, obj, "test", num); + ASSERT_EQ(NapiUtils::GetInt32Property(env, obj, "test"), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetInt32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + int num = 100; + NapiUtils::SetInt32Property(env, obj, "test", num); + ASSERT_EQ(NapiUtils::GetInt32Property(env, obj, "test"), num); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateStringUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + std::string s = "test-string"; + napi_value v = NapiUtils::CreateStringUtf8(env, s); + ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, v), s); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringFromValueUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + std::string s = "test-string"; + napi_value v = NapiUtils::CreateStringUtf8(env, s); + ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, v), s); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + std::string s = "test-string"; + NapiUtils::SetStringPropertyUtf8(env, obj, "test", s); + ASSERT_EQ(NapiUtils::GetStringPropertyUtf8(env, obj, "test"), s); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + std::string s = "test-string"; + NapiUtils::SetStringPropertyUtf8(env, obj, "test", s); + ASSERT_EQ(NapiUtils::GetStringPropertyUtf8(env, obj, "test"), s); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestValueIsArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + const char *s = "test-string"; + + void *data = nullptr; + size_t len = strlen(s); + + napi_value v = NapiUtils::CreateArrayBuffer(env, len, &data); + ASSERT_TRUE(NapiUtils::ValueIsArrayBuffer(env, v)); + + (void)memcpy_s(data, len, s, len); + + size_t tempLen = 0; + void *temp = NapiUtils::GetInfoFromArrayBufferValue(env, v, &tempLen); + ASSERT_EQ(tempLen, len); + int ret = memcmp(data, temp, len); + ASSERT_EQ(ret, 0); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInfoFromArrayBufferValue, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + const char *s = "test-string"; + + void *data = nullptr; + size_t len = strlen(s); + + napi_value v = NapiUtils::CreateArrayBuffer(env, len, &data); + ASSERT_TRUE(NapiUtils::ValueIsArrayBuffer(env, v)); + + (void)memcpy_s(data, len, s, len); + + size_t tempLen = 0; + void *temp = NapiUtils::GetInfoFromArrayBufferValue(env, v, &tempLen); + ASSERT_EQ(tempLen, len); + int ret = memcmp(data, temp, len); + ASSERT_EQ(ret, 0); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + const char *s = "test-string"; + + void *data = nullptr; + size_t len = strlen(s); + + napi_value v = NapiUtils::CreateArrayBuffer(env, len, &data); + ASSERT_TRUE(NapiUtils::ValueIsArrayBuffer(env, v)); + + (void)memcpy_s(data, len, s, len); + + size_t tempLen = 0; + void *temp = NapiUtils::GetInfoFromArrayBufferValue(env, v, &tempLen); + ASSERT_EQ(tempLen, len); + int ret = memcmp(data, temp, len); + ASSERT_EQ(ret, 0); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateObject, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value undefined = NapiUtils::GetUndefined(env); + ASSERT_EQ(NapiUtils::GetValueType(env, undefined), napi_undefined); + + napi_value jsString = NapiUtils::CreateStringUtf8(env, "test-string"); + ASSERT_EQ(NapiUtils::GetValueType(env, jsString), napi_string); + + ASSERT_EQ(NapiUtils::GetValueType(env, nullptr), napi_undefined); + ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUndefined, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value undefined = NapiUtils::GetUndefined(env); + ASSERT_EQ(NapiUtils::GetValueType(env, undefined), napi_undefined); + + napi_value jsString = NapiUtils::CreateStringUtf8(env, "test-string"); + ASSERT_EQ(NapiUtils::GetValueType(env, jsString), napi_string); + + ASSERT_EQ(NapiUtils::GetValueType(env, nullptr), napi_undefined); + ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCallFunction, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + auto func = [](napi_env env, napi_callback_info info) -> napi_value { + return NapiUtils::CreateStringUtf8(env, "test-string"); + }; + + napi_value jsFunc = NapiUtils::CreateFunction(env, "test_func", func, nullptr); + napi_value ret = NapiUtils::CallFunction(env, nullptr, jsFunc, 0, nullptr); + ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, ret), "test-string"); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateFunction, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + auto func = [](napi_env env, napi_callback_info info) -> napi_value { + return NapiUtils::CreateStringUtf8(env, "test-string"); + }; + + napi_value jsFunc = NapiUtils::CreateFunction(env, "test_func", func, nullptr); + napi_value ret = NapiUtils::CallFunction(env, nullptr, jsFunc, 0, nullptr); + ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, ret), "test-string"); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateReference, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + auto func = [](napi_env env, napi_callback_info info) -> napi_value { + return NapiUtils::CreateStringUtf8(env, "test-string"); + }; + + napi_value jsFunc = NapiUtils::CreateFunction(env, "test_func", func, nullptr); + napi_ref ref = NapiUtils::CreateReference(env, jsFunc); + ASSERT_NE(ref, nullptr); + + napi_value v = NapiUtils::GetReference(env, ref); + ASSERT_NE(v, nullptr); + + NapiUtils::DeleteReference(env, ref); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetReference, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + auto func = [](napi_env env, napi_callback_info info) -> napi_value { + return NapiUtils::CreateStringUtf8(env, "test-string"); + }; + + napi_value jsFunc = NapiUtils::CreateFunction(env, "test_func", func, nullptr); + napi_ref ref = NapiUtils::CreateReference(env, jsFunc); + ASSERT_NE(ref, nullptr); + + napi_value v = NapiUtils::GetReference(env, ref); + ASSERT_NE(v, nullptr); + + NapiUtils::DeleteReference(env, ref); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDeleteReference, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + auto func = [](napi_env env, napi_callback_info info) -> napi_value { + return NapiUtils::CreateStringUtf8(env, "test-string"); + }; + + napi_value jsFunc = NapiUtils::CreateFunction(env, "test_func", func, nullptr); + napi_ref ref = NapiUtils::CreateReference(env, jsFunc); + ASSERT_NE(ref, nullptr); + + napi_value v = NapiUtils::GetReference(env, ref); + ASSERT_NE(v, nullptr); + + NapiUtils::DeleteReference(env, ref); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + bool s = true; + NapiUtils::SetBooleanProperty(env, obj, "test", s); + ASSERT_EQ(NapiUtils::GetBooleanProperty(env, obj, "test"), s); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + napi_value obj = NapiUtils::CreateObject(env); + + bool s = true; + NapiUtils::SetBooleanProperty(env, obj, "test", s); + ASSERT_EQ(NapiUtils::GetBooleanProperty(env, obj, "test"), s); +} + +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDefineProperties, testing::ext::TestSize.Level0) /* NOLINT*/ +{ + auto env = (napi_env)engine_; + + int num = 10; + std::initializer_list properties = { + DECLARE_NAPI_STATIC_PROPERTY("test1", NapiUtils::CreateUint32(env, num)), + DECLARE_NAPI_STATIC_PROPERTY("test2", NapiUtils::CreateUint32(env, num)), + DECLARE_NAPI_STATIC_PROPERTY("test3", NapiUtils::CreateUint32(env, num)), + }; + + napi_value obj = NapiUtils::CreateObject(env); + NapiUtils::DefineProperties(env, obj, properties); + + ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test1"), num); + ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test2"), num); + ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test3"), num); +} + +} // namespace OHOS::NetStack + +int main(int argc, char **argv) +{ + testing::GTEST_FLAG(output) = "xml:./"; + testing::InitGoogleTest(&argc, argv); + + JSRuntime *rt = JS_NewRuntime(); + + if (rt == nullptr) { + return 0; + } + + JSContext *ctx = JS_NewContext(rt); + if (ctx == nullptr) { + return 0; + } + + js_std_add_helpers(ctx, 0, nullptr); + + g_nativeEngine = new QuickJSNativeEngine(rt, ctx, nullptr); // default instance id 0 + + napi_module_register(nullptr); + int ret = RUN_ALL_TESTS(); + (void)ret; + + return 0; +} \ No newline at end of file -- Gitee From 7168bfb02c7c316ada0e839751718d9a593fac3e Mon Sep 17 00:00:00 2001 From: maosiping Date: Thu, 20 Jan 2022 15:33:57 +0800 Subject: [PATCH 2/8] add unit test Signed-off-by: maosiping --- CMakeLists.txt | 2 +- test/utils/napi_utils/test_napi_utils.cpp | 60 +++++++++++------------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f03becaa7..5af64e8ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ link_directories(../../../third_party/libuv/cmake-build-debug) link_directories(cmake-build-debug/utils) -add_subdirectory(frameworks/js/builtin) +# add_subdirectory(frameworks/js/builtin) add_subdirectory(utils) add_subdirectory(test/napi/http) add_subdirectory(test/napi/socket) diff --git a/test/utils/napi_utils/test_napi_utils.cpp b/test/utils/napi_utils/test_napi_utils.cpp index 65a16d26f..fab79113d 100644 --- a/test/utils/napi_utils/test_napi_utils.cpp +++ b/test/utils/napi_utils/test_napi_utils.cpp @@ -20,7 +20,7 @@ namespace OHOS::NetStack { -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetValueType, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetValueType, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -34,7 +34,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestHasNamedProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestHasNamedProperty, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -45,7 +45,7 @@ namespace OHOS::NetStack { ASSERT_TRUE(NapiUtils::HasNamedProperty(env, obj, "test")); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -56,7 +56,7 @@ namespace OHOS::NetStack { ASSERT_CHECK_VALUE_TYPE(env, innerObj, napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -67,7 +67,7 @@ namespace OHOS::NetStack { ASSERT_CHECK_VALUE_TYPE(env, innerObj, napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetPropertyNames, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetPropertyNames, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -81,7 +81,7 @@ namespace OHOS::NetStack { ASSERT_EQ(names.size(), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateUint32, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateUint32, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -90,7 +90,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32FromValue, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32FromValue, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -99,7 +99,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32Property, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -110,7 +110,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetUint32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetUint32Property, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -121,7 +121,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateInt32, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateInt32, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -130,7 +130,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32FromValue, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32FromValue, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -139,7 +139,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32Property, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -150,7 +150,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetInt32Property, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetInt32Property, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -161,7 +161,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateStringUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateStringUtf8, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -170,7 +170,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, v), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringFromValueUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringFromValueUtf8, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -179,7 +179,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, v), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -190,7 +190,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringPropertyUtf8(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -201,7 +201,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringPropertyUtf8(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestValueIsArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestValueIsArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -222,7 +222,7 @@ namespace OHOS::NetStack { ASSERT_EQ(ret, 0); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInfoFromArrayBufferValue, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInfoFromArrayBufferValue, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -243,7 +243,7 @@ namespace OHOS::NetStack { ASSERT_EQ(ret, 0); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -264,7 +264,7 @@ namespace OHOS::NetStack { ASSERT_EQ(ret, 0); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateObject, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateObject, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -278,7 +278,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUndefined, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUndefined, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -292,7 +292,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCallFunction, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCallFunction, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -305,7 +305,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, ret), "test-string"); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateFunction, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateFunction, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -318,7 +318,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, ret), "test-string"); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateReference, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateReference, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -336,7 +336,7 @@ namespace OHOS::NetStack { NapiUtils::DeleteReference(env, ref); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetReference, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetReference, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -354,7 +354,7 @@ namespace OHOS::NetStack { NapiUtils::DeleteReference(env, ref); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDeleteReference, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDeleteReference, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -372,7 +372,7 @@ namespace OHOS::NetStack { NapiUtils::DeleteReference(env, ref); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -383,7 +383,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetBooleanProperty(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -394,7 +394,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetBooleanProperty(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDefineProperties, testing::ext::TestSize.Level0) /* NOLINT*/ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDefineProperties, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; -- Gitee From 5d1fd7e733e4c52ec781f8c763d5e68117fa1046 Mon Sep 17 00:00:00 2001 From: maosiping Date: Thu, 20 Jan 2022 15:38:26 +0800 Subject: [PATCH 3/8] add unittest Signed-off-by: maosiping --- test/utils/napi_utils/BUILD.gn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/utils/napi_utils/BUILD.gn b/test/utils/napi_utils/BUILD.gn index 15d42b785..c3710ad45 100644 --- a/test/utils/napi_utils/BUILD.gn +++ b/test/utils/napi_utils/BUILD.gn @@ -20,7 +20,8 @@ group("unittest") { SUBSYSTEM_DIR = "//foundation/communication" -utils_source = [ "$SUBSYSTEM_DIR/netstack/utils/napi_utils/src/netstack_napi_utils.cpp" ] +utils_source = + [ "$SUBSYSTEM_DIR/netstack/utils/napi_utils/src/netstack_napi_utils.cpp" ] utils_include = [ "$SUBSYSTEM_DIR/netstack/utils/napi_utils/include" ] @@ -56,4 +57,4 @@ ohos_unittest("netstack_napi_utils_unittest") { deps = common_deps external_deps = common_external_deps -} \ No newline at end of file +} -- Gitee From 988401813174762676dfb7f5b6766266af3cf585 Mon Sep 17 00:00:00 2001 From: maosiping Date: Thu, 20 Jan 2022 16:47:24 +0800 Subject: [PATCH 4/8] add unittest Signed-off-by: maosiping --- test/napi/log/test_hilog.cpp | 35 ++++++++++------------- test/utils/napi_utils/BUILD.gn | 2 +- test/utils/napi_utils/test_napi_utils.cpp | 2 -- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/test/napi/log/test_hilog.cpp b/test/napi/log/test_hilog.cpp index 83b45ad38..58953bcdf 100644 --- a/test/napi/log/test_hilog.cpp +++ b/test/napi/log/test_hilog.cpp @@ -15,9 +15,7 @@ #include -#include "hilog/log.h" #include "netstack_log.h" -#include "securec.h" namespace OHOS::HiviewDFX { static constexpr uint32_t MAX_BUFFER_SIZE = 4096; @@ -29,24 +27,21 @@ static void StripFormatString(const std::string &prefix, std::string &str) } } -#define PRINT_LOG(LEVEL) \ - do { \ - std::string newFmt(fmt); \ - StripFormatString("{public}", newFmt); \ - StripFormatString("{private}", newFmt); \ - \ - va_list args; \ - va_start(args, fmt); \ - \ - char buf[MAX_BUFFER_SIZE] = {"\0"}; \ - int ret = vsnprintf_s(buf, sizeof(buf), sizeof(buf) - 1, newFmt.c_str(), args); \ - if (ret < 0) { \ - return -1; \ - } \ - va_end(args); \ - \ - printf("%s %s\r\n", #LEVEL, buf); \ - fflush(stdout); \ +#define PRINT_LOG(LEVEL) \ + do { \ + std::string newFmt(fmt); \ + StripFormatString("{public}", newFmt); \ + StripFormatString("{private}", newFmt); \ + \ + va_list args; \ + va_start(args, fmt); \ + printf(#LEVEL " "); \ + fflush(stdout); \ + vfprintf(stdout, newFmt.c_str(), args); \ + fflush(stdout); \ + printf("\n"); \ + fflush(stdout); \ + va_end(args); \ } while (0) int HiLog::Debug(const HiLogLabel &label, const char *fmt, ...) diff --git a/test/utils/napi_utils/BUILD.gn b/test/utils/napi_utils/BUILD.gn index c3710ad45..32ea0f28f 100644 --- a/test/utils/napi_utils/BUILD.gn +++ b/test/utils/napi_utils/BUILD.gn @@ -15,7 +15,7 @@ import("//build/test.gni") group("unittest") { testonly = true - deps = [":netstack_napi_utils_unittest"] + deps = [ ":netstack_napi_utils_unittest" ] } SUBSYSTEM_DIR = "//foundation/communication" diff --git a/test/utils/napi_utils/test_napi_utils.cpp b/test/utils/napi_utils/test_napi_utils.cpp index fab79113d..02fc302ac 100644 --- a/test/utils/napi_utils/test_napi_utils.cpp +++ b/test/utils/napi_utils/test_napi_utils.cpp @@ -19,7 +19,6 @@ #include "test_common.h" namespace OHOS::NetStack { - [[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetValueType, testing::ext::TestSize.Level0) /* NOLINT */ { auto env = (napi_env)engine_; @@ -412,7 +411,6 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test2"), num); ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test3"), num); } - } // namespace OHOS::NetStack int main(int argc, char **argv) -- Gitee From 7b840376f35524e0a52818e8641ec707d986a941 Mon Sep 17 00:00:00 2001 From: maosiping Date: Fri, 21 Jan 2022 16:53:24 +0800 Subject: [PATCH 5/8] add unittest Signed-off-by: maosiping --- CMakeLists.txt | 2 +- ohos.build | 3 + test/utils/napi_utils/{ => unittest}/BUILD.gn | 0 .../napi_utils/{ => unittest}/CMakeLists.txt | 2 +- .../{ => unittest}/test_napi_utils.cpp | 60 +++++++++---------- .../include/netstack_module_template.h | 1 + 6 files changed, 36 insertions(+), 32 deletions(-) rename test/utils/napi_utils/{ => unittest}/BUILD.gn (100%) rename test/utils/napi_utils/{ => unittest}/CMakeLists.txt (97%) rename test/utils/napi_utils/{ => unittest}/test_napi_utils.cpp (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5af64e8ad..df12a6e98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,4 +60,4 @@ link_directories(cmake-build-debug/utils) add_subdirectory(utils) add_subdirectory(test/napi/http) add_subdirectory(test/napi/socket) -add_subdirectory(test/utils/napi_utils) \ No newline at end of file +add_subdirectory(test/utils/napi_utils/unittest) \ No newline at end of file diff --git a/ohos.build b/ohos.build index 065641c33..b0bc25fce 100644 --- a/ohos.build +++ b/ohos.build @@ -11,6 +11,9 @@ "//foundation/communication/netstack/frameworks/js/napi:http", "//foundation/communication/netstack/frameworks/js/napi:socket", "//foundation/communication/netstack/frameworks/js/napi:websocket" + ], + "test_list": [ + "//foundation/communication/netstack/test/utils/napi_utils:unittest" ] } } diff --git a/test/utils/napi_utils/BUILD.gn b/test/utils/napi_utils/unittest/BUILD.gn similarity index 100% rename from test/utils/napi_utils/BUILD.gn rename to test/utils/napi_utils/unittest/BUILD.gn diff --git a/test/utils/napi_utils/CMakeLists.txt b/test/utils/napi_utils/unittest/CMakeLists.txt similarity index 97% rename from test/utils/napi_utils/CMakeLists.txt rename to test/utils/napi_utils/unittest/CMakeLists.txt index 4825e4560..9bf2ddce9 100644 --- a/test/utils/napi_utils/CMakeLists.txt +++ b/test/utils/napi_utils/unittest/CMakeLists.txt @@ -14,7 +14,7 @@ add_executable( napi_utils_unittest test_napi_utils.cpp - ../../napi/log/test_hilog.cpp + ../../../napi/log/test_hilog.cpp ) target_link_libraries(napi_utils_unittest ace_napi_quickjs) diff --git a/test/utils/napi_utils/test_napi_utils.cpp b/test/utils/napi_utils/unittest/test_napi_utils.cpp similarity index 90% rename from test/utils/napi_utils/test_napi_utils.cpp rename to test/utils/napi_utils/unittest/test_napi_utils.cpp index 02fc302ac..bb5c558f6 100644 --- a/test/utils/napi_utils/test_napi_utils.cpp +++ b/test/utils/napi_utils/unittest/test_napi_utils.cpp @@ -19,7 +19,7 @@ #include "test_common.h" namespace OHOS::NetStack { -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetValueType, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetValueType, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -33,7 +33,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestHasNamedProperty, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestHasNamedProperty, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -44,7 +44,7 @@ namespace OHOS::NetStack { ASSERT_TRUE(NapiUtils::HasNamedProperty(env, obj, "test")); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetNamedProperty, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -55,7 +55,7 @@ namespace OHOS::NetStack { ASSERT_CHECK_VALUE_TYPE(env, innerObj, napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetNamedProperty, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetNamedProperty, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -66,7 +66,7 @@ namespace OHOS::NetStack { ASSERT_CHECK_VALUE_TYPE(env, innerObj, napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetPropertyNames, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetPropertyNames, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -80,7 +80,7 @@ namespace OHOS::NetStack { ASSERT_EQ(names.size(), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateUint32, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateUint32, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -89,7 +89,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32FromValue, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32FromValue, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -98,7 +98,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32Property, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUint32Property, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -109,7 +109,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetUint32Property, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetUint32Property, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -120,7 +120,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetUint32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateInt32, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateInt32, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -129,7 +129,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32FromValue, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32FromValue, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -138,7 +138,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32FromValue(env, v), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32Property, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInt32Property, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -149,7 +149,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetInt32Property, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetInt32Property, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -160,7 +160,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetInt32Property(env, obj, "test"), num); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateStringUtf8, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateStringUtf8, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -169,7 +169,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, v), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringFromValueUtf8, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringFromValueUtf8, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -178,7 +178,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, v), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetStringPropertyUtf8, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -189,7 +189,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringPropertyUtf8(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetStringPropertyUtf8, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetStringPropertyUtf8, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -200,7 +200,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringPropertyUtf8(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestValueIsArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestValueIsArrayBuffer, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -221,7 +221,7 @@ namespace OHOS::NetStack { ASSERT_EQ(ret, 0); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInfoFromArrayBufferValue, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetInfoFromArrayBufferValue, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -242,7 +242,7 @@ namespace OHOS::NetStack { ASSERT_EQ(ret, 0); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateArrayBuffer, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateArrayBuffer, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -263,7 +263,7 @@ namespace OHOS::NetStack { ASSERT_EQ(ret, 0); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateObject, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateObject, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -277,7 +277,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUndefined, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetUndefined, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -291,7 +291,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetValueType(env, NapiUtils::CreateObject(env)), napi_object); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCallFunction, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCallFunction, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -304,7 +304,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, ret), "test-string"); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateFunction, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateFunction, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -317,7 +317,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetStringFromValueUtf8(env, ret), "test-string"); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateReference, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestCreateReference, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -335,7 +335,7 @@ namespace OHOS::NetStack { NapiUtils::DeleteReference(env, ref); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetReference, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetReference, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -353,7 +353,7 @@ namespace OHOS::NetStack { NapiUtils::DeleteReference(env, ref); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDeleteReference, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDeleteReference, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -371,7 +371,7 @@ namespace OHOS::NetStack { NapiUtils::DeleteReference(env, ref); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestGetBooleanProperty, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -382,7 +382,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetBooleanProperty(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetBooleanProperty, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestSetBooleanProperty, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; @@ -393,7 +393,7 @@ namespace OHOS::NetStack { ASSERT_EQ(NapiUtils::GetBooleanProperty(env, obj, "test"), s); } -[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDefineProperties, testing::ext::TestSize.Level0) /* NOLINT */ +[[maybe_unused]] HWTEST_F(NativeEngineTest, TestDefineProperties, testing::ext::TestSize.Level1) /* NOLINT */ { auto env = (napi_env)engine_; diff --git a/utils/module_template/include/netstack_module_template.h b/utils/module_template/include/netstack_module_template.h index ce1af933c..2a335c62c 100644 --- a/utils/module_template/include/netstack_module_template.h +++ b/utils/module_template/include/netstack_module_template.h @@ -46,6 +46,7 @@ napi_value Interface(napi_env env, auto context = new Context(env, manager); context->ParseParams(params, paramsCount); + NETSTACK_LOGE("js params parse OK ? %{public}d", context->IsParseOK()); if (Work != nullptr) { if (!Work(env, thisVal, context)) { NETSTACK_LOGE("work failed error code = %{public}d", context->GetErrorCode()); -- Gitee From f4492d1df8137dfe544d808e84fd11d2b5a52e66 Mon Sep 17 00:00:00 2001 From: maosiping Date: Fri, 21 Jan 2022 17:13:17 +0800 Subject: [PATCH 6/8] add unittest Signed-off-by: maosiping --- test/utils/napi_utils/BUILD.gn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 test/utils/napi_utils/BUILD.gn diff --git a/test/utils/napi_utils/BUILD.gn b/test/utils/napi_utils/BUILD.gn new file mode 100644 index 000000000..6a8df0e01 --- /dev/null +++ b/test/utils/napi_utils/BUILD.gn @@ -0,0 +1,19 @@ +# 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/test.gni") + +group("unittest") { + testonly = true + deps = [ "unittest:unittest" ] +} \ No newline at end of file -- Gitee From 409403aef3a9798091aaf7428384a84528d97cee Mon Sep 17 00:00:00 2001 From: maosiping Date: Fri, 21 Jan 2022 19:04:33 +0800 Subject: [PATCH 7/8] add unittest Signed-off-by: maosiping --- test/utils/napi_utils/unittest/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/utils/napi_utils/unittest/BUILD.gn b/test/utils/napi_utils/unittest/BUILD.gn index 32ea0f28f..47d8dbace 100644 --- a/test/utils/napi_utils/unittest/BUILD.gn +++ b/test/utils/napi_utils/unittest/BUILD.gn @@ -52,7 +52,7 @@ ohos_unittest("netstack_napi_utils_unittest") { sources = [ "test_napi_utils.cpp" ] sources += utils_source - include_dirs = common_include + include_dirs = utils_include + common_include deps = common_deps -- Gitee From aa3082e3dfe1855b32fee1be5f42bbfc1f7bd21d Mon Sep 17 00:00:00 2001 From: maosiping Date: Sat, 22 Jan 2022 10:14:37 +0800 Subject: [PATCH 8/8] add unittest Signed-off-by: maosiping --- test/utils/napi_utils/unittest/BUILD.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/utils/napi_utils/unittest/BUILD.gn b/test/utils/napi_utils/unittest/BUILD.gn index 47d8dbace..fdf91d58b 100644 --- a/test/utils/napi_utils/unittest/BUILD.gn +++ b/test/utils/napi_utils/unittest/BUILD.gn @@ -52,7 +52,9 @@ ohos_unittest("netstack_napi_utils_unittest") { sources = [ "test_napi_utils.cpp" ] sources += utils_source - include_dirs = utils_include + common_include + include_dirs = [ "$SUBSYSTEM_DIR/netstack/test/napi/common" ] + include_dirs += utils_include + include_dirs += common_include deps = common_deps -- Gitee