1 more test

Author: PankajBhojwani

src/cascadia/UnitTests_SettingsModel/SerializationTests.cpp

@@ -24,6 +24,12 @@ using namespace winrt::Microsoft::Terminal::Control;
 #define SEND_INPUT_ARCH_SPECIFIC_ACTION_HASH "A020D2"
 #endif
 
+#if defined(_M_IX86)
+#define SEND_INPUT2_ARCH_SPECIFIC_ACTION_HASH "56911147"
+#else
+#define SEND_INPUT2_ARCH_SPECIFIC_ACTION_HASH "58D1971"
+#endif
+
 namespace SettingsModelUnitTests
 {
     class SerializationTests : public JsonTestClass
@@ -49,6 +55,7 @@ namespace SettingsModelUnitTests
         TEST_METHOD(GeneratedActionIDsEqualForIdenticalCommands);
         TEST_METHOD(RoundtripLegacyToModernActions);
         TEST_METHOD(RoundtripUserActionsSameAsInBoxAreRemoved);
+        TEST_METHOD(RoundtripActionsSameNameDifferentCommandsAreRetained);
         TEST_METHOD(MultipleActionsAreCollapsed);
 
     private:
@@ -1180,6 +1187,57 @@ namespace SettingsModelUnitTests
         VERIFY_ARE_EQUAL(toString(newResult), toString(oldResult));
     }
 
+    void SerializationTests::RoundtripActionsSameNameDifferentCommandsAreRetained()
+    {
+        static constexpr std::string_view oldSettingsJson{ R"(
+        {
+            "actions": [
+                {
+                    "command": { "action": "sendInput", "input": "just some input" },
+                    "name": "mySendInput"
+                },
+                {
+                    "command": { "action": "sendInput", "input": "just some input 2" },
+                    "name": "mySendInput"
+                }
+            ]
+        })" };
+
+        // There are two different actions with the same name,
+        // ensure that both are kept but have different IDs generated for them
+        static constexpr std::string_view newSettingsJson{ R"(
+        {
+            "actions": [
+                {
+                    "name": "mySendInput",
+                    "command": { "action": "sendInput", "input": "just some input" },
+                    "id": "User.sendInput.)" SEND_INPUT_ARCH_SPECIFIC_ACTION_HASH R"("
+                },
+                {
+                    "name": "mySendInput",
+                    "command": { "action": "sendInput", "input": "just some input 2" },
+                    "id": "User.sendInput.)" SEND_INPUT2_ARCH_SPECIFIC_ACTION_HASH R"("
+                }
+            ]
+        })" };
+
+        implementation::SettingsLoader loader{ oldSettingsJson, implementation::LoadStringResource(IDR_DEFAULTS) };
+        loader.MergeInboxIntoUserSettings();
+        loader.FinalizeLayering();
+        VERIFY_IS_TRUE(loader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
+        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
+        const auto oldResult{ settings->ToJson() };
+
+        implementation::SettingsLoader newLoader{ newSettingsJson, implementation::LoadStringResource(IDR_DEFAULTS) };
+        newLoader.MergeInboxIntoUserSettings();
+        newLoader.FinalizeLayering();
+        VERIFY_IS_FALSE(newLoader.FixupUserSettings(), L"Validate that there is no need to write back to disk");
+        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
+        const auto newResult{ newSettings->ToJson() };
+
+        VERIFY_ARE_EQUAL(toString(newResult), toString(oldResult));
+    }
+
     void SerializationTests::MultipleActionsAreCollapsed()
     {
         static constexpr std::string_view oldSettingsJson{ R"(