fix(testing): fix path and add custom_action testing

MaaXYZ · Oct 31, 2023 · 2612a72 · 2612a72
1 parent 302b0a0
commit 2612a72
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 5 deletions.
diff --git a/test/source/module/RunWithoutFile.cpp b/test/source/module/RunWithoutFile.cpp
@@ -4,10 +4,16 @@
 
 #include "MaaFramework/MaaAPI.h"
 
-bool run_without_file(const std::filesystem::path& image_dir)
+void register_my_action(MaaInstanceHandle maa_handle);
+
+bool run_without_file(const std::filesystem::path& testset_dir)
 {
-    auto controller_handle = MaaDbgControllerCreate(image_dir.string().c_str(), "", MaaDbgControllerType_CarouselImage,
-                                                    MaaTaskParam_Empty, nullptr, nullptr);
+    auto testing_path = testset_dir / "PipelineSmoking" / "Screenshot";
+    auto result_path = testset_dir / "debug";
+
+    auto controller_handle =
+        MaaDbgControllerCreate(testing_path.string().c_str(), result_path.string().c_str(),
+                               MaaDbgControllerType_CarouselImage, MaaTaskParam_Empty, nullptr, nullptr);
 
     MaaControllerWait(controller_handle, MaaControllerPostConnection(controller_handle));
 
@@ -17,7 +23,11 @@ bool run_without_file(const std::filesystem::path& image_dir)
     MaaBindResource(maa_handle, resource_handle);
     MaaBindController(maa_handle, controller_handle);
 
-    json::value diff_task { { "MyTask", json::object {} } };
+    register_my_action(maa_handle);
+
+    json::value diff_task { { "MyTask", json::object { { "action", "Custom" },
+                                                       { "custom_action", "MyAction" },
+                                                       { "custom_action_param", "abcdefg" } } } };
     json::value task_param { { "diff_task", diff_task } };
     std::string task_param_str = task_param.to_string();
 
@@ -30,3 +40,41 @@ bool run_without_file(const std::filesystem::path& image_dir)
 
     return status == MaaStatus_Success;
 }
+
+MaaBool my_action_run([[maybe_unused]] MaaSyncContextHandle sync_context, [[maybe_unused]] MaaStringView task_name,
+                      [[maybe_unused]] MaaStringView custom_action_param, [[maybe_unused]] MaaRectHandle cur_box,
+                      [[maybe_unused]] MaaStringView cur_rec_detail, [[maybe_unused]] MaaTransparentArg action_arg)
+{
+    auto image = MaaCreateImageBuffer();
+    MaaSyncContextScreencap(sync_context, image);
+
+    auto out_box = MaaCreateRectBuffer();
+    auto out_detail = MaaCreateStringBuffer();
+
+    json::value diff_task { { "MyColorMatching", json::object {
+                                                     { "recognition", "ColorMatch" },
+                                                     { "lower", json::array { 100, 100, 100 } },
+                                                     { "upper", json::array { 255, 255, 255 } },
+                                                 } } };
+    json::value task_param { { "diff_task", diff_task } };
+    std::string task_param_str = task_param.to_string();
+
+    MaaSyncContextRunRecognizer(sync_context, image, "MyColorMatching", task_param_str.c_str(), out_box, out_detail);
+
+    auto detail_string = MaaGetString(out_detail);
+    std::ignore = detail_string;
+
+    MaaDestroyImageBuffer(image);
+    MaaDestroyRectBuffer(out_box);
+    MaaDestroyStringBuffer(out_detail);
+
+    return true;
+}
+
+MaaCustomActionAPI my_action;
+
+void register_my_action(MaaInstanceHandle maa_handle)
+{
+    my_action.run = my_action_run;
+    MaaRegisterCustomAction(maa_handle, "MyAction", &my_action, nullptr);
+}
diff --git a/test/source/module/RunWithoutFile.h b/test/source/module/RunWithoutFile.h
@@ -2,4 +2,4 @@
 
 #include <filesystem>
 
-bool run_without_file(const std::filesystem::path& image_dir);
+bool run_without_file(const std::filesystem::path& testset_dir);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		#include <filesystem>

		bool run_without_file(const std::filesystem::path& image_dir);
		bool run_without_file(const std::filesystem::path& testset_dir);