From 9f96e43510e7f9df4687d8e52ed3deb03566c222 Mon Sep 17 00:00:00 2001
From: zhangshuqi <zhangshuqi7@huawei.com>
Date: Tue, 15 Aug 2023 11:32:07 +0800
Subject: [PATCH] =?UTF-8?q?layout=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangshuqi <zhangshuqi7@huawei.com>
---
 arkui/ace_ets_layout_test/.idea/.gitignore    |  3 ---
 .../.idea/ace_ets_layout_test.iml             |  9 --------
 arkui/ace_ets_layout_test/.idea/misc.xml      |  6 -----
 arkui/ace_ets_layout_test/.idea/modules.xml   |  8 -------
 arkui/ace_ets_layout_test/.idea/vcs.xml       |  6 -----
 arkui/ace_ets_layout_test/BUILD.gn            | 23 ++++++++-----------
 6 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 arkui/ace_ets_layout_test/.idea/.gitignore
 delete mode 100644 arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml
 delete mode 100644 arkui/ace_ets_layout_test/.idea/misc.xml
 delete mode 100644 arkui/ace_ets_layout_test/.idea/modules.xml
 delete mode 100644 arkui/ace_ets_layout_test/.idea/vcs.xml

diff --git a/arkui/ace_ets_layout_test/.idea/.gitignore b/arkui/ace_ets_layout_test/.idea/.gitignore
deleted file mode 100644
index eaf91e2ac..000000000
--- a/arkui/ace_ets_layout_test/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml b/arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml
deleted file mode 100644
index 18ec59dd7..000000000
--- a/arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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
diff --git a/arkui/ace_ets_layout_test/.idea/misc.xml b/arkui/ace_ets_layout_test/.idea/misc.xml
deleted file mode 100644
index 9715c221c..000000000
--- a/arkui/ace_ets_layout_test/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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
diff --git a/arkui/ace_ets_layout_test/.idea/modules.xml b/arkui/ace_ets_layout_test/.idea/modules.xml
deleted file mode 100644
index 5b7ff1ed8..000000000
--- a/arkui/ace_ets_layout_test/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
diff --git a/arkui/ace_ets_layout_test/.idea/vcs.xml b/arkui/ace_ets_layout_test/.idea/vcs.xml
deleted file mode 100644
index c8ade07fc..000000000
--- a/arkui/ace_ets_layout_test/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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
diff --git a/arkui/ace_ets_layout_test/BUILD.gn b/arkui/ace_ets_layout_test/BUILD.gn
index aae576786..e10d086c9 100644
--- a/arkui/ace_ets_layout_test/BUILD.gn
+++ b/arkui/ace_ets_layout_test/BUILD.gn
@@ -16,21 +16,18 @@ group("ActsAceEtsLayoutTest") {
   if (is_standard_system) {
     deps = [
       "ace_ets_layout_column_test:ActsAceEtsLayoutColumnTest",
-
-      #"ace_ets_layout_flex_test:ActsAceEtsLayoutFlexTest",
-      #"ace_ets_layout_grid_test:ActsAceEtsLayoutGridTest",
-      #"ace_ets_layout_gridCol_test:ActsAceEtsLayoutGridColTest",
+      "ace_ets_layout_flex_test:ActsAceEtsLayoutFlexTest",
+      "ace_ets_layout_gridCol_test:ActsAceEtsLayoutGridColTest",
       "ace_ets_layout_gridRow_test:ActsAceEtsLayoutGridRowTest",
-
-      #"ace_ets_layout_list_test:ActsAceEtsLayoutListTest",
-      #"ace_ets_layout_relativeContainer_test:ActsAceEtsLayoutRelativeContainerTest",
+      "ace_ets_layout_grid_test:ActsAceEtsLayoutGridTest",
+      "ace_ets_layout_list_test:ActsAceEtsLayoutListTest",
+      "ace_ets_layout_relativeContainer_test:ActsAceEtsLayoutRelativeContainerTest",
       "ace_ets_layout_row_test:ActsAceEtsLayoutRowTest",
-
-      #"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",
+      "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",
     ]
   }
 }
-- 
GitLab