config: fix description matching for default workspaces (#15074)

2026-08-24 10:04:19 -05:00 · 2026-06-12 15:38:43 +01:00
parent 7dcdb8d792
commit d5b8d7288d
4 changed files with 104 additions and 14 deletions
@@ -0,0 +1,91 @@
+#include <config/shared/workspace/WorkspaceRuleManager.hpp>
+#include <output/IMonitorIdentifiable.hpp>
+
+#include <gtest/gtest.h>
+#include <hyprutils/string/String.hpp>
+
+#include <string>
+
+class CWorkspaceRuleTestMonitor : public Monitor::IMonitorIdentifiable {
+  public:
+    virtual MONITORID id() const override {
+        return 0;
+    }
+
+    virtual std::string_view name() const override {
+        return m_name;
+    }
+
+    virtual std::string_view description() const override {
+        return m_description;
+    }
+
+    virtual std::string_view shortDescription() const override {
+        return m_shortDescription;
+    }
+
+    virtual bool matchesStaticSelector(std::string_view selector) const override {
+        if (selector.starts_with("desc:")) {
+            const auto DESCRIPTION = Hyprutils::String::trim(selector.substr(5));
+            return m_description.starts_with(DESCRIPTION) || m_shortDescription.starts_with(DESCRIPTION);
+        }
+
+        return selector == m_name;
+    }
+
+    std::string m_name;
+    std::string m_description;
+    std::string m_shortDescription;
+};
+
+static Config::CWorkspaceRule defaultWorkspaceRule(const std::string& workspace, const std::string& monitor) {
+    Config::CWorkspaceRule rule;
+    rule.m_workspaceString = workspace;
+    rule.m_workspaceName   = workspace;
+    rule.m_monitor         = monitor;
+    rule.m_isDefault       = true;
+    return rule;
+}
+
+TEST(WorkspaceRuleManager, defaultWorkspaceMatchesMonitorName) {
+    Config::CWorkspaceRuleManager manager;
+    manager.add(defaultWorkspaceRule("4", "DP-1"));
+
+    CWorkspaceRuleTestMonitor monitor;
+    monitor.m_name = "DP-1";
+
+    EXPECT_EQ(manager.getDefaultWorkspaceFor(monitor), "4");
+}
+
+TEST(WorkspaceRuleManager, defaultWorkspaceMatchesMonitorDescription) {
+    Config::CWorkspaceRuleManager manager;
+    manager.add(defaultWorkspaceRule("4", "desc:Microstep MPG321UX OLED"));
+
+    CWorkspaceRuleTestMonitor monitor;
+    monitor.m_name        = "DP-3";
+    monitor.m_description = "Microstep MPG321UX OLED 0x01010101";
+
+    EXPECT_EQ(manager.getDefaultWorkspaceFor(monitor), "4");
+}
+
+TEST(WorkspaceRuleManager, defaultWorkspaceMatchesMonitorShortDescription) {
+    Config::CWorkspaceRuleManager manager;
+    manager.add(defaultWorkspaceRule("5", "desc:ASUSTek COMPUTER INC PA24ACRV"));
+
+    CWorkspaceRuleTestMonitor monitor;
+    monitor.m_name             = "DP-2";
+    monitor.m_shortDescription = "ASUSTek COMPUTER INC PA24ACRV S5LMYX000514";
+
+    EXPECT_EQ(manager.getDefaultWorkspaceFor(monitor), "5");
+}
+
+TEST(WorkspaceRuleManager, defaultWorkspaceSkipsNonMatchingMonitor) {
+    Config::CWorkspaceRuleManager manager;
+    manager.add(defaultWorkspaceRule("4", "desc:Microstep MPG321UX OLED"));
+
+    CWorkspaceRuleTestMonitor monitor;
+    monitor.m_name        = "DP-1";
+    monitor.m_description = "ASUSTek COMPUTER INC PA24ACRV S1LMYX001494";
+
+    EXPECT_EQ(manager.getDefaultWorkspaceFor(monitor), "");
+}