From 3ec22ba5fcc74aef40c1a1852d6206551a16fce3 Mon Sep 17 00:00:00 2001
From: redking-zhong <zhongqihong2@huawei.com>
Date: Wed, 1 Nov 2023 16:02:55 +0800
Subject: [PATCH 1/2] add tdd

Signed-off-by: redking-zhong <zhongqihong2@huawei.com>
---
 .../test/unittest/screen_property_test.cpp    | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/window_scene/test/unittest/screen_property_test.cpp b/window_scene/test/unittest/screen_property_test.cpp
index 2bc19bfbbf..f3b18af4e3 100644
--- a/window_scene/test/unittest/screen_property_test.cpp
+++ b/window_scene/test/unittest/screen_property_test.cpp
@@ -113,6 +113,93 @@ HWTEST_F(ScreenPropertyTest, SetBounds, Function | SmallTest | Level2)
     ASSERT_EQ(ret, 0);
     GTEST_LOG_(INFO) << "ScreenPropertyTest: SetBounds end";
 }
+
+/**
+ * @tc.name: CalculateXYDpi
+ * @tc.desc: normal function
+ * @tc.type: FUNC
+ */
+HWTEST_F(ScreenPropertyTest, CalculateXYDpi, Function | SmallTest | Level2)
+{
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: CalculateXYDpi start";
+    ScreenProperty* property = new(std::nothrow) ScreenProperty();
+    uint32_t phyWidth = 0;
+    uint32_t phyHeight = 0;
+    int ret = 0;
+    property->CalculateXYDpi(phyWidth, phyHeight);
+    phyWidth = 1;
+    phyHeight = 1;
+    property->CalculateXYDpi(phyWidth, phyHeight);
+    ASSERT_EQ(ret, 0);
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: CalculateXYDpi end";
+}
+
+/**
+ * @tc.name: SetOffsetX
+ * @tc.desc: normal function
+ * @tc.type: FUNC
+ */
+HWTEST_F(ScreenPropertyTest, SetOffsetX, Function | SmallTest | Level2)
+{
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffsetX start";
+    ScreenProperty* property = new(std::nothrow) ScreenProperty();
+    int32_t offsetX = 0;
+    property->SetOffsetX(offsetX);
+    int32_t ret = property->GetOffsetX();
+    ASSERT_EQ(ret, offsetX);
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffsetX end";
+}
+
+/**
+ * @tc.name: SetOffsetY
+ * @tc.desc: normal function
+ * @tc.type: FUNC
+ */
+HWTEST_F(ScreenPropertyTest, SetOffsetY, Function | SmallTest | Level2)
+{
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffsetY start";
+    ScreenProperty* property = new(std::nothrow) ScreenProperty();
+    int32_t offsetY = 0;
+    property->SetOffsetY(offsetY);
+    int32_t ret = property->GetOffsetY();
+    ASSERT_EQ(ret, offsetY);
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffsetY end";
+}
+
+/**
+ * @tc.name: SetOffset
+ * @tc.desc: normal function
+ * @tc.type: FUNC
+ */
+HWTEST_F(ScreenPropertyTest, SetOffset, Function | SmallTest | Level2)
+{
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffset start";
+    ScreenProperty* property = new(std::nothrow) ScreenProperty();
+    int32_t offsetX = 0;
+    int32_t offsetY = 0;
+    property->SetOffset(offsetX, offsetY);
+    int32_t ret_x = property->GetOffsetX();
+    int32_t ret_y = property->GetOffsetY();
+    ASSERT_EQ(ret_x, offsetX);
+    ASSERT_EQ(ret_y, offsetY);
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffset end";
+}
+
+/**
+ * @tc.name: SetScreenRequestedOrientation
+ * @tc.desc: normal function
+ * @tc.type: FUNC
+ */
+HWTEST_F(ScreenPropertyTest, SetScreenRequestedOrientation, Function | SmallTest | Level2)
+{
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetScreenRequestedOrientation start";
+    ScreenProperty* property = new(std::nothrow) ScreenProperty();
+    Orientation orientation = Orientation::UNSPECIFIED;
+    property->SetScreenRequestedOrientation(orientation);
+    Orientation ret = property->GetScreenRequestedOrientation();
+    ASSERT_EQ(ret, orientation);
+    GTEST_LOG_(INFO) << "ScreenPropertyTest: SetScreenRequestedOrientation end";
+}
 } // namespace
 } // namespace Rosen
 } // namespace OHOS
-- 
Gitee


From d19c934b42b117f1895783f94963d3604b2b63e9 Mon Sep 17 00:00:00 2001
From: redking-zhong <zhongqihong2@huawei.com>
Date: Thu, 2 Nov 2023 10:23:51 +0800
Subject: [PATCH 2/2] updata

Signed-off-by: redking-zhong <zhongqihong2@huawei.com>
---
 window_scene/test/unittest/screen_property_test.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/window_scene/test/unittest/screen_property_test.cpp b/window_scene/test/unittest/screen_property_test.cpp
index f3b18af4e3..6ee22cc676 100644
--- a/window_scene/test/unittest/screen_property_test.cpp
+++ b/window_scene/test/unittest/screen_property_test.cpp
@@ -131,6 +131,7 @@ HWTEST_F(ScreenPropertyTest, CalculateXYDpi, Function | SmallTest | Level2)
     phyHeight = 1;
     property->CalculateXYDpi(phyWidth, phyHeight);
     ASSERT_EQ(ret, 0);
+    delete property;
     GTEST_LOG_(INFO) << "ScreenPropertyTest: CalculateXYDpi end";
 }
 
@@ -147,6 +148,7 @@ HWTEST_F(ScreenPropertyTest, SetOffsetX, Function | SmallTest | Level2)
     property->SetOffsetX(offsetX);
     int32_t ret = property->GetOffsetX();
     ASSERT_EQ(ret, offsetX);
+    delete property;
     GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffsetX end";
 }
 
@@ -163,6 +165,7 @@ HWTEST_F(ScreenPropertyTest, SetOffsetY, Function | SmallTest | Level2)
     property->SetOffsetY(offsetY);
     int32_t ret = property->GetOffsetY();
     ASSERT_EQ(ret, offsetY);
+    delete property;
     GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffsetY end";
 }
 
@@ -182,6 +185,7 @@ HWTEST_F(ScreenPropertyTest, SetOffset, Function | SmallTest | Level2)
     int32_t ret_y = property->GetOffsetY();
     ASSERT_EQ(ret_x, offsetX);
     ASSERT_EQ(ret_y, offsetY);
+    delete property;
     GTEST_LOG_(INFO) << "ScreenPropertyTest: SetOffset end";
 }
 
@@ -198,6 +202,7 @@ HWTEST_F(ScreenPropertyTest, SetScreenRequestedOrientation, Function | SmallTest
     property->SetScreenRequestedOrientation(orientation);
     Orientation ret = property->GetScreenRequestedOrientation();
     ASSERT_EQ(ret, orientation);
+    delete property;
     GTEST_LOG_(INFO) << "ScreenPropertyTest: SetScreenRequestedOrientation end";
 }
 } // namespace
-- 
Gitee