Issue #447: Don't complain about '0', which is a valid random string.

Additionally check that the generated string is a scalar
RotherOSS · Sep 25, 2020 · 40c061c · 40c061c
1 parent a571760
commit 40c061c
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/scripts/test/Main.t b/scripts/test/Main.t
@@ -716,67 +716,64 @@ for my $Test (@Tests) {
 # Generate Random string tests
 {
     my $Token  = $MainObject->GenerateRandomString();
-    my $Length = length($Token);
     my $Desc   = 'no args';
 
+    # '0' is acceptable of For Length =>1, '00' is true already
     $Self->True(
-        $Token,
+        ( ($Token eq '0' || $Token) && ref $Token eq '' ),
         "GenerateRandomString - $Desc - generated",
     );
 
     $Self->Is(
-        $Length,
+        length $Token,
         16,
         "GenerateRandomString - $Desc - standard size is 16",
     );
 }
 
 {
     my $Token  = $MainObject->GenerateRandomString( Length => 0 );
-    my $Length = length($Token);
     my $Desc   = 'Length 0';
 
     $Self->True(
-        $Token,
+        ( ($Token eq '0' || $Token) && ref $Token eq '' ),
         "GenerateRandomString - $Desc - generated",
     );
 
     $Self->Is(
-        $Length,
+        length $Token,
         16,
         "GenerateRandomString - $Desc - standard size is 16",
     );
 }
 
 {
     my $Token  = $MainObject->GenerateRandomString( Length => 1 );
-    my $Length = length($Token);
     my $Desc   = 'Length 1';
 
     $Self->True(
-        $Token,
+        ( ($Token eq '0' || $Token) && ref $Token eq '' ),
         "GenerateRandomString - $Desc - generated",
     );
 
     $Self->Is(
-        $Length,
+        length $Token,
         1,
         "GenerateRandomString - $Desc - size is 1",
     );
 }
 
 {
     my $Token  = $MainObject->GenerateRandomString( Length => 8 );
-    my $Length = length $Token;
     my $Desc   = 'Length 8';
 
     $Self->True(
-        $Token,
+        ( ($Token eq '0' || $Token) && ref $Token eq '' ),
         "GenerateRandomString - $Desc - generated",
     );
 
     $Self->Is(
-        $Length,
+        length $Token,
         8,
         "GenerateRandomString - $Desc - size is 8",
     );