From: Steve Hancock Date: Fri, 2 Oct 2020 13:49:59 +0000 (-0700) Subject: update test cases for braces X-Git-Tag: 20201001.01~31 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e2a021d67c9b4860ede8bb56ccb6b5bf2b56c896;p=perltidy.git update test cases for braces --- diff --git a/t/snippets/braces.in b/t/snippets/braces.in index 8b93c94a..61b94fa4 100644 --- a/t/snippets/braces.in +++ b/t/snippets/braces.in @@ -10,3 +10,39 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; diff --git a/t/snippets/braces7.par b/t/snippets/braces7.par new file mode 100644 index 00000000..db126511 --- /dev/null +++ b/t/snippets/braces7.par @@ -0,0 +1 @@ +-bli -blil='*' diff --git a/t/snippets/expect/braces.braces1 b/t/snippets/expect/braces.braces1 index 364230b1..a3f075a0 100644 --- a/t/snippets/expect/braces.braces1 +++ b/t/snippets/expect/braces.braces1 @@ -14,3 +14,46 @@ $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do +{ + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub + { + $ua->get( + '/' => sub + { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do +{ + sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try +{ + die; +} +catch +{ + die; +}; diff --git a/t/snippets/expect/braces.braces2 b/t/snippets/expect/braces.braces2 index c55b4c10..aa94cb7f 100644 --- a/t/snippets/expect/braces.braces2 +++ b/t/snippets/expect/braces.braces2 @@ -11,3 +11,39 @@ sub message $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; diff --git a/t/snippets/expect/braces.braces3 b/t/snippets/expect/braces.braces3 index 7e2286d5..426f6fc1 100644 --- a/t/snippets/expect/braces.braces3 +++ b/t/snippets/expect/braces.braces3 @@ -10,3 +10,42 @@ sub message $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do + { $error = $@; + $produced_error = 1; + }; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do + { sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } + }; + +try +{ + die; +} +catch +{ + die; +}; diff --git a/t/snippets/expect/braces.braces4 b/t/snippets/expect/braces.braces4 index d6e3cb28..36f3bb30 100644 --- a/t/snippets/expect/braces.braces4 +++ b/t/snippets/expect/braces.braces4 @@ -10,3 +10,40 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); + } + or do { + $error = $@; + $produced_error = 1; + }; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } + }; + +try { + die; + } +catch { + die; + }; diff --git a/t/snippets/expect/braces.braces5 b/t/snippets/expect/braces.braces5 index a384e8c1..db5633c7 100644 --- a/t/snippets/expect/braces.braces5 +++ b/t/snippets/expect/braces.braces5 @@ -13,3 +13,44 @@ sub message $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do +{ + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do +{ + sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try +{ + die; +} +catch +{ + die; +}; diff --git a/t/snippets/expect/braces.braces6 b/t/snippets/expect/braces.braces6 index f4876819..a03a762b 100644 --- a/t/snippets/expect/braces.braces6 +++ b/t/snippets/expect/braces.braces6 @@ -9,3 +9,38 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} catch { + die; +}; diff --git a/t/snippets/expect/braces.braces7 b/t/snippets/expect/braces.braces7 new file mode 100644 index 00000000..b5f81b14 --- /dev/null +++ b/t/snippets/expect/braces.braces7 @@ -0,0 +1,60 @@ +sub message + { + if ( !defined( $_[0] ) ) + { + print("Hello, World\n"); + } + else + { + print( $_[0], "\n" ); + } + } + +$myfun = sub + { + print("Hello, World\n"); + }; + +eval + { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); + } or do + { + $error = $@; + $produced_error = 1; + }; + +Mojo::IOLoop->next_tick( + sub + { + $ua->get( + '/' => sub + { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do + { + sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } + }; + +try + { + die; + } +catch + { + die; + }; diff --git a/t/snippets/expect/braces.def b/t/snippets/expect/braces.def index 8b93c94a..61b94fa4 100644 --- a/t/snippets/expect/braces.def +++ b/t/snippets/expect/braces.def @@ -10,3 +10,39 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; diff --git a/t/snippets/packing_list.txt b/t/snippets/packing_list.txt index 4b5dd44c..77ce0f80 100644 --- a/t/snippets/packing_list.txt +++ b/t/snippets/packing_list.txt @@ -416,3 +416,4 @@ ../snippets9.t rt98902.def ../snippets9.t rt98902.rt98902 ../snippets9.t rt99961.def +../snippets22.t braces.braces7 diff --git a/t/snippets18.t b/t/snippets18.t index 2679eb48..d60f26c6 100644 --- a/t/snippets18.t +++ b/t/snippets18.t @@ -78,6 +78,42 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; ---------- 'comments' => <<'----------', @@ -420,6 +456,49 @@ $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do +{ + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub + { + $ua->get( + '/' => sub + { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do +{ + sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try +{ + die; +} +catch +{ + die; +}; #5........... }, @@ -440,6 +519,42 @@ sub message $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; #6........... }, @@ -459,6 +574,45 @@ sub message $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do + { $error = $@; + $produced_error = 1; + }; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do + { sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } + }; + +try +{ + die; +} +catch +{ + die; +}; #7........... }, @@ -478,6 +632,42 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; #8........... }, diff --git a/t/snippets19.t b/t/snippets19.t index 50bd1c69..5740606f 100644 --- a/t/snippets19.t +++ b/t/snippets19.t @@ -88,6 +88,42 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; ---------- 'maths' => <<'----------', @@ -289,6 +325,43 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); + } + or do { + $error = $@; + $produced_error = 1; + }; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } + }; + +try { + die; + } +catch { + die; + }; #11........... }, @@ -377,6 +450,47 @@ sub message $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do +{ + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do +{ + sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try +{ + die; +} +catch +{ + die; +}; #17........... }, @@ -395,6 +509,41 @@ sub message { $myfun = sub { print("Hello, World\n"); }; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} catch { + die; +}; #18........... }, diff --git a/t/snippets22.t b/t/snippets22.t index 942240fb..fd5bf86a 100644 --- a/t/snippets22.t +++ b/t/snippets22.t @@ -7,6 +7,7 @@ #4 bbhb.def #5 bbhb.bbhb4 #6 bbhb.bbhb5 +#7 braces.braces7 # To locate test #13 you can search for its name or the string '#13' @@ -24,10 +25,13 @@ BEGIN { # BEGIN SECTION 1: Parameter combinations # ########################################### $rparams = { - 'bbhb2' => "-bbhb=2 -bbp=2", - 'bbhb3' => "-bbhb=3 -bbp=3", - 'bbhb4' => "-bbhb=3 -bbp=3 -bbhbi=2 -bbpi=2", - 'bbhb5' => "-bbhb=3 -bbp=3 -bbhbi=1 -bbpi=1", + 'bbhb2' => "-bbhb=2 -bbp=2", + 'bbhb3' => "-bbhb=3 -bbp=3", + 'bbhb4' => "-bbhb=3 -bbp=3 -bbhbi=2 -bbpi=2", + 'bbhb5' => "-bbhb=3 -bbp=3 -bbhbi=1 -bbpi=1", + 'braces7' => <<'----------', +-bli -blil='*' +---------- 'def' => "", 'here_long' => "-l=33", }; @@ -45,6 +49,57 @@ nested => { asdf => 456, yarg => 'yarp', }, ); +---------- + + 'braces' => <<'----------', +sub message { + if ( !defined( $_[0] ) ) { + print("Hello, World\n"); + } + else { + print( $_[0], "\n" ); + } +} + +$myfun = sub { + print("Hello, World\n"); +}; + +eval { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); +} or do { + $error = $@; + $produced_error = 1; +}; + +Mojo::IOLoop->next_tick( + sub { + $ua->get( + '/' => sub { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do { + sswitch( $words[ rand @words ] ) { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } +}; + +try { + die; +} +catch { + die; +}; ---------- 'here_long' => <<'----------', @@ -153,6 +208,73 @@ my %temp = ); #6........... }, + + 'braces.braces7' => { + source => "braces", + params => "braces7", + expect => <<'#7...........', +sub message + { + if ( !defined( $_[0] ) ) + { + print("Hello, World\n"); + } + else + { + print( $_[0], "\n" ); + } + } + +$myfun = sub + { + print("Hello, World\n"); + }; + +eval + { + my $app = App::perlbrew->new( "install-patchperl", "-q" ); + $app->run(); + } or do + { + $error = $@; + $produced_error = 1; + }; + +Mojo::IOLoop->next_tick( + sub + { + $ua->get( + '/' => sub + { + push @kept_alive, pop->kept_alive; + Mojo::IOLoop->next_tick( sub { Mojo::IOLoop->stop } ); + } + ); + } +); + +$r = do + { + sswitch( $words[ rand @words ] ) + { + case $words[0]: + case $words[1]: + case $words[2]: + case $words[3]: { 'ok' } + default: { 'wtf' } + } + }; + +try + { + die; + } +catch + { + die; + }; +#7........... + }, }; my $ntests = 0 + keys %{$rtests};