From 358d485779b322339002a744c9ff5f914b534579 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 27 Jun 2026 20:09:59 +0100
Subject: wee refactorings

---
 test/Xmobar/Plugins/Monitors/CpuSpec.hs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'test/Xmobar')

diff --git a/test/Xmobar/Plugins/Monitors/CpuSpec.hs b/test/Xmobar/Plugins/Monitors/CpuSpec.hs
index 614ca62..b415179 100644
--- a/test/Xmobar/Plugins/Monitors/CpuSpec.hs
+++ b/test/Xmobar/Plugins/Monitors/CpuSpec.hs
@@ -14,19 +14,25 @@ main :: IO ()
 main = hspec spec
 
 withFc :: String -> String
-withFc s = "((<fc=(green|red))?" ++ s ++ "(<fc/>)?)"
+withFc s = "((<fc=(green|red)>)?" ++ s ++ "(</fc>)?)"
 
-fcDigits :: String -> String -> String
-fcDigits prefix suffix = prefix ++ withFc "([0-9][0-9]?|-0)" ++ suffix -- in CI computers, -0 is a value
+withFcDigits :: String -> String -> String
+withFcDigits prefix suffix = prefix ++ digits ++ suffix
+  where digits = withFc "([0-9][0-9]?|-0)" -- in CI computers, -0 is a value
 
 spec :: Spec
 spec =
   describe "CPU Spec" $ do
+    it "uses the correct regexps" $
+      do "Cpu: -0%" `shouldSatisfy` (=~ withFcDigits "Cpu: " "%")
+         "Cpu: 12" `shouldSatisfy` (=~ withFcDigits "Cpu: " "")
+         "Cpu: <fc=red>12</fc>" `shouldSatisfy` (=~ withFcDigits "Cpu: " "")
+         "Cpu: <fc=green>12</fc> -0" `shouldSatisfy` (=~ withFcDigits "Cpu: (" ")+")
     it "works with total template" $
       do let args = ["-L","3","-H","50","--normal","green","--high","red", "-t", "Cpu: <total>%"]
          cpuArgs <- getArguments args
          cpuValue <- runCpu cpuArgs
-         cpuValue `shouldSatisfy` (=~ (fcDigits "Cpu: " "%"))
+         cpuValue `shouldSatisfy` (=~ withFcDigits "Cpu: " "%")
     it "works with bar template" $
       do let args = ["-L","3","-H","50","--normal","green","--high","red", "-t", "Cpu: <total>% <bar>"]
          cpuArgs <- getArguments args
@@ -46,4 +52,5 @@ spec =
       do let args = ["-L","3","-H","50","--normal","green","--high","red", "-t", "Cpu: <user> <nice> <iowait>"]
          cpuArgs <- getArguments args
          cpuValue <- runCpu cpuArgs
-         cpuValue `shouldSatisfy` (=~ (fcDigits "Cpu:( " ")+"))
+         cpuValue `shouldSatisfy` (=~ withFcDigits "Cpu:( " ")+")
+
-- 
cgit v1.2.3