<配置文件和相机接口调整>

Signed-off-by: bWX1145125 <bianjianliang1@huawei.com>

distributedhardware/distributedcameratest/BUILD.gn

@@ -19,7 +19,7 @@ config("dcamera_hdf_demo_config") {
   visibility = [ ":*" ]
 }
 
-ohos_moduletest_suite("DctsdisCameraTest") {
+ohos_moduletest_suite("SubDctsdisCameraTest") {
   module_out_path = module_output_path
   install_enable = true
   sources = [

distributedhardware/distributedcameratest/Test.json

@@ -1,7 +1,7 @@
 {
     "description": "Config for disCamera test cases",
     "driver": {
-        "module-name": "DctsdisCameraTest",
+        "module-name": "SubDctsdisCameraTest",
         "native-test-timeout": "120000",
         "native-test-device-path": "/data/local/tmp",
         "runtime-hint": "1s",
@@ -13,7 +13,7 @@
         "chmod -R 777 /data/local/tmp/*"
      ],
         "push": [
-          "DctsdisCameraTest->/data/local/tmp/DctsdisCameraTest"
+          "SubDctsdisCameraTest->/data/local/tmp/SubDctsdisCameraTest"
 	],
       "type": "PushKit"
        }

distributedhardware/distributedcameratest/dcamera_automat_test.cpp

@@ -74,74 +74,14 @@ HWTEST_F(DCameraAutomatTest, DCameraTest_0100, TestSize.Level1)
 }
 
 /**
- * @tc.number    : DCameraTest_0200
- * @tc.name      : SetAwbMode()
- * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
- * @tc.desc      : Set Awb Mode is 0, success is returned
- * @tc.type      : FUNC
- * @tc.size      : Medium test
- */
-HWTEST_F(DCameraAutomatTest, DCameraTest_0200, TestSize.Level1)
-{
-    int32_t ret = mainDemo->SetAwbMode(sleepOk);
-    EXPECT_EQ(cameraOk, ret) << "SetAwbMode incandescent fail";
-    sleep(sleepOk);
-}
-
-/**
- * @tc.number    : DCameraTest_0300
- * @tc.name      : SetAwbMode()
- * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
- * @tc.desc      : the Set Awb Mode is 2, success is returned
- * @tc.type      : FUNC
- * @tc.size      : Medium test
- */
-HWTEST_F(DCameraAutomatTest, DCameraTest_0300, TestSize.Level1)
-{
-    int32_t ret = mainDemo->SetAwbMode(cameraOk);
-    EXPECT_EQ(cameraOk, ret) << "SetAwbMode fail";
-    sleep(sleepOk);
-}
-
-/**
- * @tc.number    : DCameraTest_0400
- * @tc.name      ：mainDemo->SetAeExpo()
- * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
- * @tc.desc      : Set the exposure mode update parameters
- * @tc.type      : FUNC
- * @tc.size      : Medium test
- */
-HWTEST_F(DCameraAutomatTest, DCameraTest_0400, TestSize.Level1)
-{
-    int32_t ret = mainDemo->SetAeExpo();
-    EXPECT_EQ(cameraOk, ret) << "SetAeExpo fail";
-    sleep(sleepOk);
-}
-
-/**
- * @tc.number    : DCameraTest_0500
- * @tc.name      ：mainDemo->SetMetadata()
- * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
- * @tc.desc      : Set the parameters required for taking pictures and recording videos
- * @tc.type      : FUNC
- * @tc.size      : Medium test
- */
-HWTEST_F(DCameraAutomatTest, DCameraTest_0500, TestSize.Level1)
-{
-    int32_t ret = mainDemo->SetMetadata();
-    EXPECT_EQ(cameraOk, ret) << "SetMetadata fail";
-    sleep(sleepOk);
-}
-
-/**
- * @tc.number    : DCameraTest_0600
+ * @tc.number    : DCameraTest_0100
  * @tc.name      : CaptureTest()
  * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
  * @tc.desc      : Take pictures with a remote camera and save them locally
  * @tc.type      : FUNC
  * @tc.size      : Medium test
  */
-HWTEST_F(DCameraAutomatTest, DCameraTest_0600, TestSize.Level1)
+HWTEST_F(DCameraAutomatTest, DCameraTest_0200, TestSize.Level1)
 {
     int32_t ret = CaptureTest(mainDemo);
     EXPECT_EQ(cameraOk, ret) << "CaptureTest fail";
@@ -156,13 +96,73 @@ HWTEST_F(DCameraAutomatTest, DCameraTest_0600, TestSize.Level1)
  * @tc.type      : FUNC
  * @tc.size      : Medium test
  */
-HWTEST_F(DCameraAutomatTest, DCameraTest_0700, TestSize.Level1)
+HWTEST_F(DCameraAutomatTest, DCameraTest_0300, TestSize.Level1)
 {
     int32_t ret = VideoTest(mainDemo);
     EXPECT_EQ(cameraOk, ret) << "VideoTest fail";
     sleep(sleepOk);
 }
 
+/**
+ * @tc.number    : DCameraTest_0200
+ * @tc.name      : SetAwbMode()
+ * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
+ * @tc.desc      : Set Awb Mode is 0, success is returned
+ * @tc.type      : FUNC
+ * @tc.size      : Medium test
+ */
+HWTEST_F(DCameraAutomatTest, DCameraTest_0400, TestSize.Level1)
+{
+    int32_t ret = mainDemo->SetAwbMode(sleepOk);
+    EXPECT_EQ(cameraOk, ret) << "SetAwbMode incandescent fail";
+    sleep(sleepOk);
+}
+
+/**
+ * @tc.number    : DCameraTest_0300
+ * @tc.name      : SetAwbMode()
+ * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
+ * @tc.desc      : the Set Awb Mode is 2, success is returned
+ * @tc.type      : FUNC
+ * @tc.size      : Medium test
+ */
+HWTEST_F(DCameraAutomatTest, DCameraTest_0500, TestSize.Level1)
+{
+    int32_t ret = mainDemo->SetAwbMode(cameraOk);
+    EXPECT_EQ(cameraOk, ret) << "SetAwbMode fail";
+    sleep(sleepOk);
+}
+
+/**
+ * @tc.number    : DCameraTest_0400
+ * @tc.name      ：mainDemo->SetAeExpo()
+ * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
+ * @tc.desc      : Set the exposure mode update parameters
+ * @tc.type      : FUNC
+ * @tc.size      : Medium test
+ */
+HWTEST_F(DCameraAutomatTest, DCameraTest_0600, TestSize.Level1)
+{
+    int32_t ret = mainDemo->SetAeExpo();
+    EXPECT_EQ(cameraOk, ret) << "SetAeExpo fail";
+    sleep(sleepOk);
+}
+
+/**
+ * @tc.number    : DCameraTest_0500
+ * @tc.name      ：mainDemo->SetMetadata()
+ * @tc.desc      : [STD-DISTRIBUTED-0101]禁止修改分布式相机交互协议
+ * @tc.desc      : Set the parameters required for taking pictures and recording videos
+ * @tc.type      : FUNC
+ * @tc.size      : Medium test
+ */
+HWTEST_F(DCameraAutomatTest, DCameraTest_0700, TestSize.Level1)
+{
+    int32_t ret = mainDemo->SetMetadata();
+    EXPECT_EQ(cameraOk, ret) << "SetMetadata fail";
+    sleep(sleepOk);
+}
+
 /**
  * @tc.number    : DCameraTest_0800
  * @tc.name      ：FlashLightTest()

distributedhardware/distributedscreentest/BUILD.gn

@@ -16,7 +16,7 @@ import("//test/xts/tools/build/suite.gni")
 
 module_output_path = "dcts/distributedhardware"
 
-ohos_moduletest_suite("DctsdisSreenTest") {
+ohos_moduletest_suite("SubDctsdisScreenTest") {
   module_out_path = module_output_path
   include_dirs = [
     "$base_root/foundation/distributedhardware/distributed_screen/services/common/utils/include",
@@ -46,7 +46,7 @@ ohos_moduletest_suite("DctsdisSreenTest") {
 
   defines = [
     "HI_LOG_ENABLE",
-    "DH_LOG_TAG=\"DSreenClientTest\"",
+    "DH_LOG_TAG=\"DctsSdisScreenTest\"",
     "LOG_DOMAIN=0xD004100",
   ]
 

distributedhardware/distributedscreentest/Test.json

@@ -1,7 +1,7 @@
 {
     "description": "Config for disSreen test cases",
     "driver": {
-        "module-name": "DctsdisSreenTest",
+        "module-name": "SubDctsdisScreenTest",
         "native-test-timeout": "120000",
         "native-test-device-path": "/data/local/tmp",
         "runtime-hint": "1s",
@@ -13,7 +13,7 @@
         "chmod -R 777 /data/local/tmp/*"
      ],
         "push": [
-          "DctsdisSreenTest->/data/local/tmp/DctsdisSreenTest"
+          "SubDctsdisScreenTest->/data/local/tmp/SubDctsdisScreenTest"
 	],
       "type": "PushKit"
        }