Item14237: More tests.

foswiki · Apr 27, 2017 · db291f8 · db291f8
1 parent f9aa0d6
commit db291f8
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 4 deletions.
diff --git a/UnitTestContrib/test/unit/ConfigTests.pm b/UnitTestContrib/test/unit/ConfigTests.pm
@@ -620,7 +620,8 @@ sub test_expand {
 
         Exps => {
             Exp1     => 'Expanding ExpTest.Key2.Key2_1: ${ExpTest.Key2.Key2_1}',
-            NoExp1   => 'Must not expand \${ExpTest.Key2.Key2_1}',
+            NoExp1   => 'Must not expand ${$}{ExpTest.Key2.Key2_1}',
+            NoExp2   => 'Must not expand too: ${ExpTest.Key2.Key2_1${}} -',
             ExpUndef => 'Undef: "${ExpTest.Key2.Key2_2}"',
         },
     };
@@ -666,6 +667,11 @@ sub test_expand {
         "Single-valued str and key"
     );
 
+    @estrs = $cfg->expandStr( key => 'ExpTest.Exps.NoExp2', );
+    $this->assert_deep_equals(
+        ['Must not expand too: ${ExpTest.Key2.Key2_1} -'],
+        \@estrs, "Quoted finishing } must prevent expanding" );
+
     @estrs =
       $cfg->expandStr( key => [ 'ExpTest.Exps.Exp1', 'ExpTest.Exps.NoExp1', ],
       );
@@ -708,6 +714,42 @@ qr/Failed to expand string '.*?': key ExpTest.Key1.UndefKey value is undefined/,
     };
 }
 
+sub test_expandAll {
+    my $this = shift;
+
+    my $data = {
+        IntKey  => 0,
+        SomeVal => "!!!",
+        Undef   => undef,
+        List    => [
+            'This is with IntKey=${IntKey}.',
+            {
+                A => 'A complex structure${SomeVal}',
+                U => 'With ${Undef} value',
+            },
+        ],
+    };
+
+    $this->app->cfg->expandAll( data => $data, );
+
+    $this->assert_deep_equals(
+        {
+            'IntKey' => 0,
+            'List'   => [
+                'This is with IntKey=0.',
+                {
+                    'A' => 'A complex structure!!!',
+                    'U' => 'With undef value'
+                }
+            ],
+            'Undef'   => undef,
+            'SomeVal' => '!!!'
+        },
+        $data,
+        "Expanded structure doesn't match"
+    );
+}
+
 sub test_ReadWriteLSC {
     my $this = shift;
 

diff --git a/UnitTestContrib/test/unit/FoswikiPmFunctionsTests.pm b/UnitTestContrib/test/unit/FoswikiPmFunctionsTests.pm
@@ -3,10 +3,10 @@ package FoswikiPmFunctionsTests;
 use v5.14;
 
 use diagnostics -verbose;
-use Foswiki();
+use Foswiki    ();
+use File::Spec ();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw( FoswikiFnTestCase );
 
 sub TRACE { return 0; }
@@ -59,4 +59,20 @@ sub test_isValidTopicName_Aa_onlywikiname {
     return;
 }
 
+sub test_guessLibDir {
+    my $this = shift;
+
+    local $ENV{FOSWIKI_LIBS};
+
+    my ( $v, $d, $f ) = File::Spec->splitpath(__FILE__);
+    my $updir = File::Spec->updir;
+    my @d     = File::Spec->splitdir($d);
+    splice( @d, -3, 2, 'lib' );
+    my $myguess =
+      File::Spec->canonpath(
+        File::Spec->catpath( $v, File::Spec->catdir(@d), '' ) );
+    my $libDir = Foswiki::guessLibDir;
+    $this->assert_equals( $myguess, $libDir );
+}
+
 1;