From 733d5ad6d2cdb6bcc6ee4d5112524c2b243b8025 Mon Sep 17 00:00:00 2001
From: likun104 <likun104@h-partners.com>
Date: Wed, 4 Sep 2024 09:54:50 +0800
Subject: [PATCH] fix ut/st testcases

---
 .../testcase/om_partition_subgraphs_pass_test.cc          | 5 +----
 tf_adapter/tests/st/util/testcase/ge_plugin_test.cc       | 5 +++++
 tf_adapter/tests/st/util/testcase/host_queue_test.cc      | 8 +++++---
 tf_adapter/tests/st/util/testcase/npu_attrs_test.cc       | 4 ++--
 .../testcase/om_partition_subgraphs_pass_test.cc          | 5 +----
 tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc       | 5 +++++
 tf_adapter/tests/ut/util/testcase/host_queue_test.cc      | 8 +++++---
 tf_adapter/tests/ut/util/testcase/npu_attrs_test.cc       | 4 ++--
 8 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/tf_adapter/tests/st/optimizers/testcase/om_partition_subgraphs_pass_test.cc b/tf_adapter/tests/st/optimizers/testcase/om_partition_subgraphs_pass_test.cc
index ab572caf5..d28de624c 100644
--- a/tf_adapter/tests/st/optimizers/testcase/om_partition_subgraphs_pass_test.cc
+++ b/tf_adapter/tests/st/optimizers/testcase/om_partition_subgraphs_pass_test.cc
@@ -164,10 +164,7 @@ TEST_F(OmOptimizationPassTest, UnaryOpsTest) {
   string org_graph_def_path = "tf_adapter/tests/ut/optimizers/pbtxt/om_test_unaryops.pbtxt";
   InitGraph(org_graph_def_path);
   std::string target_graph = DoRunOmOptimizationPassTest(true);
-  bool ret = false;
-  if (target_graph.find("_Floor") != target_graph.npos && target_graph.find("_Abs") != target_graph.npos) {
-    ret = true;
-  }
+  bool ret = target_graph.find("_Floor") != target_graph.npos && target_graph.find("_Abs") != target_graph.npos;
   EXPECT_EQ(ret, true);
 }
 TEST_F(OmOptimizationPassTest, InOutPairFlagFalseTest) {
diff --git a/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc b/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc
index dfcbf6d4c..e2117f259 100644
--- a/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc
+++ b/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc
@@ -29,6 +29,7 @@ TEST_F(GePluginTest, PluginInitTest) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginInitTest_Success) {
@@ -49,6 +50,7 @@ TEST_F(GePluginTest, PluginInitTest_Success) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginInitTest_fail) {
@@ -71,6 +73,7 @@ TEST_F(GePluginTest, PluginInitTest_fail) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginInitTest_hccl) {
@@ -96,6 +99,7 @@ TEST_F(GePluginTest, PluginInitTest_hccl) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginFinalizeTest) {
@@ -164,6 +168,7 @@ TEST_F(GePluginTest, NpuCloseTest) {
   init_options["ge.jobType"] = "1";
   init_options["ge.tuningPath"] = "./";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
   NpuClose();
 }
 TEST_F(GePluginTest, RdmaInitAndRegisterFail1Test) {
diff --git a/tf_adapter/tests/st/util/testcase/host_queue_test.cc b/tf_adapter/tests/st/util/testcase/host_queue_test.cc
index 71ae595cf..f3eb67b0c 100644
--- a/tf_adapter/tests/st/util/testcase/host_queue_test.cc
+++ b/tf_adapter/tests/st/util/testcase/host_queue_test.cc
@@ -27,7 +27,8 @@ TEST_F(HostQueueTest, HostQueueSendData) {
   void *buff = nullptr;
   TF_CHECK_OK(MappingTensor2Buff(ACL_TENSOR_DATA_TENSOR, tensors, buff));
   bool need_resend = false;
-  TF_CHECK_OK(HostQueueSendData(queue_id, buff, need_resend));
+  Status s = HostQueueSendData(queue_id, buff, need_resend);
+  ASSERT_TRUE(s.ok());
   HostQueueDestroy(queue_id);
 }
 
@@ -39,8 +40,9 @@ TEST_F(HostQueueTest, HostQueueEndOfSequence) {
   void *buff = nullptr;
   TF_CHECK_OK(MappingTensor2Buff(ACL_TENSOR_DATA_TENSOR, {}, buff));
   bool need_resend = false;
-  TF_CHECK_OK(HostQueueSendData(queue_id, buff, need_resend));
+  Status s = HostQueueSendData(queue_id, buff, need_resend);
+  ASSERT_TRUE(s.ok());
   HostQueueDestroy(queue_id);
 }
 }
-} // end tensorflow
\ No newline at end of file
+} // end tensorflow
diff --git a/tf_adapter/tests/st/util/testcase/npu_attrs_test.cc b/tf_adapter/tests/st/util/testcase/npu_attrs_test.cc
index 680f3bf32..4a2d97a13 100644
--- a/tf_adapter/tests/st/util/testcase/npu_attrs_test.cc
+++ b/tf_adapter/tests/st/util/testcase/npu_attrs_test.cc
@@ -20,8 +20,8 @@ class NpuAttrTest : public testing::Test {
 };
 TEST_F(NpuAttrTest, GetEnvDeviceIdDefaultTest) {
   uint32_t device_id = 0;
-  (void)GetEnvDeviceID(device_id);
-  EXPECT_EQ(device_id, 0);
+  Status s = GetEnvDeviceID(device_id);
+  EXPECT_EQ(s.ok(), true);
 }
 TEST_F(NpuAttrTest, GetEnvAscendDeviceIdEmptyTest) {
   uint32_t device_id = 0;
diff --git a/tf_adapter/tests/ut/optimizers/testcase/om_partition_subgraphs_pass_test.cc b/tf_adapter/tests/ut/optimizers/testcase/om_partition_subgraphs_pass_test.cc
index a1abc75bc..9bba2fdee 100644
--- a/tf_adapter/tests/ut/optimizers/testcase/om_partition_subgraphs_pass_test.cc
+++ b/tf_adapter/tests/ut/optimizers/testcase/om_partition_subgraphs_pass_test.cc
@@ -164,10 +164,7 @@ TEST_F(OmOptimizationPassTest, UnaryOpsTest) {
   string org_graph_def_path = "tf_adapter/tests/ut/optimizers/pbtxt/om_test_unaryops.pbtxt";
   InitGraph(org_graph_def_path);
   std::string target_graph = DoRunOmOptimizationPassTest(true);
-  bool ret = false;
-  if (target_graph.find("_Floor") != target_graph.npos && target_graph.find("_Abs") != target_graph.npos) {
-    ret = true;
-  }
+  bool ret = target_graph.find("_Floor") != target_graph.npos && target_graph.find("_Abs") != target_graph.npos;
   EXPECT_EQ(ret, true);
 }
 TEST_F(OmOptimizationPassTest, InOutPairFlagFalseTest) {
diff --git a/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc b/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc
index 1b6dab881..80561d575 100644
--- a/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc
+++ b/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc
@@ -27,6 +27,7 @@ TEST_F(GePluginTest, PluginInitTest_1) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginInitTest_Success) {
@@ -45,6 +46,7 @@ TEST_F(GePluginTest, PluginInitTest_Success) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginInitTest) {
@@ -65,6 +67,7 @@ TEST_F(GePluginTest, PluginInitTest) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginInitTest_hccl) {
@@ -89,6 +92,7 @@ TEST_F(GePluginTest, PluginInitTest_hccl) {
   init_options["ge.opDebugLevel"] = "1";
   init_options["ge.jobType"] = "2";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
 }
 
 TEST_F(GePluginTest, PluginFinalizeTest) {
@@ -157,6 +161,7 @@ TEST_F(GePluginTest, NpuCloseTest) {
   init_options["ge.jobType"] = "1";
   init_options["ge.tuningPath"] = "./";
   PluginInit(init_options);
+  ASSERT_FALSE(GePlugin::GetInstance()->GetInitOptions().empty());
   NpuClose();
 }
 TEST_F(GePluginTest, RdmaInitAndRegisterFail1Test) {
diff --git a/tf_adapter/tests/ut/util/testcase/host_queue_test.cc b/tf_adapter/tests/ut/util/testcase/host_queue_test.cc
index 71ae595cf..f3eb67b0c 100644
--- a/tf_adapter/tests/ut/util/testcase/host_queue_test.cc
+++ b/tf_adapter/tests/ut/util/testcase/host_queue_test.cc
@@ -27,7 +27,8 @@ TEST_F(HostQueueTest, HostQueueSendData) {
   void *buff = nullptr;
   TF_CHECK_OK(MappingTensor2Buff(ACL_TENSOR_DATA_TENSOR, tensors, buff));
   bool need_resend = false;
-  TF_CHECK_OK(HostQueueSendData(queue_id, buff, need_resend));
+  Status s = HostQueueSendData(queue_id, buff, need_resend);
+  ASSERT_TRUE(s.ok());
   HostQueueDestroy(queue_id);
 }
 
@@ -39,8 +40,9 @@ TEST_F(HostQueueTest, HostQueueEndOfSequence) {
   void *buff = nullptr;
   TF_CHECK_OK(MappingTensor2Buff(ACL_TENSOR_DATA_TENSOR, {}, buff));
   bool need_resend = false;
-  TF_CHECK_OK(HostQueueSendData(queue_id, buff, need_resend));
+  Status s = HostQueueSendData(queue_id, buff, need_resend);
+  ASSERT_TRUE(s.ok());
   HostQueueDestroy(queue_id);
 }
 }
-} // end tensorflow
\ No newline at end of file
+} // end tensorflow
diff --git a/tf_adapter/tests/ut/util/testcase/npu_attrs_test.cc b/tf_adapter/tests/ut/util/testcase/npu_attrs_test.cc
index 86f6f4ba3..d1f517604 100644
--- a/tf_adapter/tests/ut/util/testcase/npu_attrs_test.cc
+++ b/tf_adapter/tests/ut/util/testcase/npu_attrs_test.cc
@@ -28,8 +28,8 @@ TEST_F(NpuAttrTest, CheckIsNewDataTransfer) {
 
 TEST_F(NpuAttrTest, GetEnvDeviceIdDefaultTest) {
   uint32_t device_id = 0;
-  (void)GetEnvDeviceID(device_id);
-  EXPECT_EQ(device_id, 0);
+  Status s = GetEnvDeviceID(device_id);
+  EXPECT_EQ(s.ok(), true);
 }
 TEST_F(NpuAttrTest, GetEnvAscendDeviceIdEmptyTest) {
   uint32_t device_id = 0;
-- 
Gitee