From d49c767176c57017e546c8dc43a09eb8424ef426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Sun, 25 Oct 2026 13:28:02 +0100
Subject: Test: move RangeExpressions test to expression module

---
 test/script/expression.et | 156 ++++++++++++++++++++++++++++++++++++++++++++++
 test/script/run.et        | 156 ----------------------------------------------
 2 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/test/script/expression.et b/test/script/expression.et
index c92a09b..8fbaa03 100644
--- a/test/script/expression.et
+++ b/test/script/expression.et
@@ -6,6 +6,162 @@ asset scripts:
     path: ../asset/run
 
 
+test RangeExpressions:
+    node n
+    shell on n as git_init:
+        git -c init.defaultBranch=master init -q
+        git -c user.name=test -c user.email=test commit -q --allow-empty -m 'initial commit'
+        cp "${scripts.path}/single.yaml" minici.yaml
+        git add minici.yaml
+        git -c user.name=test -c user.email=test commit -q -m 'minici.yaml'
+        git rev-parse HEAD
+
+        touch a
+        git add a
+        git -c user.name=test -c user.email=test commit -q -m a
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        touch b
+        git add b
+        git -c user.name=test -c user.email=test commit -q -m b
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        touch c
+        git add c
+        git -c user.name=test -c user.email=test commit -q -m c
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        touch d
+        git add d
+        git -c user.name=test -c user.email=test commit -q -m d
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        touch e
+        git add e
+        git -c user.name=test -c user.email=test commit -q -m e
+        git rev-parse HEAD
+        git rev-parse HEAD^{tree}
+
+        git reset --hard HEAD~5
+        git rev-parse HEAD
+
+    expect /([0-9a-f]+)/ from git_init capture c_init
+    expect /([0-9a-f]+)/ from git_init capture ca
+    expect /([0-9a-f]+)/ from git_init capture ta
+    expect /([0-9a-f]+)/ from git_init capture cb
+    expect /([0-9a-f]+)/ from git_init capture tb
+    expect /([0-9a-f]+)/ from git_init capture cc
+    expect /([0-9a-f]+)/ from git_init capture tc
+    expect /([0-9a-f]+)/ from git_init capture cd
+    expect /([0-9a-f]+)/ from git_init capture td
+    expect /([0-9a-f]+)/ from git_init capture ce
+    expect /([0-9a-f]+)/ from git_init capture te
+    expect /([0-9a-f]+)/ from git_init capture c_end
+
+    guard (c_init == c_end)
+
+    local:
+        spawn on n as p args [ "run", "--rerun-all", "$ce:" ] killwith SIGINT
+        expect from p:
+            /job-enqueue $te:single/
+            /job-start $te:single/
+            /job-finish $te:single done/
+        expect /(.*)/ from p capture finish
+        guard (finish == "run-finish")
+
+    local:
+        spawn on n as p args [ "run", "--rerun-all", "$cb..$cd" ] killwith SIGINT
+        expect from p:
+            /job-enqueue $tc:single/
+            /job-start $tc:single/
+            /job-finish $tc:single done/
+            /job-enqueue $td:single/
+            /job-start $td:single/
+            /job-finish $td:single done/
+        expect /(.*)/ from p capture finish
+        guard (finish == "run-finish")
+
+    local:
+        spawn on n as p args [ "run", "--rerun-all", "master..$cc" ] killwith SIGINT
+        expect from p:
+            /job-enqueue $ta:single/
+            /job-start $ta:single/
+            /job-finish $ta:single done/
+            /job-enqueue $tb:single/
+            /job-start $tb:single/
+            /job-finish $tb:single done/
+            /job-enqueue $tc:single/
+            /job-start $tc:single/
+            /job-finish $tc:single done/
+        expect /(.*)/ from p capture finish
+        guard (finish == "run-finish")
+
+    local:
+        local:
+            shell on n:
+                git reset --hard $ca
+
+        spawn on n as p args [ "run", "--rerun-all", "watch(master)" ] killwith SIGINT
+        expect from p:
+            /job-enqueue $ta:single/
+            /job-start $ta:single/
+            /job-finish $ta:single done/
+
+        local:
+            shell on n:
+                git reset --hard $cd
+
+        expect from p:
+            /job-enqueue (.*)/ capture td_single
+        guard (td_single == "$td:single")
+        expect from p:
+            /job-start $td_single/
+            /job-finish $td_single done/
+
+        local:
+            shell on n:
+                git reset --hard $cb
+
+        expect from p:
+            /job-enqueue (.*)/ capture tb_single
+        guard (tb_single == "$tb:single")
+        expect from p:
+            /job-start $tb_single/
+            /job-finish $tb_single done/
+
+    local:
+        local:
+            shell on n:
+                git reset --hard $c_init
+
+        spawn on n as p args [ "run", "--rerun-all", "master..watch(master)" ] killwith SIGINT
+        expect from p /watch-branch-started master/
+
+        shell on n:
+            git reset --hard $cb
+        expect from p:
+            /job-enqueue $ta:single/
+            /job-start $ta:single/
+            /job-finish $ta:single done/
+            /job-enqueue $tb:single/
+            /job-start $tb:single/
+            /job-finish $tb:single done/
+
+        shell on n:
+            git reset --hard $cd
+        expect from p:
+            /job-enqueue $tc:single/
+            /job-start $tc:single/
+            /job-finish $tc:single done/
+            /job-enqueue $td:single/
+            /job-start $td:single/
+            /job-finish $td:single done/
+
+
 test WatchTagList:
     node n
     shell on n as git_init:
diff --git a/test/script/run.et b/test/script/run.et
index 0b61ef4..4df5a2e 100644
--- a/test/script/run.et
+++ b/test/script/run.et
@@ -860,159 +860,3 @@ test RestartCancelledJobs:
             /job-start $td:third/
             /job-(.*)/ capture final_job
         guard (final_job == "finish $td:third done")
-
-
-test RangeExpressions:
-    node n
-    shell on n as git_init:
-        git -c init.defaultBranch=master init -q
-        git -c user.name=test -c user.email=test commit -q --allow-empty -m 'initial commit'
-        cp "${scripts.path}/single.yaml" minici.yaml
-        git add minici.yaml
-        git -c user.name=test -c user.email=test commit -q -m 'minici.yaml'
-        git rev-parse HEAD
-
-        touch a
-        git add a
-        git -c user.name=test -c user.email=test commit -q -m a
-        git rev-parse HEAD
-        git rev-parse HEAD^{tree}
-
-        touch b
-        git add b
-        git -c user.name=test -c user.email=test commit -q -m b
-        git rev-parse HEAD
-        git rev-parse HEAD^{tree}
-
-        touch c
-        git add c
-        git -c user.name=test -c user.email=test commit -q -m c
-        git rev-parse HEAD
-        git rev-parse HEAD^{tree}
-
-        touch d
-        git add d
-        git -c user.name=test -c user.email=test commit -q -m d
-        git rev-parse HEAD
-        git rev-parse HEAD^{tree}
-
-        touch e
-        git add e
-        git -c user.name=test -c user.email=test commit -q -m e
-        git rev-parse HEAD
-        git rev-parse HEAD^{tree}
-
-        git reset --hard HEAD~5
-        git rev-parse HEAD
-
-    expect /([0-9a-f]+)/ from git_init capture c_init
-    expect /([0-9a-f]+)/ from git_init capture ca
-    expect /([0-9a-f]+)/ from git_init capture ta
-    expect /([0-9a-f]+)/ from git_init capture cb
-    expect /([0-9a-f]+)/ from git_init capture tb
-    expect /([0-9a-f]+)/ from git_init capture cc
-    expect /([0-9a-f]+)/ from git_init capture tc
-    expect /([0-9a-f]+)/ from git_init capture cd
-    expect /([0-9a-f]+)/ from git_init capture td
-    expect /([0-9a-f]+)/ from git_init capture ce
-    expect /([0-9a-f]+)/ from git_init capture te
-    expect /([0-9a-f]+)/ from git_init capture c_end
-
-    guard (c_init == c_end)
-
-    local:
-        spawn on n as p args [ "run", "--rerun-all", "$ce:" ] killwith SIGINT
-        expect from p:
-            /job-enqueue $te:single/
-            /job-start $te:single/
-            /job-finish $te:single done/
-        expect /(.*)/ from p capture finish
-        guard (finish == "run-finish")
-
-    local:
-        spawn on n as p args [ "run", "--rerun-all", "$cb..$cd" ] killwith SIGINT
-        expect from p:
-            /job-enqueue $tc:single/
-            /job-start $tc:single/
-            /job-finish $tc:single done/
-            /job-enqueue $td:single/
-            /job-start $td:single/
-            /job-finish $td:single done/
-        expect /(.*)/ from p capture finish
-        guard (finish == "run-finish")
-
-    local:
-        spawn on n as p args [ "run", "--rerun-all", "master..$cc" ] killwith SIGINT
-        expect from p:
-            /job-enqueue $ta:single/
-            /job-start $ta:single/
-            /job-finish $ta:single done/
-            /job-enqueue $tb:single/
-            /job-start $tb:single/
-            /job-finish $tb:single done/
-            /job-enqueue $tc:single/
-            /job-start $tc:single/
-            /job-finish $tc:single done/
-        expect /(.*)/ from p capture finish
-        guard (finish == "run-finish")
-
-    local:
-        local:
-            shell on n:
-                git reset --hard $ca
-
-        spawn on n as p args [ "run", "--rerun-all", "watch(master)" ] killwith SIGINT
-        expect from p:
-            /job-enqueue $ta:single/
-            /job-start $ta:single/
-            /job-finish $ta:single done/
-
-        local:
-            shell on n:
-                git reset --hard $cd
-
-        expect from p:
-            /job-enqueue (.*)/ capture td_single
-        guard (td_single == "$td:single")
-        expect from p:
-            /job-start $td_single/
-            /job-finish $td_single done/
-
-        local:
-            shell on n:
-                git reset --hard $cb
-
-        expect from p:
-            /job-enqueue (.*)/ capture tb_single
-        guard (tb_single == "$tb:single")
-        expect from p:
-            /job-start $tb_single/
-            /job-finish $tb_single done/
-
-    local:
-        local:
-            shell on n:
-                git reset --hard $c_init
-
-        spawn on n as p args [ "run", "--rerun-all", "master..watch(master)" ] killwith SIGINT
-        expect from p /watch-branch-started master/
-
-        shell on n:
-            git reset --hard $cb
-        expect from p:
-            /job-enqueue $ta:single/
-            /job-start $ta:single/
-            /job-finish $ta:single done/
-            /job-enqueue $tb:single/
-            /job-start $tb:single/
-            /job-finish $tb:single done/
-
-        shell on n:
-            git reset --hard $cd
-        expect from p:
-            /job-enqueue $tc:single/
-            /job-start $tc:single/
-            /job-finish $tc:single done/
-            /job-enqueue $td:single/
-            /job-start $td:single/
-            /job-finish $td:single done/
-- 
cgit v1.2.3