diff --git a/services/include/qos_interface.h b/services/include/qos_interface.h index 70daa1fefec857566653a7c2e4d0a326103caa0d..37528b298bf96bed39fa7c18e677a85ed099a538 100644 --- a/services/include/qos_interface.h +++ b/services/include/qos_interface.h @@ -54,14 +54,14 @@ enum class AuthStatus { }; enum class QosClassLevel { - qos_unspecified = 0, - qos_background = 1, - qos_utility = 2, - qos_default = 3, - qos_user_initiated = 4, - qos_deadline_request = 5, - qos_user_interactive = 6, - qos_max, + QOS_UNSPECIFIED = 0, + QOS_BACKGROUND = 1, + QOS_UTILITY = 2, + QOS_DEFAULT = 3, + QOS_USER_INITIATED = 4, + QOS_DEADLINE_REQUEST = 5, + QOS_USER_INTERACTIVE = 6, + QOS_MAX, }; #define BASIC_AUTH_CTRL_OPERATION \ @@ -111,7 +111,7 @@ enum class QosPolicyType { struct QosPolicyDatas { int policyType; unsigned int policyFlag; - struct QosPolicyData policys[static_cast(QosClassLevel::qos_max)]; + struct QosPolicyData policys[static_cast(QosClassLevel::QOS_MAX)]; }; #define QOS_CTRL_BASIC_OPERATION \ diff --git a/test/unittest/phone/qos_interface_test.cpp b/test/unittest/phone/qos_interface_test.cpp index e49b2006883348df0dcb6df52a06d27c27943959..1a43acf534800b00586c293f14e18231993b7a58 100644 --- a/test/unittest/phone/qos_interface_test.cpp +++ b/test/unittest/phone/qos_interface_test.cpp @@ -126,7 +126,7 @@ HWTEST_F(QosInterfaceTest, QosApplyTest, TestSize.Level1) unsigned int level = 1; int ret = -1; ret = QosApply(level); -#if ARM64_TEST +#if defined(ARM64_TEST) && ARM64_TEST EXPECT_EQ(ret, 0); #else (void)ret; @@ -163,7 +163,7 @@ HWTEST_F(QosInterfaceTest, QosApplyForOtherTest, TestSize.Level1) int tid = gettid(); int ret = -1; ret = QosApplyForOther(level, tid); -#if ARM64_TEST +#if defined(ARM64_TEST) && ARM64_TEST EXPECT_EQ(ret, 0); #else (void)ret; @@ -179,7 +179,7 @@ HWTEST_F(QosInterfaceTest, QosLeaveTest, TestSize.Level1) { int ret = -1; ret = QosLeave(); -#if ARM64_TEST +#if defined(ARM64_TEST) && ARM64_TEST EXPECT_EQ(ret, 0); #else (void)ret; @@ -198,7 +198,7 @@ HWTEST_F(QosInterfaceTest, QosLeaveForOtherTest, TestSize.Level1) int level = 1; ret = QosApplyForOther(level, tid); ret = QosLeaveForOther(tid); -#if ARM64_TEST +#if defined(ARM64_TEST) && ARM64_TEST EXPECT_EQ(ret, 0); #else (void)ret; @@ -231,7 +231,7 @@ HWTEST_F(QosInterfaceTest, QosPolicyTest, TestSize.Level1) struct QosPolicyDatas *policyDatas = nullptr; ret = QosPolicy(policyDatas); EXPECT_EQ(ret, -1); -#if ARM64_TEST +#if defined(ARM64_TEST) && ARM64_TEST ret = QosPolicy(&g_defaultQosPolicy); EXPECT_EQ(ret, 0); #endif