New test case for async channel

vczh-libraries · Feb 16, 2025 · 9fa7a5b · 9fa7a5b
1 parent 44f8727
commit 9fa7a5b
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 7 deletions.
diff --git a/Source/UnitTestUtilities/GuiUnitTestProtocol_Shared.h b/Source/UnitTestUtilities/GuiUnitTestProtocol_Shared.h
@@ -31,6 +31,13 @@ namespace vl::presentation::unittest
 		auto operator<=>(const WindowStyleConfig&) const = default;
 	};
 
+	enum class UnitTestRemoteChannel
+	{
+		None,
+		Sync,
+		Async,
+	};
+
 	struct UnitTestScreenConfig
 	{
 		using FontConfig = vl::presentation::remoteprotocol::FontConfig;
@@ -41,7 +48,7 @@ namespace vl::presentation::unittest
 		FontConfig					fontConfig;
 		ScreenConfig				screenConfig;
 		bool						useDomDiff = false;
-		bool						useSyncChannel = false;
+		UnitTestRemoteChannel		useChannel = UnitTestRemoteChannel::None;
 
 		void						FastInitialize(vint width, vint height, vint taskBarHeight = 0);
 	};

diff --git a/Source/UnitTestUtilities/GuiUnitTestUtilities.cpp b/Source/UnitTestUtilities/GuiUnitTestUtilities.cpp
@@ -304,9 +304,9 @@ void GacUIUnitTest_Start(const WString& appName, Nullable<UnitTestScreenConfig>
 
 	// Core
 	repeatfiltering::GuiRemoteProtocolFilterVerifier verifierProtocol(
-		globalConfig.useSyncChannel
-		? &channelSender
-		: unitTestProtocol.GetProtocol()
+		globalConfig.useChannel == UnitTestRemoteChannel::None
+		? unitTestProtocol.GetProtocol()
+		: &channelSender
 		);
 	repeatfiltering::GuiRemoteProtocolFilter filteredProtocol(&verifierProtocol);
 	GuiRemoteProtocolDomDiffConverter diffConverterProtocol(&filteredProtocol);
@@ -328,6 +328,11 @@ void GacUIUnitTest_Start(const WString& appName, Nullable<UnitTestScreenConfig>
 	GacUIUnitTest_LogDiffs(appName, unitTestProtocol);
 }
 
+void GacUIUnitTest_StartAsync(const WString& appName, Nullable<UnitTestScreenConfig> config)
+{
+	CHECK_FAIL(L"Not Implemented!");
+}
+
 void GacUIUnitTest_Start_WithResourceAsText(const WString& appName, Nullable<UnitTestScreenConfig> config, const WString& resourceText)
 {
 #define ERROR_MESSAGE_PREFIX L"GacUIUnitTest_Start_WithResourceAsText(const WString&, Nullable<UnitTestScreenConfig>, const WString&)#"
@@ -363,7 +368,15 @@ void GacUIUnitTest_Start_WithResourceAsText(const WString& appName, Nullable<Uni
 		}
 		previousMainProxy(protocol, context);
 	});
-	GacUIUnitTest_Start(appName, config);
+
+	if (config && config.Value().useChannel == UnitTestRemoteChannel::Async)
+	{
+		GacUIUnitTest_StartAsync(appName, config);
+	}
+	else
+	{
+		GacUIUnitTest_Start(appName, config);
+	}
 #undef ERROR_MESSAGE_PREFIX
 }
 

diff --git a/Source/UnitTestUtilities/GuiUnitTestUtilities.h b/Source/UnitTestUtilities/GuiUnitTestUtilities.h
@@ -25,6 +25,7 @@ extern void										GacUIUnitTest_Finalize();
 extern void										GacUIUnitTest_SetGuiMainProxy(const vl::presentation::unittest::UnitTestMainFunc& proxy);
 extern void										GacUIUnitTest_LinkGuiMainProxy(const vl::presentation::unittest::UnitTestLinkFunc& proxy);
 extern void										GacUIUnitTest_Start(const vl::WString& appName, vl::Nullable<vl::presentation::unittest::UnitTestScreenConfig> config = {});
+extern void										GacUIUnitTest_StartAsync(const vl::WString& appName, vl::Nullable<vl::presentation::unittest::UnitTestScreenConfig> config = {});
 extern void										GacUIUnitTest_Start_WithResourceAsText(const vl::WString& appName, vl::Nullable<vl::presentation::unittest::UnitTestScreenConfig> config, const vl::WString& resourceText);
 extern vl::Ptr<vl::presentation::GuiResource>	GacUIUnitTest_CompileAndLoad(const vl::WString& xmlResource);
 

diff --git a/Test/GacUISrc/UnitTest/TestRemote_UnitTestFramework.cpp b/Test/GacUISrc/UnitTest/TestRemote_UnitTestFramework.cpp
@@ -381,7 +381,7 @@ TEST_FILE
 
 			UnitTestScreenConfig globalConfig;
 			globalConfig.FastInitialize(1024, 768);
-			globalConfig.useSyncChannel = true;
+			globalConfig.useChannel = UnitTestRemoteChannel::Sync;
 
 			GacUIUnitTest_StartFast_WithResourceAsText<darkskin::Theme>(
 				WString::Unmanaged(L"UnitTestFramework/Channel/Sync"),
@@ -414,7 +414,7 @@ TEST_FILE
 			UnitTestScreenConfig globalConfig;
 			globalConfig.FastInitialize(1024, 768);
 			globalConfig.useDomDiff = true;
-			globalConfig.useSyncChannel = true;
+			globalConfig.useChannel = UnitTestRemoteChannel::Sync;
 
 			GacUIUnitTest_StartFast_WithResourceAsText<darkskin::Theme>(
 				WString::Unmanaged(L"UnitTestFramework/Channel/Everything"),

diff --git a/Test/GacUISrc/UnitTest/TestRemote_UnitTestFramework_Async.cpp b/Test/GacUISrc/UnitTest/TestRemote_UnitTestFramework_Async.cpp
@@ -0,0 +1,72 @@
+#include "../../../Source/UnitTestUtilities/GuiUnitTestUtilities.h"
+#ifdef VCZH_64
+#include "../Generated_DarkSkin/Source_x64/DarkSkin.h"
+#else
+#include "../Generated_DarkSkin/Source_x86/DarkSkin.h"
+#endif
+
+using namespace vl;
+using namespace vl::stream;
+using namespace vl::reflection::description;
+using namespace vl::presentation;
+using namespace vl::presentation::elements;
+using namespace vl::presentation::compositions;
+using namespace vl::presentation::controls;
+using namespace vl::presentation::unittest;
+
+TEST_FILE
+{
+	TEST_CATEGORY(L"Channels and Diffs")
+	{
+		const auto resource = LR"GacUISrc(
+<Resource>
+  <Instance name="MainWindowResource">
+    <Instance ref.Class="gacuisrc_unittest::MainWindow">
+      <Window ref.Name="self" Text="Hello, world!" ClientSize="x:320 y:240">
+        <Button ref.Name="buttonOK" Text="OK">
+          <att.BoundsComposition-set AlignmentToParent="left:5 top:5 right:-1 bottom:-1"/>
+          <ev.Clicked-eval><![CDATA[ {
+            Application::GetApplication().InvokeInMainThread(self, func():void{self.Hide();});
+          } ]]></ev.Clicked-eval>
+        </Button>
+      </Window>
+    </Instance>
+  </Instance>
+</Resource>
+)GacUISrc";
+
+		auto sharedProxy = [](UnitTestRemoteProtocol* protocol, IUnitTestContext*)
+		{
+			protocol->OnNextIdleFrame(L"Ready", [=]()
+			{
+				auto window = GetApplication()->GetMainWindow();
+				auto buttonOK = TryFindObjectByName<GuiButton>(window, L"buttonOK");
+				protocol->MouseMove(protocol->LocationOf(buttonOK));
+			});
+			protocol->OnNextIdleFrame(L"Hover", [=]()
+			{
+				protocol->_LDown();
+			});
+			protocol->OnNextIdleFrame(L"Press", [=]()
+			{
+				protocol->_LUp();
+			});
+		};
+
+		TEST_CASE(L"Async Channel")
+		{
+			GacUIUnitTest_SetGuiMainProxy(sharedProxy);
+
+			UnitTestScreenConfig globalConfig;
+			globalConfig.FastInitialize(1024, 768);
+			globalConfig.useChannel = UnitTestRemoteChannel::Async;
+
+			GacUIUnitTest_StartFast_WithResourceAsText<darkskin::Theme>(
+				WString::Unmanaged(L"UnitTestFramework/Channel/Async"),
+				WString::Unmanaged(L"gacuisrc_unittest::MainWindow"),
+				resource,
+				globalConfig
+				);
+		});
+	});
+}
diff --git a/Test/GacUISrc/UnitTest/UnitTest.vcxproj b/Test/GacUISrc/UnitTest/UnitTest.vcxproj
@@ -245,6 +245,7 @@
     <ClCompile Include="TestRemote_RenderingDom.cpp" />
     <ClCompile Include="TestRemote_Startup.cpp" />
     <ClCompile Include="TestRemote_UnitTestFramework.cpp" />
+    <ClCompile Include="TestRemote_UnitTestFramework_Async.cpp" />
     <ClCompile Include="TestResource.cpp" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Test/GacUISrc/UnitTest/UnitTest.vcxproj.filters b/Test/GacUISrc/UnitTest/UnitTest.vcxproj.filters
@@ -258,6 +258,9 @@
     <ClCompile Include="TestRemote_RenderingDom.cpp">
       <Filter>Source Files\Remote</Filter>
     </ClCompile>
+    <ClCompile Include="TestRemote_UnitTestFramework_Async.cpp">
+      <Filter>Source Files\Remote</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="TestCompositions.h">