Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/folder-source-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ provider 暂时缺失时,合法引用保持不变,可保存为占位驻留

## 验证

Shell 的 `taskmanager_qml_api` 测试使用真实 Qt 测试插件覆盖固定、重复拒绝、模型角色传递、
变化通知、顺序保存、未知插件恢复和取消固定释放对象。
任务栏 `FolderPopup.qml` 统一处理普通目录和文管内容页面;`frame_qml` 覆盖共享弹窗生命周期。
文管插件的独立测试覆盖动态加载、真实 QML 页面、多个目录独立导航、文件增删改名、
目录删除后重建、固定目录重命名后跟随并上报新身份、固定目录被删除时上报内容丢失
Expand Down
7 changes: 1 addition & 6 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ add_custom_target(coverage
find_program(QML_TEST_RUNNER NAMES qmltestrunner6 qmltestrunner
HINTS /usr/lib/qt${QT_VERSION_MAJOR}/bin)
if(QML_TEST_RUNNER)
foreach(_suite frame/qml panels/dock/taskmanager/qml)
foreach(_suite frame/qml)
string(REPLACE "/" "_" _name "${_suite}")
add_test(NAME ${_name}
COMMAND ${CMAKE_COMMAND} -E env
Expand All @@ -29,9 +29,4 @@ if(QML_TEST_RUNNER)
${QML_TEST_RUNNER} -input "${CMAKE_CURRENT_SOURCE_DIR}/${_suite}"
-import "${CMAKE_BINARY_DIR}/plugins")
endforeach()
add_custom_target(folder_qml_tests
DEPENDS dde-shell-plugin dde-shell-dock dock-plugin
COMMAND ${CMAKE_CTEST_COMMAND} --test-dir "${CMAKE_BINARY_DIR}"
-R "^(frame_qml|panels_dock_taskmanager_qml)$" --output-on-failure
VERBATIM)
endif()
23 changes: 0 additions & 23 deletions tests/panels/dock/taskmanager/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,3 @@ add_executable(foldermenuregistry_tests
target_include_directories(foldermenuregistry_tests PRIVATE ${CMAKE_SOURCE_DIR}/panels/dock/taskmanager)
target_link_libraries(foldermenuregistry_tests PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test)
add_test(NAME folder_menu_registry COMMAND foldermenuregistry_tests)

# Exercise the real backend through Applet's QML attached-type lookup, not just
# QObject/QMetaObject invocation (capitalized D-Bus methods differ here).
add_executable(taskmanagerqmlapi_tests taskmanagerqmlapitests.cpp)
# Inject the folder model without starting window monitoring or D-Bus services,
# as in the other dock tests that access private model state.
target_compile_options(taskmanagerqmlapi_tests PRIVATE -fno-access-control)
add_library(test-folder-provider MODULE testfolderprovider.cpp)
target_link_libraries(test-folder-provider PRIVATE dde-shell-dock)
set_target_properties(test-folder-provider PROPERTIES PREFIX ""
OUTPUT_NAME "org.deepin.ds.folderprovider.testsource"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/plugins")
target_compile_definitions(taskmanagerqmlapi_tests PRIVATE
TEST_FOLDER_PLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}/plugins"
TEST_SHELL_QML_DIR="${CMAKE_BINARY_DIR}/plugins"
TEST_TASKMANAGER_PACKAGE="${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/package")
add_dependencies(taskmanagerqmlapi_tests test-folder-provider)
target_include_directories(taskmanagerqmlapi_tests PRIVATE ${CMAKE_SOURCE_DIR}/panels/dock/taskmanager)
target_link_libraries(taskmanagerqmlapi_tests PRIVATE dock-taskmanager dde-shell-dock Qt${QT_VERSION_MAJOR}::Qml Qt${QT_VERSION_MAJOR}::Test)
add_test(NAME taskmanager_qml_api COMMAND taskmanagerqmlapi_tests)
# Debian builds disable build RPATH; use the plugin and frame from this build.
set_tests_properties(taskmanager_qml_api PROPERTIES ENVIRONMENT
"QT_QPA_PLATFORM=offscreen;QT_QUICK_BACKEND=software;LD_LIBRARY_PATH=$<TARGET_FILE_DIR:dock-taskmanager>:$<TARGET_FILE_DIR:dde-shell-dock>:$<TARGET_FILE_DIR:dde-shell-frame>")
103 changes: 0 additions & 103 deletions tests/panels/dock/taskmanager/qml/tst_foldercomponents.qml

This file was deleted.

Loading
Loading