完成graphic子系统Display模块的跨平台测试套

Signed-off-by: Nhu0475 <huyanqiang5@huawei.com>

graphic/BUILD.gn

@@ -16,6 +16,7 @@ group("graphic") {
   testonly = true
   if (is_standard_system) {
     deps = [
+      "crossplatform:crossplatform",
       "effectKit:EffectKitTest",
       "graphicColorSpace:ActsColorSpaceManagerTest",
       "graphicnapidrawingtest:ActsGraphicNapiDrawingTest",
@@ -23,7 +24,6 @@ group("graphic") {
       "webGL:webGL_hap_test",
       "windowStage:ActsWindowStageTest",
       "windowstandard:window_hap_test",
-      "crossplatform:crossplatform",
     ]
     if (!(product_name == "ohcore")) {
       deps += [ "vkgl:cpvkgl" ]

graphic/crossplatform/.idea/.gitignore

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

graphic/crossplatform/.idea/crossplatform.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

graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml

-<component name="libraryTable">
-  <library name="arkui_android_adapter">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryListetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml

-<component name="libraryTable">
-  <library name="arkui_android_adapter1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryArrayListetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml

-<component name="libraryTable">
-  <library name="arkui_android_adapter2">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryDisplayetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml

-<component name="libraryTable">
-  <library name="arkui_android_adapter3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryLightWeightSetetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml

-<component name="libraryTable">
-  <library name="arkui_android_adapter4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryWebSocketetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml

-<component name="libraryTable">
-  <library name="arkui_android_adapter5">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryConnectionetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

graphic/crossplatform/.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

graphic/crossplatform/.idea/modules.xml

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

graphic/crossplatform/.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

graphic/crossplatform/BUILD.gn

@@ -15,8 +15,6 @@ import("//test/xts/tools/build/suite.gni")
 group("crossplatform") {
   testonly = true
   if (is_standard_system) {
-    deps = [
-      "graphicDisplayetstest:Display_ets_test",
-    ]
+    deps = [ "graphicDisplayetstest:ActsCrossPlatformDisplayTest" ]
   }
 }

graphic/crossplatform/graphicDisplayetstest/BUILD.gn

@@ -20,6 +20,7 @@ ohos_js_hap_suite("ActsCrossPlatformDisplayTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "ActsCrossPlatformDisplayTest"
   subsystem_name = "window"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("ActsCrossPlatformDisplayTest") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}