!1 fix hilog typo and dfx include dir

Merge pull request !1 from stesen/dfx

build_lite/BUILD.gn

@@ -40,6 +40,7 @@ lite_component("acts_component") {
         "//test/xts/acts/kernel_lite/kernelcmsis_hal:ActsCMSISTest",
         "//test/xts/acts/utils_lite/kv_store_hal:ActsKvStoreTest",
         "//test/xts/acts/security_lite/datahuks_hal:ActsSecurityDataTest",
+        "//test/xts/acts/hiviewdfx_lite/hilog_hal:ActsDfxFuncTest",
 
         "//test/xts/acts/distributed_schedule_lite/samgr_hal:ActsSamgrTest",
         "//test/xts/acts/update_lite/updater_hal:ActsUpdaterFuncTest",
@@ -59,6 +60,7 @@ lite_component("acts_component") {
 
         #"//test/xts/acts/distributedschedule_lite/dtbschedmgr_posix:ActsDMSTest",
         "//test/xts/acts/security_lite/permission_posix/pms:ActsPMSTest",
+        "//test/xts/acts/hiviewdfx_lite/hilog_posix:ActsHilogTest",
         "//test/xts/acts/multimedia_lite/multimedia_posix/recorder:ActsMediaRecorderTest",
 
         "//test/xts/acts/graphic_lite/graphic_utils:uikit_test1",

hiviewdfx_lite/hilog_hal/BUILD.gn

+ # Copyright (c) 2020 Huawei Device Co., Ltd.
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ #     http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+import("//test/xts/tools/lite/build/suite_lite.gni")
+hctest_suite("ActsDfxFuncTest") {
+    suite_name = "acts"
+    sources = [
+        "src/dfx_hilog.c",
+    ]
+
+    include_dirs = [
+        "src",
+        "//base/hiviewdfx/hiview_lite",
+        "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite",
+        "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits",
+        "//base/hiviewdfx/hilog_lite/frameworks/mini",
+        "//vendor/hisi/hi3861/hi3861/include",
+        "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include"
+    ]
+
+    cflags = [ "-Wno-error" ]
+}

hiviewdfx_lite/hilog_hal/Test.tmpl

+{
+    "description": "Config for $module test cases",
+    "environment": [
+        {
+            "type": "device",
+            "label": "wifiiot"
+        }
+    ],
+    "kits": [
+        {
+            "type": "DeployKit",
+            "timeout": "20000",
+            "burn_file": "$subsystem/$module.bin"
+        }
+    ],
+    "driver": {
+        "type": "CTestLite"
+    }
+}
\ No newline at end of file

hiviewdfx_lite/hilog_hal/src/dfx_hilog.c

+/*
+ * 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.
+ */
+
+
+#include <hiview_util.h>
+#include <securec.h>
+#include <hiview_config.h>
+#include <hiview_def.h>
+#include "hiview_output_log.h"
+#include "log.h"
+#include "hctest.h"
+
+/**
+ * @tc.desc      : register a test suite, this suite is used to test basic flow and interface dependency
+ * @param        : subsystem name is dfx
+ * @param        : module name is dfxlite
+ * @param        : test suit name is DfxFuncTestSuite
+ */
+LITE_TEST_SUIT(dfx, dfxlite, DfxFuncTestSuite);
+
+/**
+ * @tc.setup     : setup for all testcases
+ * @return       : setup result, TRUE is success, FALSE is fail
+ */
+static BOOL DfxFuncTestSuiteSetUp(void)
+{
+    return TRUE;
+}
+
+/**
+ * @tc.teardown  : teardown for all testcases
+ * @return       : teardown result, TRUE is success, FALSE is fail
+ */
+static BOOL DfxFuncTestSuiteTearDown(void)
+{
+    printf("+-------------------------------------------+\n");
+    return TRUE;
+}
+
+/**
+ * @tc.number    : SUB_DFX_DFT_Hilog_0100
+ * @tc.name      : DebugLog print test
+ * @tc.desc      : [C- SOFTWARE -0200]
+ * @tc.size      : MEDIUM
+ * @tc.type      : RELI
+ * @tc.level     : Level 0
+ */
+LITE_TEST_CASE(DfxFuncTestSuite, subDfxDftHilog0100, LEVEL0)
+{
+    HILOG_DEBUG(HILOG_MODULE_HIVIEW, "debuglog test pass");
+};
+
+
+/**
+ * @tc.number    : SUB_DFX_DFT_Hilog_0200
+ * @tc.name      : InfoLog print test
+ * @tc.desc      : [C- SOFTWARE -0200]
+ * @tc.size      : MEDIUM
+ * @tc.type      : RELI
+ * @tc.level     : Level 1
+ */
+LITE_TEST_CASE(DfxFuncTestSuite, subDfxDftHilog0200, LEVEL1)
+{
+    HILOG_INFO(HILOG_MODULE_HIVIEW, "infolog test pass");
+};
+
+/**
+ * @tc.number    : SUB_DFX_DFT_Hilog_0300
+ * @tc.name      : DebugLog print test
+ * @tc.desc      : [C- SOFTWARE -0200]
+ * @tc.size      : MEDIUM
+ * @tc.type      : RELI
+ * @tc.level     : Level 1
+ */
+LITE_TEST_CASE(DfxFuncTestSuite, subDfxDftHilog0300, LEVEL1)
+{
+    HILOG_WARN(HILOG_MODULE_HIVIEW, "warnlog test pass");
+};
+
+/**
+ * @tc.number    : SUB_DFX_DFT_Hilog_0400
+ * @tc.name      : ErrorLog print test
+ * @tc.desc      : [C- SOFTWARE -0200]
+ * @tc.size      : MEDIUM
+ * @tc.type      : RELI
+ * @tc.level     : Level 1
+ */
+LITE_TEST_CASE(DfxFuncTestSuite, subDfxDftHilog0400, LEVEL1)
+{
+    HILOG_ERROR(HILOG_MODULE_HIVIEW, "errorlog test pass");
+};
+
+/**
+ * @tc.number    : SUB_DFX_DFT_Hilog_0500
+ * @tc.name      : FatalLog print test
+ * @tc.desc      : [C- SOFTWARE -0200]
+ * @tc.size      : MEDIUM
+ * @tc.type      : RELI
+ * @tc.level     : Level 1
+ */
+LITE_TEST_CASE(DfxFuncTestSuite, subDfxDftHilog0500, LEVEL1)
+{
+    HILOG_FATAL(HILOG_MODULE_HIVIEW, "fatallog test pass");
+};
+
+/**
+ * @tc.number    : SUB_DFX_DFT_Hilog_0600
+ * @tc.name      : HiLogRegisterModule test
+ * @tc.desc      : [C- SOFTWARE -0200]
+ * @tc.size      : MEDIUM
+ * @tc.type      : RELI
+ * @tc.level     : Level 0
+ */
+LITE_TEST_CASE(DfxFuncTestSuite, subDfxDftHilog0600, LEVEL0)
+{
+    bool ret = TRUE;
+    ret = HiLogRegisterModule(HILOG_MODULE_HIVIEW, "HIVIEW");
+    TEST_ASSERT_FALSE(ret);
+};
+
+/**
+ * @tc.number    : SUB_DFX_DFT_Hilog_0700
+ * @tc.name      : HiLogGetModuleName test
+ * @tc.desc      : [C- SOFTWARE -0200]
+ * @tc.size      : MEDIUM
+ * @tc.type      : RELI
+ * @tc.level     : Level 0
+ */
+LITE_TEST_CASE(DfxFuncTestSuite, subDfxDftHilog0700, LEVEL0)
+{
+    const char * ret = HiLogGetModuleName(HILOG_MODULE_HIVIEW);
+    TEST_ASSERT_EQUAL_STRING(ret, "HIVIEW"); 
+};
+
+RUN_TEST_SUITE(DfxFuncTestSuite);

hiviewdfx_lite/hilog_posix/BUILD.gn

+# 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("//test/xts/tools/lite/build/suite_lite.gni")
+
+hcpptest_suite("ActsHilogTest") {
+  suite_name = "acts"
+  sources = [ "src/HilogTest.cpp" ]
+
+  include_dirs = [
+    "src",
+    "//test/xts/tools/hctest/include",
+    "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits/",
+    "//kernel/liteos_a/include/config/base/core",
+  ]
+  deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared" ]
+
+  cflags = [ "-Wno-error" ]
+  defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ]
+  ldflags = [
+    "-lstdc++",
+    "-lm",
+    "-lpthread",
+  ]
+}

hiviewdfx_lite/hilog_posix/Test.json

+
+{
+    "description": "Config for kernel_lite test cases",
+    "environment": [
+        {
+            "type": "device",
+            "label": "ipcamera"
+        }
+    ],
+    "kits": [
+        {
+            "type": "MountKit",
+            "server": "NfsServer",
+            "mount": [
+                {
+                    "source": "testcases/hiviewdfx",
+                    "target": "/test_root/hiviewdfx"
+                }
+            ]
+        }
+    ],
+    "driver": {
+        "type": "CppTestLite",
+        "execute": "/test_root/hiviewdfx/ActsHilogTest.bin"
+    }
+}
\ No newline at end of file

hiviewdfx_lite/hilog_posix/src/HilogTest.cpp

+/*
+ * 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.
+ */
+
+
+#include <stdio.h>
+#include "gtest/gtest.h"
+#include "log.h"
+
+#undef LOG_TAG
+#undef LOG_DOMAIN
+#define LOG_TAG "Test_TAG"
+#define LOG_DOMAIN 0xD002D00
+
+using namespace OHOS::HiviewDFX;
+static constexpr HiLogLabel LABEL = {LOG_CORE, 0xD002D00, "Test_TAG"};
+using namespace std;
+using namespace testing::ext;
+	
+class HiLogTest : public testing::Test {
+protected:
+    static void SetUpTestCase(void) {}
+    static void TearDownTestCase(void) {}
+    virtual void SetUp() {}
+    virtual void TearDown() {}
+};
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0100
+ * @tc.name      : HiLog_DEBUG parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0100, Function | MediumTest | Level0)
+{
+    HILOG_DEBUG(LOG_CORE, "Debug log of HiLog API test");
+}
+
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0200
+ * @tc.name      : HILOG_INFO parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0200, Function | MediumTest | Level1)
+{
+    HILOG_INFO(LOG_CORE, "Info log of HiLog API test");
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0300
+ * @tc.name      : HILOG_WARN parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0300, Function | MediumTest | Level1)
+{
+    HILOG_WARN(LOG_CORE, "Warn log of HiLog API test");
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0400
+ * @tc.name      : HILOG_ERROR parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0400, Function | MediumTest | Level1)
+{
+    HILOG_ERROR(LOG_CORE, "Error log of HiLog API test");
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0500
+ * @tc.name      : HILOG_FATAL parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0500, Function | MediumTest | Level1)
+{
+    HILOG_FATAL(LOG_CORE, "Fatal log of HiLog API test");
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0600
+ * @tc.name      : HiLog::Debug parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0600, Function | MediumTest | Level1)
+{
+    bool ret = true;
+    ret = HiLog::Debug(LABEL, "Debug log of HiLog API test");
+    EXPECT_TRUE(ret);
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0700
+ * @tc.name      : HiLog::Error parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0700, Function | MediumTest | Level1)
+{
+    bool ret = true;
+    ret = HiLog::Error(LABEL, "Error log of HiLog API test");
+    EXPECT_TRUE(ret);
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0800
+ * @tc.name      : HiLog::Fatal parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0800, Function | MediumTest | Level1)
+{
+    bool ret = true;
+    ret = HiLog::Fatal(LABEL, "Fatal log of HiLog API test");
+    EXPECT_TRUE(ret);
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_0900
+ * @tc.name      : HiLog::Info parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi0900, Function | MediumTest | Level1)
+{
+    bool ret = true;
+    ret = HiLog::Info(LABEL, "Info log of HiLog API test");
+    EXPECT_TRUE(ret);
+}
+
+/**
+ * @tc.number    : Sub_Dfx_Dft_HiLog_Cortexaapi_1000
+ * @tc.name      : HiLog::Warn parameter legal test (Cortex-A, C)
+ * @tc.desc      : [C- SOFTWARE -0200]
+ */
+HWTEST_F(HiLogTest, subDfxDftHiLogCortexaapi1000, Function | MediumTest | Level1)
+{
+    bool ret = true;
+    ret = HiLog::Warn(LABEL, "Warn log of HiLog API test");
+    EXPECT_TRUE(ret);
+}