From c55240fb05151cae046c75a793c164d72c988db2 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 6 Jan 2017 18:46:58 +0300
Subject: Tests cleanup (take 2)

---
 tests/test/script/builtin/rm.test | 188 +++++++++++++++++++++-----------------
 tests/value/reverse.test          | 110 +++++++++++-----------
 2 files changed, 161 insertions(+), 137 deletions(-)

(limited to 'tests')

diff --git a/tests/test/script/builtin/rm.test b/tests/test/script/builtin/rm.test
index 915052a..cd4a922 100644
--- a/tests/test/script/builtin/rm.test
+++ b/tests/test/script/builtin/rm.test
@@ -6,102 +6,118 @@
 
 : no-args
 :
-: Removing with no arguments fails.
-:
-$c <'rm 2>"rm: missing file" == 1';
-$b
-
-: no-args-force
-:
-: Removing with no arguments succeeds with -f option.
-:
-$c <'rm -f';
-$b
+{
+  : fail
+  :
+  : Removing with no arguments fails.
+  :
+  $c <'rm 2>"rm: missing file" == 1';
+  $b
 
-: empty-path
-:
-: Removing an empty path fails.
-:
-$c <<EOI;
-rm '' 2>"rm: invalid path ''" == 1
-EOI
-$b
+  : force
+  :
+  : Removing with no arguments succeeds with -f option.
+  :
+  $c <'rm -f';
+  $b
+}
 
 : file
 :
-: Removing existing file succeeds.
-:
-$c <<EOI;
-touch a &!a;
-rm a
-EOI
-$b
+{
+  : exists
+  :
+  : Removing existing file succeeds.
+  :
+  $c <<EOI;
+  touch a &!a;
+  rm a
+  EOI
+  $b
 
-: file-not-exists
-:
-: Removing non-existing file fails.
-:
-$c <<EOI;
-rm a 2>>~%EOE% == 1
-%rm: unable to remove '.+[/\\]test[/\\]rm[/\\]file-not-exists[/\\]test[/\\]1[/\\]a': .+%
-EOE
-EOI
-$b
+  : not-exists
+  :
+  : Removing non-existing file fails.
+  :
+  $c <<EOI;
+  rm a 2>>~%EOE% == 1
+  %rm: unable to remove '.+[/\\]test[/\\]rm[/\\]file[/\\]not-exists[/\\]test[/\\]1[/\\]a': .+%
+  EOE
+  EOI
+  $b
 
-: file-not-exists-force
-:
-: Removing non-existing file succeeds with -f option.
-:
-$c <'rm -f a';
-$b
+  : not-exists-force
+  :
+  : Removing non-existing file succeeds with -f option.
+  :
+  $c <'rm -f a';
+  $b
+}
 
 : dir
 :
-: Removing directory fails by default.
-:
-$c <<EOI;
-mkdir a;
-rm a 2>"rm: '$normalize([path] $~/a)' is a directory" == 1
-EOI
-$b
+{
+  : default
+  :
+  : Removing directory fails by default.
+  :
+  $c <<EOI;
+  mkdir a;
+  rm a 2>"rm: '$normalize([path] $~/a)' is a directory" == 1
+  EOI
+  $b
 
-: dir-recursive
-:
-: Removing directory succeeds with -r option.
-:
-$c <<EOI;
-mkdir -p a/b &!a &!a/b;
-rm -r a
-EOI
-$b
+  : recursive
+  :
+  : Removing directory succeeds with -r option.
+  :
+  $c <<EOI;
+  mkdir -p a/b &!a &!a/b;
+  rm -r a
+  EOI
+  $b
 
-: scope-dir
-:
-: Removing scope directory fails.
-:
-$c <<EOI;
-rm -r ./ 2>"rm: '([string] $~)' contains test working directory '$~'" == 1
-EOI
-$b
+  : scope
+  :
+  : Removing scope directory fails.
+  :
+  $c <<EOI;
+  rm -r ./ 2>"rm: '([string] $~)' contains test working directory '$~'" == 1
+  EOI
+  $b
+}
 
-: outside-scope
-:
-: Removing path outside the testscript working directory fails. Need to use a
-: path that unlikely exists (not to remove something useful).
-:
-:
-$c <<EOI;
-rm ../../a/b/c 2>>~%EOE% == 1
-%rm: '.+[/\\]outside-scope[/\\]a[/\\]b[/\\]c' is out of working directory '.+[/\\]outside-scope[/\\]test'%
-EOE
-EOI
-$b
+: path
+:
+{
+  : empty
+  :
+  : Removing an empty path fails.
+  :
+  $c <<EOI;
+  rm '' 2>"rm: invalid path ''" == 1
+  EOI
+  $b
 
-: outside-scope-force
-:
-: Removing path outside the testscript working directory succeeds with -f
-: option. Need to use a path that unlikely exists (not to remove something
-: useful).
-:
-$c <'rm -f ../../a/b/c';
-$b
+  : outside-scope
+  :
+  : Removing path outside the testscript working directory fails. Need to use
+  : a path that unlikely exists (not to remove something useful).
+  :
+  :
+  $c <<EOI;
+  rm ../../a/b/c 2>>~%EOE% == 1
+  %rm: '.+[/\\]path[/\\]outside-scope[/\\]a[/\\]b[/\\]c' is out of working directory '.+[/\\]outside-scope[/\\]test'%
+  EOE
+  EOI
+  $b
+
+  : outside-scope-force
+  :
+  : Removing path outside the testscript working directory succeeds with -f
+  : option. Need to use a path that unlikely exists (not to remove something
+  : useful).
+  :
+  $c <'rm -f ../../a/b/c';
+  $b
+}
diff --git a/tests/value/reverse.test b/tests/value/reverse.test
index 06de043..d667a9d 100644
--- a/tests/value/reverse.test
+++ b/tests/value/reverse.test
@@ -7,68 +7,76 @@
 
 .include ../common.test
 
-: name-dir
+: name
 :
-$* <<EOI >>EOO
-x = s/foo/bar/
-print ([string] $x)
-print "$x"
-print -e=$x
-EOI
-s/foo/bar/
-s/foo/bar/
--e=s/foo/bar/
-EOO
+{
+  : dir
+  :
+  $* <<EOI >>EOO
+  x = s/foo/bar/
+  print ([string] $x)
+  print "$x"
+  print -e=$x
+  EOI
+  s/foo/bar/
+  s/foo/bar/
+  -e=s/foo/bar/
+  EOO
 
-: name-proj
-:
-$* <<EOI >>EOO
-print ([strings] foo%bar foo% %bar)
-EOI
-foo%bar foo% %bar
-EOO
+  : proj
+  :
+  $* <<EOI >>EOO
+  print ([strings] foo%bar foo% %bar)
+  EOI
+  foo%bar foo% %bar
+  EOO
 
-: name-pair
-:
-$* <<EOI >>EOO
-print ([strings] foo@bar foo/@bar/ foo@ @bar @ "@@")
-EOI
-foo@bar foo/@bar/ foo@ @bar @ @@
-EOO
+  : pair
+  :
+  $* <<EOI >>EOO
+  print ([strings] foo@bar foo/@bar/ foo@ @bar @ "@@")
+  EOI
+  foo@bar foo/@bar/ foo@ @bar @ @@
+  EOO
 
-: name-combined
-:
-$* <<EOI >>EOO
-print ([strings] x%foo@y%bar x%foo/@y%bar/)
-EOI
-x%foo@y%bar x%foo/@y%bar/
-EOO
+  : combined
+  :
+  $* <<EOI >>EOO
+  print ([strings] x%foo@y%bar x%foo/@y%bar/)
+  EOI
+  x%foo@y%bar x%foo/@y%bar/
+  EOO
+}
 
 : dir-path
 :
-$* <<EOI >>"EOO"
-x = [dir_path] foo/bar/
-print ([string] $x)
-print "$x"
-print "-I$x"
-EOI
-foo/bar/
-foo/bar
--Ifoo/bar
-EOO
-
-: dir-path-root
-:
-if ($cxx.target.class != windows)
 {
-  $* <<EOI >>EOO
-  x = [dir_path] /
+  : rel
+  :
+  $* <<EOI >>"EOO"
+  x = [dir_path] foo/bar/
   print ([string] $x)
   print "$x"
   print "-I$x"
   EOI
-  /
-  /
-  -I/
+  foo/bar/
+  foo/bar
+  -Ifoo/bar
   EOO
+
+  : root
+  :
+  if ($cxx.target.class != windows)
+  {
+    $* <<EOI >>EOO
+    x = [dir_path] /
+    print ([string] $x)
+    print "$x"
+    print "-I$x"
+    EOI
+    /
+    /
+    -I/
+    EOO
+  }
 }
-- 
cgit v1.1