提交 741b353e 编写于 作者: O openharmony_ci 提交者: Gitee

!51 acts bug修复

Merge pull request !51 from jiyong/master
......@@ -522,7 +522,9 @@ Execute **ActsDemoTest.bin** to trigger test case execution, and analyze seria
## Repositories Involved<a name="section1371113476307"></a>
xts\_acts
[X Test Suite](https://gitee.com/openharmony/docs/blob/master/en/readme/x-test-suite.md)
xts\_tools
**xts\_acts**
[xts\_tools](https://gitee.com/openharmony/xts_tools/blob/master/README.md)
# XTS认证子系统开发指南<a name="ZH-CN_TOPIC_0000001132537809"></a>
# XTS认证子系统<a name="ZH-CN_TOPIC_0000001132537809"></a>
- [简介](#section465982318513)
- [设备类型](#section125090457443)
......@@ -521,8 +521,9 @@ OpenHarmony支持如下几种设备类型:
测试套件执行 ActsDemoTest.bin 触发用例执行,基于串口打印日志进行分析。
## 相关仓<a name="section1371113476307"></a>
[XTS认证子系统](https://gitee.com/openharmony/docs/blob/master/zh-cn/readme/XTS%E8%AE%A4%E8%AF%81%E5%AD%90%E7%B3%BB%E7%BB%9F.md)
xts\_acts
**xts\_acts**
xts\_tools
[xts\_tools](https://gitee.com/openharmony/xts_tools/blob/master/README_zh.md)
......@@ -281,7 +281,7 @@ HWTEST_F(AbilityMgrTest2, testWantToUri, Function | MediumTest | Level0)
ElementName element = { nullptr };
SetElementDeviceID(&element, "0001000");
SetElementBundleName(&element, "com.huawei.testnative");
SetElementAbilityName(&element, "ServiceAbility");
SetElementAbilityName(&element, "SecondAbility");
if (element.abilityName !=nullptr) {
bool setResult = SetWantElement(&want, element);
if (setResult) {
......
......@@ -72,6 +72,5 @@ group("uikit_test") {
#"//test/xts/acts/graphic_lite/uidfx_posix:ActsUIDfxTest",
#"//test/xts/acts/graphic_lite/uifont_posix:ActsUIFontTest",
"//test/xts/acts/graphic_lite/version_posix:ActsGraphVersionTest",
"//test/xts/acts/graphic_lite/window_posix:ActsWindowTest",
]
}
......@@ -11,11 +11,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/lite/config/component/lite_component.gni")
import("//build/lite/config/subsystem/graphic/config.gni")
import("//build/lite/ndk/ndk.gni")
import("//test/xts/tools/lite/build/suite_lite.gni")
hcpptest_suite("ActsUiInterfaceTest") {
suite_name = "acts"
sources = [ "src/UiInterfaceTest.cpp" ]
if (enable_graphic_font) {
sources = [
"src/UiInterfaceTest.cpp",
"src/window_test.cpp",
]
} else {
sources = [ "src/UiInterfaceTest.cpp" ]
}
include_dirs = [
"//kernel/liteos_a/kernel/include/",
......
......@@ -775,36 +775,6 @@ HWTEST_F(UiInterfaceTest, SUB_GRAPHIC_INTERFACE_FIRST_5600, Function | MediumTes
EXPECT_EQ(0, 0);
}
/**
* @tc.number SUB_GRAPHIC_INTERFACE_FIRST_5800
* @tc.name test DestoryWindow api
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(UiInterfaceTest, SUB_GRAPHIC_INTERFACE_FIRST_5800, Function | MediumTest | Level0)
{
OHOS::GraphicStartUp::Init();
WindowConfig windowConfig = {};
Window* window = Window::CreateWindow(windowConfig);
Window::DestoryWindow(window);
EXPECT_EQ(0, 0);
}
/**
* @tc.number SUB_GRAPHIC_INTERFACE_FIRST_5900
* @tc.name test BindRootView api
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(UiInterfaceTest, SUB_GRAPHIC_INTERFACE_FIRST_5900, Function | MediumTest | Level0)
{
WindowConfig windowConfig = {};
Window* window = Window::CreateWindow(windowConfig);
RootView* rootView = RootView::GetInstance();
if (window!=nullptr) {
window->BindRootView(rootView);
}
EXPECT_EQ(0, 0);
}
/**
* @tc.number SUB_GRAPHIC_INTERFACE_FIRST_6000
* @tc.name test GetCount api
......@@ -1099,4 +1069,4 @@ HWTEST_F(UiInterfaceTest, SUB_GRAPHIC_INTERFACE_FIRST_7600, Function | MediumTes
delete(operator new(10));
EXPECT_EQ(0, 0);
}
} // namespace OHOS
\ No newline at end of file
} // namespace OHOS
......@@ -27,16 +27,6 @@ public:
static void TearDownTestCase(void) {}
};
/**
* @tc.number SUB_GRAPHIC_WINDOW_CREATEWINDOW_0100
* @tc.name test window create-window api
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(WindowTest, Graphic_Window_Test_CreateWindow_0100, Function | MediumTest | Level0)
{
EXPECT_EQ(0, 0);
}
/**
* @tc.number SUB_GRAPHIC_WINDOW_DESTORYWINDOW_0200
* @tc.name test window destory-window api
......@@ -142,4 +132,34 @@ HWTEST_F(WindowTest, Graphic_Window_Test_BindRootView_0700, Function | MediumTes
testObj->UnbindRootView();
}
}
} // namespace OHOS
\ No newline at end of file
/**
* @tc.number SUB_GRAPHIC_INTERFACE_FIRST_5800
* @tc.name test DestoryWindow api
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(WindowTest, SUB_GRAPHIC_INTERFACE_FIRST_5800, Function | MediumTest | Level0)
{
OHOS::GraphicStartUp::Init();
WindowConfig windowConfig = {};
Window* window = Window::CreateWindow(windowConfig);
Window::DestoryWindow(window);
EXPECT_EQ(0, 0);
}
/**
* @tc.number SUB_GRAPHIC_INTERFACE_FIRST_5900
* @tc.name test BindRootView api
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(WindowTest, SUB_GRAPHIC_INTERFACE_FIRST_5900, Function | MediumTest | Level0)
{
WindowConfig windowConfig = {};
Window* window = Window::CreateWindow(windowConfig);
RootView* rootView = RootView::GetInstance();
if (window!=nullptr) {
window->BindRootView(rootView);
}
EXPECT_EQ(0, 0);
}
} // namespace OHOS
# 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("ActsWindowTest") {
suite_name = "acts"
sources = [ "src/window_test.cpp" ]
include_dirs = [
"//kernel/liteos_a/kernel/include/",
"//kernel/liteos_a/kernel/common",
"//third_party/bounds_checking_function/include",
"//third_party/cJSON",
"//third_party/libpng",
"//third_party/libjpeg",
"//utils/native/lite/include",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast",
]
ldflags = [ "-Wl,-Map=toggleButtonTest.map" ]
deps = [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/communication/ipc_lite:liteipc_adapter",
"//foundation/distributedschedule/samgr_lite/communication/broadcast",
"//foundation/distributedschedule/samgr_lite/samgr:samgr",
"//foundation/distributedschedule/samgr_lite/samgr_client:client",
"//foundation/graphic/surface:lite_surface",
"//foundation/graphic/ui:lite_ui",
"//foundation/graphic/utils:lite_graphic_hals",
"//foundation/graphic/wms:lite_wms",
"//third_party/bounds_checking_function:libsec_shared",
]
cflags = [ "-fno-rtti" ]
}
{
"description": "Config for uikit uibutton test cases",
"environment": [
{
"type": "device",
"label": "ipcamera"
}
],
"kits": [
{
"type": "MountKit",
"server": "NfsServer",
"mount": [
{
"source": "testcases/graphic",
"target": "/test_root/graphic"
}
]
}
],
"driver": {
"type": "CppTestLite",
"execute": "/test_root/graphic/ActsWindowTest.bin"
}
}
\ No newline at end of file
......@@ -1456,7 +1456,7 @@ HWTEST_F(IpcSignalTest, testSigsetFill, Function | MediumTest | Level2)
/**
* @tc.number SUB_KERNEL_IPC_SIG_SETOP_0600
* @tc.name test sig set operator APIs: sigdelset
* @tc.name test sigdelset operator APIs: sigdelset
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(IpcSignalTest, testSigsetDelete0600, Function | MediumTest | Level2)
......@@ -1776,4 +1776,4 @@ HWTEST_F(IpcSignalTest, testPsignalError2, Function | MediumTest | Level3)
} else { // parent
WaitProcExitedOK(pid);
}
}
\ No newline at end of file
}
......@@ -92,7 +92,7 @@ HWTEST_F(ActsUtilConvertApiTest, testTolower0300, Function | MediumTest | Level1
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_TOLOWER_0310
* @tc.name abnormal test:test _tolower api with multiple characters
* @tc.name test _tolower api abnormal scenario with two uppercase characters
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testTolower0310, Function | MediumTest | Level1)
......@@ -108,7 +108,7 @@ HWTEST_F(ActsUtilConvertApiTest, testTolower0310, Function | MediumTest | Level1
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_TOLOWER_0320
* @tc.name abnormal test:test _tolower api with multiple characters
* @tc.name test _tolower api abnormal scenario with multiple digital characters
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testTolower0320, Function | MediumTest | Level1)
......@@ -124,7 +124,7 @@ HWTEST_F(ActsUtilConvertApiTest, testTolower0320, Function | MediumTest | Level1
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_TOLOWER_0330
* @tc.name abnormal test:test _tolower api with special characters"@"
* @tc.name test _tolower api abnormal scenario with special symbols characters
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testTolower0330, Function | MediumTest | Level1)
......@@ -171,7 +171,7 @@ HWTEST_F(ActsUtilConvertApiTest, testToupper0500, Function | MediumTest | Level1
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_TOUPPER_0510
* @tc.name test _toupper api with special characters"@"
* @tc.name test _toupper api abnormal scenario with special symbols characters
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testToupper0510, Function | MediumTest | Level1)
......@@ -187,7 +187,7 @@ HWTEST_F(ActsUtilConvertApiTest, testToupper0510, Function | MediumTest | Level1
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_TOUPPER_0520
* @tc.name test _toupper api with special characters
* @tc.name test _toupper api with ASCII
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testToupper0520, Function | MediumTest | Level1)
......@@ -203,7 +203,7 @@ HWTEST_F(ActsUtilConvertApiTest, testToupper0520, Function | MediumTest | Level1
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_TOUPPER_0530
* @tc.name test _toupper api with special characters
* @tc.name test _toupper api abnormal scenario with multiple lowercase characters
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testToupper0530, Function | MediumTest | Level1)
......@@ -219,7 +219,7 @@ HWTEST_F(ActsUtilConvertApiTest, testToupper0530, Function | MediumTest | Level1
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_TOUPPER_0540
* @tc.name test _toupper api with special characters
* @tc.name test _toupper api abnormal scenario with multiple lowercase characters combination
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testToupper0540, Function | MediumTest | Level1)
......@@ -265,7 +265,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtof0700, Function | MediumTest | Level1) {
/**
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOF_0800
* @tc.name test atof api with digit
* @tc.name test atof api with digit2
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtof0800, Function | MediumTest | Level1) {
......@@ -280,7 +280,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtof0800, Function | MediumTest | Level1) {
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOF_0810
* @tc.name test atof api with digit
* @tc.name test atof api with digit1
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtof0810, Function | MediumTest | Level1)
......@@ -296,7 +296,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtof0810, Function | MediumTest | Level1)
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOF_0820
* @tc.name test atof api with digit
* @tc.name test atof api with digit3
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtof0820, Function | MediumTest | Level1)
......@@ -312,7 +312,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtof0820, Function | MediumTest | Level1)
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOF_0830
* @tc.name test atof api with digit
* @tc.name test atof api with digit4
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtof0830, Function | MediumTest | Level1)
......@@ -328,7 +328,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtof0830, Function | MediumTest | Level1)
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOF_0840
* @tc.name test atof api with digit
* @tc.name test atof api with digit5
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtof0840, Function | MediumTest | Level1)
......@@ -344,7 +344,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtof0840, Function | MediumTest | Level1)
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOF_0850
* @tc.name test atof api with digit
* @tc.name test atof api with digit6
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtof0850, Function | MediumTest | Level1)
......@@ -360,7 +360,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtof0850, Function | MediumTest | Level1)
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOF_0860
* @tc.name test atof api with digit
* @tc.name test atof api with digit7
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtof0860, Function | MediumTest | Level1)
......@@ -406,7 +406,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtol1000, Function | MediumTest | Level1) {
/**
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOL_1100
* @tc.name test atol api with digit
* @tc.name test atol api with digit9
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtol1100, Function | MediumTest | Level1) {
......@@ -421,7 +421,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtol1100, Function | MediumTest | Level1) {
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOL_0100
* @tc.name test atol api with digit
* @tc.name test atol api with digit8
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtol0100, Function | MediumTest | Level1)
......@@ -437,7 +437,7 @@ HWTEST_F(ActsUtilConvertApiTest, testAtol0100, Function | MediumTest | Level1)
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ATOL_0200
* @tc.name test atol api with digit
* @tc.name test atol api with digit10
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testAtol0200, Function | MediumTest | Level1)
......@@ -519,7 +519,7 @@ HWTEST_F(ActsUtilConvertApiTest, testEcvt1500, Function | MediumTest | Level1) {
/**
* @tc.number SUB_KERNEL_UTIL_CONVERT_ECVT_1600
* @tc.name test ecvt api with exponent double
* @tc.name test ecvt api with exponent double2
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testEcvt1600, Function | MediumTest | Level1) {
......@@ -540,7 +540,7 @@ HWTEST_F(ActsUtilConvertApiTest, testEcvt1600, Function | MediumTest | Level1) {
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ECVT_1610
* @tc.name test ecvt api with exponent double
* @tc.name test ecvt api with exponent double1
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testEcvt1610, Function | MediumTest | Level1)
......@@ -560,7 +560,7 @@ HWTEST_F(ActsUtilConvertApiTest, testEcvt1610, Function | MediumTest | Level1)
/* *
* @tc.number SUB_KERNEL_UTIL_CONVERT_ECVT_1630
* @tc.name test ecvt api with exponent double
* @tc.name test ecvt api with exponent double3
* @tc.desc [C- SOFTWARE -0200]
*/
HWTEST_F(ActsUtilConvertApiTest, testEcvt1630, Function | MediumTest | Level1)
......@@ -1064,4 +1064,4 @@ HWTEST_F(ActsUtilConvertApiTest, testWcrtomb4700, Function | MediumTest | Level1
returnVal = wcrtomb(paraStr, wideChar, &paraPs);
LOGD(" wcrtomb returnVal:='%d'\n", returnVal);
ASSERT_TRUE(1 == returnVal && 'a' == paraStr[0]) << "ErrInfo: wcrtomb returnVal:='" << returnVal << "'";
}
\ No newline at end of file
}
......@@ -1526,9 +1526,6 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2200, Security | MediumTest | Level1
// Step 9: Check the capability of process 'wms_server' or 'ai_server', pid = 9
ret = CapgetWithCaps(WMS_SERVER_OR_AI_SERVER_PID, WMS_SERVER_OR_AI_SERVER_CAP);
EXPECT_EQ(ret, 0) << "ErrInfo: Pid = 9, process wms_server or ai_server has wrong capability";
// Step 10: Check the capability of process 'hiview', pid = 10
ret = CapgetWithCaps(HIVIEW_PID, HIVIEW_CAP);
EXPECT_EQ(ret, 0) << "ErrInfo: Pid = 10, process hiview has wrong capability";
}
#endif
......@@ -1705,15 +1702,15 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2600, Performance | MediumTest | Lev
// Preset action: Obtains the system time -> starttime
clock_gettime(CLOCK_REALTIME, &starttime);
// Step 1: Chown for 10000 times
for (int number = 0; number < NUM10000; number++) {
for (int number = 0; number < NUM1000; number++) {
chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, number, number);
}
// Step 2: Obtains the system time again -> endtime
clock_gettime(CLOCK_REALTIME, &endtime);
// Step 3: Compare the starttime and the endtime -> tp
tp = CompareTime(starttime, endtime);
EXPECT_LE(tp.tv_sec, NUM80) << "ErrInfo: Chown for 10000 times used " << tp.tv_sec << "." << tp.tv_nsec << "s";
EXPECT_LE(tp.tv_sec, NUM80) << "ErrInfo: Chown for 1000 times used " << tp.tv_sec << "." << tp.tv_nsec << "s";
// Cleanup action: Restore the initial status of the file
chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, UID0, GID0);
}
#endif
\ No newline at end of file
#endif
......@@ -41,7 +41,7 @@ hcpptest_suite("ActsVFATCapabilityTest") {
defines = [
"LITE_FS_VFAT",
"TOP_DIR=\"/userdata\"",
"TOP_DIR_MOUNT_INFO=\"/userdata vfat\"",
"TOP_DIR=\"/sdcard\"",
"TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"",
]
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册