!9745 layout xts 拆分

Merge pull request !9745 from zhangshuqi/master

arkui/ace_ets_layout_test/.idea/.gitignore

+# Default ignored files
+/shelf/
+/workspace.xml

arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

arkui/ace_ets_layout_test/.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file

arkui/ace_ets_layout_test/.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ace_ets_layout_test.iml" filepath="$PROJECT_DIR$/.idea/ace_ets_layout_test.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

arkui/ace_ets_layout_test/.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

arkui/ace_ets_layout_test/BUILD.gn

-# Copyright (c) 2023 iSoftStone Information Technology (Group) Co.,Ltd.
+# Copyright (c) 2023 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
@@ -11,31 +11,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("ActsAceEtsLayoutTest") {
-  hap_profile = "entry/src/main/module.json"
-  js_build_mode = "debug"
+group("ActsAceEtsLayoutTest") {
+  testonly = true
+  if (is_standard_system) {
     deps = [
-    ":ace_ets_component_flex_js_assets",
-    ":ace_ets_component_flex_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "signature/openharmony_sx.p7b"
-  hap_name = "ActsAceEtsLayoutTest"
-}
+      "ace_ets_layout_column_test:ActsAceEtsLayoutColumnTest",
 
-ohos_app_scope("ace_ets_component_flex_app_profile") {
-  app_profile = "AppScope/app.json"
-  sources = [ "AppScope/resources" ]
-}
+      #"ace_ets_layout_flex_test:ActsAceEtsLayoutFlexTest",
+      #"ace_ets_layout_grid_test:ActsAceEtsLayoutGridTest",
+      #"ace_ets_layout_gridCol_test:ActsAceEtsLayoutGridColTest",
+      "ace_ets_layout_gridRow_test:ActsAceEtsLayoutGridRowTest",
 
-ohos_js_assets("ace_ets_component_flex_js_assets") {
-  source_dir = "entry/src/main/ets"
-}
+      #"ace_ets_layout_list_test:ActsAceEtsLayoutListTest",
+      #"ace_ets_layout_relativeContainer_test:ActsAceEtsLayoutRelativeContainerTest",
+      "ace_ets_layout_row_test:ActsAceEtsLayoutRowTest",
 
-ohos_resources("ace_ets_component_flex_resources") {
-  sources = [ "entry/src/main/resources" ]
-  deps = [ ":ace_ets_component_flex_app_profile" ]
-  hap_profile = "entry/src/main/module.json"
+      #"ace_ets_layout_scroll_test:ActsAceEtsLayoutScrollTest",
+      #"ace_ets_layout_stack_test:ActsAceEtsLayoutStackTest",
+      #"ace_ets_layout_swiper_test:ActsAceEtsLayoutSwiperTest",
+      #"ace_ets_layout_tabs_test:ActsAceEtsLayoutTabsTest",
+      # "ace_ets_layout_waterflow_test:ActsAceEtsLayoutWaterflowTest",
+    ]
+  }
 }

arkui/ace_ets_layout_test/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "180000",
-        "bundle-name": "com.acts.arkui.layout.test",
-        "module-name": "phone",
-        "shell-timeout": "600000",
-        "testcase-timeout": 60000
-    },
-    "kits": [{
-        "test-file-name": [
-            "ActsAceEtsLayoutTest.hap"
-        ],
-        "type": "AppInstallKit",
-        "cleanup-apps": true
-    }, {
-        "type": "ShellKit",
-        "run-command": [
-            "power-shell wakeup",
-            "power-shell setmode 602"
-        ]
-        
-    }]
-}
\ No newline at end of file

arkui/ace_ets_layout_test/ace_ets_layout_column_test/BUILD.gn

+# Copyright (c) 2023 iSoftStone Information Technology (Group) 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/build/suite.gni")
+
+ohos_js_hap_suite("ActsAceEtsLayoutColumnTest") {
+  hap_profile = "entry/src/main/module.json"
+  js_build_mode = "debug"
+  deps = [
+    ":ace_ets_layout_column_test_js_assets",
+    ":ace_ets_layout_column_test_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsAceEtsLayoutColumnTest"
+}
+
+ohos_app_scope("ace_ets_layout_column_test_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("ace_ets_layout_column_test_js_assets") {
+  source_dir = "entry/src/main/ets"
+}
+
+ohos_resources("ace_ets_layout_column_test_resources") {
+  sources = [ "entry/src/main/resources" ]
+  deps = [ ":ace_ets_layout_column_test_app_profile" ]
+  hap_profile = "entry/src/main/module.json"
+}

arkui/ace_ets_layout_test/ace_ets_layout_column_test/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "180000",
+        "bundle-name": "com.acts.arkui.layout.test",
+        "module-name": "phone",
+        "shell-timeout": "600000",
+        "testcase-timeout": 60000
+    },
+    "kits": [{
+        "test-file-name": [
+            "ActsAceEtsLayoutColumnTest.hap"
+        ],
+        "type": "AppInstallKit",
+        "cleanup-apps": true
+    }, {
+        "type": "ShellKit",
+        "run-command": [
+            "power-shell wakeup",
+            "power-shell setmode 602"
+        ]
+        
+    }]
+}
\ No newline at end of file