From 0415f01e17f5b465b827d0ea6c263ac7e36fc1e0 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 15 May 2023 07:05:28 +0000 Subject: [PATCH] Bug 33733: Fix indentation in subtest Content-Type: text/plain; charset=utf-8 Test plan: git diff -w HEAD~1.. t/XSLT.t Signed-off-by: Marcel de Rooy --- t/XSLT.t | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/t/XSLT.t b/t/XSLT.t index ee1c01e9e9..e3816fcf25 100755 --- a/t/XSLT.t +++ b/t/XSLT.t @@ -32,37 +32,37 @@ my @langs = ('en', 'es-ES'); subtest 'Tests moved from t' => sub { plan tests => 8; -# create temporary files to be tested later -foreach my $theme (@themes) { - foreach my $lang (@langs) { - make_path("$dir/$theme/$lang/xslt"); - open my $fh, '>', "$dir/$theme/$lang/xslt/my_file.xslt"; - print $fh "Theme $theme, language $lang"; - close $fh; + # create temporary files to be tested later + foreach my $theme (@themes) { + foreach my $lang (@langs) { + make_path("$dir/$theme/$lang/xslt"); + open my $fh, '>', "$dir/$theme/$lang/xslt/my_file.xslt"; + print $fh "Theme $theme, language $lang"; + close $fh; + } } -} -sub find_and_slurp { - my ($dir, $theme, $lang) = @_; + sub find_and_slurp { + my ($dir, $theme, $lang) = @_; - my $filename = C4::XSLT::_get_best_default_xslt_filename($dir, $theme, $lang, 'my_file.xslt'); - open my $fh, '<', $filename; - my $str = <$fh>; - close $fh; - return $str; -} + my $filename = C4::XSLT::_get_best_default_xslt_filename($dir, $theme, $lang, 'my_file.xslt'); + open my $fh, '<', $filename; + my $str = <$fh>; + close $fh; + return $str; + } -# These tests verify that we're finding the right XSLT file when present, -# and falling back to the right XSLT file when an exact match is not present. -is(find_and_slurp($dir, 'test', 'en' ), 'Theme test, language en', 'Found test/en'); -is(find_and_slurp($dir, 'test', 'es-ES'), 'Theme test, language es-ES', 'Found test/es-ES'); -is(find_and_slurp($dir, 'prog', 'en', ), 'Theme prog, language en', 'Found test/en'); -is(find_and_slurp($dir, 'prog', 'es-ES'), 'Theme prog, language es-ES', 'Found test/es-ES'); -is(find_and_slurp($dir, 'test', 'fr-FR'), 'Theme test, language en', 'Fell back to test/en for test/fr-FR'); -is(find_and_slurp($dir, 'nope', 'es-ES'), 'Theme prog, language es-ES', 'Fell back to prog/es-ES for nope/es-ES'); -is(find_and_slurp($dir, 'nope', 'fr-FR'), 'Theme prog, language en', 'Fell back to prog/en for nope/fr-FR'); + # These tests verify that we're finding the right XSLT file when present, + # and falling back to the right XSLT file when an exact match is not present. + is(find_and_slurp($dir, 'test', 'en' ), 'Theme test, language en', 'Found test/en'); + is(find_and_slurp($dir, 'test', 'es-ES'), 'Theme test, language es-ES', 'Found test/es-ES'); + is(find_and_slurp($dir, 'prog', 'en', ), 'Theme prog, language en', 'Found test/en'); + is(find_and_slurp($dir, 'prog', 'es-ES'), 'Theme prog, language es-ES', 'Found test/es-ES'); + is(find_and_slurp($dir, 'test', 'fr-FR'), 'Theme test, language en', 'Fell back to test/en for test/fr-FR'); + is(find_and_slurp($dir, 'nope', 'es-ES'), 'Theme prog, language es-ES', 'Fell back to prog/es-ES for nope/es-ES'); + is(find_and_slurp($dir, 'nope', 'fr-FR'), 'Theme prog, language en', 'Fell back to prog/en for nope/fr-FR'); -my $matching_string = q{0}; -my $sysprefs_xml = C4::XSLT::get_xslt_sysprefs(); -ok( $sysprefs_xml =~ m/$matching_string/, 'singleBranchMode has a value of 0'); + my $matching_string = q{0}; + my $sysprefs_xml = C4::XSLT::get_xslt_sysprefs(); + ok( $sysprefs_xml =~ m/$matching_string/, 'singleBranchMode has a value of 0'); }; -- 2.30.2