!773 自动测试代码整合成pro

Merge pull request !773 from youbing54/master

tools/qt/simulator/uitest/tcp_socket_manager.cpp → test/autotest/src/tcp_socket_manager.cpp

@@ -19,7 +19,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 
-#include "main.cpp"
 #include "auto_test_manager.h"
 
 namespace OHOS {

test/framework/BUILD.gn

@@ -81,14 +81,8 @@ if (enable_video_component) {
   test_sources += [ "../uitest/test_video/ui_test_video.cpp" ]
 }
 
-auto_test_sources = [
-  "src/compare_tools.cpp",
-  "src/ui_auto_test.cpp",
-]
-
 static_library("framework") {
   sources = test_sources
-  sources += auto_test_sources
 
   include_dirs = [
     "common",
@@ -113,7 +107,6 @@ static_library("framework") {
 
 static_library("auto_framework") {
   sources = test_sources
-  sources += auto_test_sources
   include_dirs = [
     "common",
     "include",

test/framework/src/ui_test_app.cpp

@@ -15,7 +15,6 @@
 
 #include "ui_test_app.h"
 
-#include "compare_tools.h"
 #include "test_resource_config.h"
 #include "ui_test.h"
 #include "ui_test_group.h"

tools/qt/simulator/autotest/auto_test.pro

+
+QT += network
+
+CONFIG += qt
+
+TEMPLATE = lib
+
+CONFIG += c++11
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS \
+    "ENABLE_ICU=1" \
+    "ENABLE_VECTOR_FONT=1" \
+    "ENABLE_BITMAP_FONT=0" \
+    "ENABLE_MULTI_FONT=0" \
+    "ENABEL_UI_AUTO_TEST=0" \
+    "GRAPHIC_ENABLE_LINECAP_FLAG=1" \
+    "GRAPHIC_ENABLE_LINEJOIN_FLAG=1" \
+    "GRAPHIC_ENABLE_ELLIPSE_FLAG=1" \
+    "GRAPHIC_ENABLE_BEZIER_ARC_FLAG=1" \
+    "GRAPHIC_ENABLE_ARC_FLAG=1" \
+    "GRAPHIC_ENABLE_ROUNDEDRECT_FLAG=1" \
+    "GRAPHIC_ENABLE_DASH_GENERATE_FLAG=1" \
+    "GRAPHIC_ENABLE_BLUR_EFFECT_FLAG=1" \
+    "GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG=1" \
+    "GRAPHIC_ENABLE_GRADIENT_FILL_FLAG=1" \
+    "GRAPHIC_ENABLE_PATTERN_FILL_FLAG=1" \
+    "GRAPHIC_ENABLE_DRAW_IMAGE_FLAG=1" \
+    "GRAPHIC_ENABLE_DRAW_TEXT_FLAG=1" \
+    "DEFAULT_ANIMATION=1" \
+
+DEFINES += QT_COMPILER
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+DESTDIR = ../libs
+
+SOURCES += \
+    ../../../../test/autotest/src/auto_test_manager.cpp \
+    ../../../../test/autotest/src/compare_tools.cpp \
+    ../../../../test/autotest/src/socket_thread.cpp \
+    ../../../../test/autotest/src/tcp_socket.cpp \
+    ../../../../test/autotest/src/tcp_socket_manager.cpp \
+    ../../../../test/autotest/src/ui_auto_test.cpp \
+
+HEADERS += \
+    ../../../../test/autotest/include/auto_test_manager.h \
+    ../../../../test/autotest/include/compare_tools.h \
+    ../../../../test/autotest/include/scoket_thread.h \
+    ../../../../test/autotest/include/tcp_socket.h \
+    ../../../../test/autotest/include/tcp_socket_manager.h \
+    ../../../../test/autotest/include/ui_auto_test.h \
+    ../../../../test/autotest/include/ui_test_message.h \
+	
+INCLUDEPATH += \
+    ../../../../frameworks \
+    ../../../../../utils/frameworks/windows \
+    ../../../../../utils/interfaces/innerkits \
+    ../../../../../utils/interfaces/kits \
+    ../../../../../ui/interfaces/frameworks \
+    ../../../../../ui/interfaces/innerkits \
+    ../../../../../ui/interfaces/kits \
+    ../../../../test/framework \
+    ../../../../test/framework/include \
+    ../../../../test/autotest/src \
+    ../../../../test/autotest/include \
+    ../../../../test/uitest \
+    ../../../../../../../third_party/bounds_checking_function/include \
+    ../../../../../../../third_party/harfbuzz/src \
+    ../../../../../../../third_party/icu/icu4c/source/common \
+    ../../../../../../../third_party/freetype/include \
+    ../../../../../../../third_party/cJSON \
+    ../../../../../../../third_party/libjpeg-turbo \
+    ../../../../../../../third_party/libpng \
+    ../../../../../../../third_party/giflib
+
+LIBS += $$OUT_PWD/../libs/libui.dll
+LIBS += $$OUT_PWD/../libs/test.dll
+

tools/qt/simulator/simulator.pro

@@ -13,6 +13,7 @@ SUBDIRS += \
     third_party/qrcodegen \
     libui \
     test \
+    autotest/auto_test.pro \
     uitest/UITest.pro
 
 HEADERS += \

tools/qt/simulator/test/test.pro

@@ -28,7 +28,6 @@ DEFINES += QT_DEPRECATED_WARNINGS \
     "GRAPHIC_ENABLE_DRAW_IMAGE_FLAG=1" \
     "GRAPHIC_ENABLE_DRAW_TEXT_FLAG=1" \
     "DEFAULT_ANIMATION=1" \
-    AUTO_TEST_RESOURCE_PATH=../../simulator/config/auto_test/ \
 
 DEFINES += QT_COMPILER
 
@@ -94,11 +93,6 @@ SOURCES += \
     ../../../../test/uitest/test_view_zindex/ui_test_view_zindex.cpp \
     ../../../../test/uitest/test_view_scale_rotate/ui_test_view_scale_rotate.cpp
 
-SOURCES += \
-    ../../../../test/framework/src/auto_test_manager.cpp \
-    ../../../../test/framework/src/compare_tools.cpp \
-    ../../../../test/framework/src/ui_auto_test.cpp \
-
 HEADERS += \
     ../../../../test/framework/common/ui_text_language.h \
     ../../../../test/framework/common/ui_test_canvas_common.h \
@@ -152,12 +146,6 @@ HEADERS += \
     ../../../../test/uitest/test_view_zindex/ui_test_view_zindex.h \
     ../../../../test/uitest/test_view_scale_rotate/ui_test_view_scale_rotate.h
 
-HEADERS += \
-    ../../../../test/framework/include/auto_test_manager.h \
-    ../../../../test/framework/include/compare_tools.h \
-    ../../../../test/framework/include/ui_auto_test.h \
-    ../../../../test/framework/include/ui_test_message.h \
-
 INCLUDEPATH += \
     ../../../../frameworks \
     ../../../../../utils/frameworks/windows \

tools/qt/simulator/uitest/UITest.pro

@@ -35,9 +35,6 @@ SOURCES += \
     ../drivers/indev/key_input.cpp \
     ../drivers/indev/mouse_input.cpp \
     ../drivers/indev/mousewheel_input.cpp \
-    ../drivers/display/socket_thread.cpp \
-    tcp_socket.cpp \
-    tcp_socket_manager.cpp \
     main.cpp \
     main_widget.cpp
 
@@ -49,9 +46,6 @@ HEADERS += \
     ../drivers/indev/key_input.h \
     ../drivers/indev/mouse_input.h \
     ../drivers/indev/mousewheel_input.h \
-    ../drivers/display/scoket_thread.h \
-    tcp_socket.h \
-    tcp_socket_manager.h \
     main_widget.h
 
 INCLUDEPATH += \
@@ -66,7 +60,9 @@ INCLUDEPATH += \
     ../../../../../utils/interfaces/kits \
     ../../../../../../../third_party/freetype/include \
     ../../../../test/framework/include \
-    ../../../../../../../third_party/bounds_checking_function/include
+    ../../../../../../../third_party/bounds_checking_function/include \
+    ../../../../test/autotest/include \
 
 LIBS += $$OUT_PWD/../libs/libui.dll
 LIBS += $$OUT_PWD/../libs/test.dll
+LIBS += $$OUT_PWD/../libs/auto_test.dll