From 94ed91646620dbcc71cca1fa1fd20be65ec21d4a Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Sun, 7 Apr 2024 17:44:44 +0100
Subject: [PATCH] t/unstow.t: move final set of tests into a subtest

---
 t/unstow.t | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/t/unstow.t b/t/unstow.t
index c0e7639..4252694 100755
--- a/t/unstow.t
+++ b/t/unstow.t
@@ -24,7 +24,7 @@ use warnings;
 
 use File::Spec qw(make_path);
 use POSIX qw(getcwd);
-use Test::More tests => 49;
+use Test::More tests => 35;
 use Test::Output;
 use English qw(-no_match_vars);
 
@@ -465,12 +465,6 @@ subtests("unstow a simple tree minimally with absolute stow AND target dirs when
     );
 });
 
-#
-# unstow a tree with no-folding enabled -
-# no refolding should take place
-#
-cd("$TEST_DIR/target");
-
 sub create_and_stow_pkg {
     my ($id, $pkg) = @_;
 
@@ -527,25 +521,28 @@ sub create_and_stow_pkg {
               "../../$stow_pkg/$id-shared2/subdir/file-$pkg");
 }
 
-foreach my $pkg (qw{a b}) {
-    create_and_stow_pkg('no-folding', $pkg);
-}
+subtest("unstow a tree with no-folding enabled - no refolding should take place", sub {
+    cd("$TEST_DIR/target");
+    plan tests => 15;
 
-my $stow = new_Stow('no-folding' => 1);
-$stow->plan_unstow('no-folding-b');
-is_deeply([ $stow->get_conflicts ], [] => 'no conflicts with --no-folding');
-use Data::Dumper;
-#warn Dumper($stow->get_tasks);
-
-$stow->process_tasks();
-
-is_nonexistent_path('no-folding-b-only-folded');
-is_nonexistent_path('no-folding-b-only-folded2');
-is_nonexistent_path('no-folding-b-only-unfolded/file-b');
-is_nonexistent_path('no-folding-b-only-unfolded2/subdir/file-b');
-is_dir_not_symlink('no-folding-shared');
-is_dir_not_symlink('no-folding-shared2');
-is_dir_not_symlink('no-folding-shared2/subdir');
+    foreach my $pkg (qw{a b}) {
+        create_and_stow_pkg('no-folding', $pkg);
+    }
+
+    my $stow = new_Stow('no-folding' => 1);
+    $stow->plan_unstow('no-folding-b');
+    is_deeply([ $stow->get_conflicts ], [] => 'no conflicts with --no-folding');
+
+    $stow->process_tasks();
+
+    is_nonexistent_path('no-folding-b-only-folded');
+    is_nonexistent_path('no-folding-b-only-folded2');
+    is_nonexistent_path('no-folding-b-only-unfolded/file-b');
+    is_nonexistent_path('no-folding-b-only-unfolded2/subdir/file-b');
+    is_dir_not_symlink('no-folding-shared');
+    is_dir_not_symlink('no-folding-shared2');
+    is_dir_not_symlink('no-folding-shared2/subdir');
+});
 
 # subtests("Test cleaning up subdirs with --paranoid option", sub {
 # TODO
-- 
2.11.4.GIT