Changeset 13794 for branches/Release01x01/UnitTestContrib/test/unit/Fn_IF.pm

Timestamp:

01/23/12 07:00:46 (4 months ago)

Author:

PaulHarvey

Message:

Item11431: Clean UnitTests of Foswiki->new/finish

Committing what was 96 commits rebased on top of Foswikirev:13781. You
can view this full commit history at
 https://github.com/csirac2/UnitTestContrib/commits/Item11431-rebased

Tackling memory leaks, this effort seems to have saved 300MB and 10
minutes from the cost of running a full FoswikiSuite.

The recipe was:

• Find and remove all Foswiki->new/finish calls with $this->createNewFoswikiSession()
• Generally removed $fatwilly variables and replaced with $this->{session}, to avoid references to ->finish()'d Foswiki singleton/session objects
• Addressed perlcriticisms in touched files
• Convert Foswiki::Meta->new/load to Foswiki::Func::readTopic, for the sake of store2 re-integration
• Call $topicObject->finish() where/whenever we can

Some of the tests in the default plugins need a little work, and
there's some uncommitted stuff against core lib/Foswiki.pm to help
assert SINGLE_SINGLETONS from Foswiki::new/::finish subs, we'll get
to that later...

Conflicts:

test/unit/AddressTests.pm
test/unit/AdminOnlyAccessControlTests.pm
test/unit/Fn_SEARCH.pm

File:

• branches/Release01x01/UnitTestContrib/test/unit/Fn_IF.pm (modified) (150 diffs)

branches/Release01x01/UnitTestContrib/test/unit/Fn_IF.pm

@@ -2 +2 @@
 
 package Fn_IF;
-
 use strict;
-
-use FoswikiFnTestCase;
+use warnings;
+
+use FoswikiFnTestCase();
 our @ISA = qw( FoswikiFnTestCase );
 
-use Foswiki;
+use Foswiki();
 use Error qw( :try );
 use Assert;
@@ -17 +17 @@
 
 sub new {
-    my $self = shift()->SUPER::new( 'IF', @_ );
-    my $dep = new Foswiki::Configure::Dependency(
+    my ( $class, @args ) = @_;
+    my $dep = Foswiki::Configure::Dependency->new(
         type    => "perl",
         module  => "Foswiki",
@@ -24 +24 @@
     );
     ( $post11, my $message ) = $dep->check();
-    return $self;
+
+    return $class->SUPER::new( 'IF', @args );
 }
 
@@ -30 +31 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='B'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -35 +38 @@
     my $this = shift;
     $this->simpleTest( test => "'A'!='B'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -40 +45 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='A'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -45 +52 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='B'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -50 +59 @@
     my $this = shift;
     $this->simpleTest( test => 'context test', then => 1, else => 0 );
+
+    return;
 }
 
@@ -55 +66 @@
     my $this = shift;
     $this->simpleTest( test => 'context \'test\'', then => 1, else => 0 );
+
+    return;
 }
 
@@ -60 +73 @@
     my $this = shift;
     $this->simpleTest( test => "{Fnargle}='Fleeble'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -65 +80 @@
     my $this = shift;
     $this->simpleTest( test => "{A}{B}='C'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -75 +92 @@
         else => 0
     );
+
+    return;
 }
 
@@ -85 +104 @@
         else => 0
     );
+
+    return;
 }
 
@@ -92 +113 @@
 
     # See test_96* for other 'defined' tests
+
+    return;
 }
 
@@ -141 +164 @@
         else => 1
     );
+
+    return;
 }
 
@@ -146 +171 @@
     my $this = shift;
     $this->simpleTest( test => '0>1', then => 0, else => 1 );
+
+    return;
 }
 
@@ -151 +178 @@
     my $this = shift;
     $this->simpleTest( test => '1>0', then => 1, else => 0 );
+
+    return;
 }
 
@@ -156 +185 @@
     my $this = shift;
     $this->simpleTest( test => '1<0', then => 0, else => 1 );
+
+    return;
 }
 
@@ -161 +192 @@
     my $this = shift;
     $this->simpleTest( test => '0<1', then => 1, else => 0 );
+
+    return;
 }
 
@@ -166 +199 @@
     my $this = shift;
     $this->simpleTest( test => "0>=\t1", then => 0, else => 1 );
+
+    return;
 }
 
@@ -171 +206 @@
     my $this = shift;
     $this->simpleTest( test => '1>=0', then => 1, else => 0 );
+
+    return;
 }
 
@@ -176 +213 @@
     my $this = shift;
     $this->simpleTest( test => '1>=1', then => 1, else => 0 );
+
+    return;
 }
 
@@ -181 +220 @@
     my $this = shift;
     $this->simpleTest( test => '1<=0', then => 0, else => 1 );
+
+    return;
 }
 
@@ -186 +227 @@
     my $this = shift;
     $this->simpleTest( test => '0<=1', then => 1, else => 0 );
+
+    return;
 }
 
@@ -191 +234 @@
     my $this = shift;
     $this->simpleTest( test => '1<=1', then => 1, else => 0 );
+
+    return;
 }
 
@@ -196 +241 @@
     my $this = shift;
     $this->simpleTest( test => "not 'A'='B'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -201 +248 @@
     my $this = shift;
     $this->simpleTest( test => "not NOT 'A'='B'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -206 +255 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='A' AND 'B'='B'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -211 +262 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='A' and 'B'='B'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -216 +269 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='A' and 'B'='B'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -225 +280 @@
         else => 0
     );
+
+    return;
 }
 
@@ -230 +287 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='B' or 'B'='B'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -235 +294 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='A' or 'B'='A'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -240 +301 @@
     my $this = shift;
     $this->simpleTest( test => "'A'='B' or 'B'='A'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -249 +312 @@
         else => 0
     );
+
+    return;
 }
 
@@ -258 +323 @@
         else => 0
     );
+
+    return;
 }
 
@@ -263 +330 @@
     my $this = shift;
     $this->simpleTest( test => "'A'~'B'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -268 +337 @@
     my $this = shift;
     $this->simpleTest( test => "'ABLABA'~'*B?AB*'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -273 +344 @@
     my $this = shift;
     $this->simpleTest( test => '\"BABBA\"~\"*BB?\"', then => 1, else => 0 );
+
+    return;
 }
 
@@ -278 +351 @@
     my $this = shift;
     $this->simpleTest( test => "lc('FRED')='fred'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -283 +358 @@
     my $this = shift;
     $this->simpleTest( test => "('FRED')=uc 'fred'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -293 +370 @@
         else => 0
     );
+
+    return;
 }
 
@@ -302 +381 @@
         else => 1
     );
+
+    return;
 }
 
@@ -307 +388 @@
     my $this = shift;
     $this->simpleTest( test => "1 = 1 > 0", then => 1, else => 0 );
+
+    return;
 }
 
@@ -312 +395 @@
     my $this = shift;
     $this->simpleTest( test => "1 > 1 = 0", then => 1, else => 0 );
+
+    return;
 }
 
@@ -317 +402 @@
     my $this = shift;
     $this->simpleTest( test => "not 1 = 2", then => 1, else => 0 );
+
+    return;
 }
 
@@ -322 +409 @@
     my $this = shift;
     $this->simpleTest( test => "not not 1 and 1", then => 1, else => 0 );
+
+    return;
 }
 
@@ -327 +416 @@
     my $this = shift;
     $this->simpleTest( test => "0 or not not 1 and 1", then => 1, else => 0 );
+
+    return;
 }
 
@@ -339 +430 @@
         else => 1
     );
+
+    return;
 }
 
@@ -352 +445 @@
         else => 1
     );
+
+    return;
 }
 
@@ -361 +456 @@
         else => 1
     );
+
+    return;
 }
 
@@ -373 +470 @@
         else => 1
     );
+
+    return;
 }
 
@@ -386 +485 @@
         else => 1
     );
+
+    return;
 }
 
@@ -397 +498 @@
         else => 1
     );
+
+    return;
 }
 
@@ -411 +514 @@
         else => 1
     );
+
+    return;
 }
 
@@ -422 +527 @@
         else => 1
     );
+
+    return;
 }
 
@@ -433 +540 @@
         else => 1
     );
+
+    return;
 }
 
@@ -447 +556 @@
         else => 0
     );
+
+    return;
 }
 
@@ -458 +569 @@
         else => 0
     );
+
+    return;
 }
 
@@ -470 +583 @@
         else => 1
     );
+
+    return;
 }
 
@@ -479 +594 @@
         else => 1
     );
+
+    return;
 }
 
@@ -488 +605 @@
         else => 1
     );
+
+    return;
 }
 
@@ -497 +616 @@
         else => 1
     );
+
+    return;
 }
 
@@ -506 +627 @@
         else => 0
     );
+
+    return;
 }
 
@@ -515 +638 @@
         else => 1
     );
+
+    return;
 }
 
@@ -525 +650 @@
         else => 1
     );
+
+    return;
 }
 
@@ -535 +662 @@
         else => 1
     );
+
+    return;
 }
 
@@ -544 +673 @@
         else => 0
     );
+
+    return;
 }
 
@@ -553 +684 @@
         else => 1
     );
+
+    return;
 }
 
@@ -563 +696 @@
         else => 1
     );
+
+    return;
 }
 
@@ -573 +708 @@
         else => 1
     );
+
+    return;
 }
 
@@ -582 +719 @@
         else => 0
     );
+
+    return;
 }
 
@@ -591 +730 @@
         else => 1
     );
+
+    return;
 }
 
@@ -601 +742 @@
         else => 1
     );
+
+    return;
 }
 
@@ -611 +754 @@
         else => 1
     );
+
+    return;
 }
 
@@ -620 +765 @@
         else => 0
     );
+
+    return;
 }
 
@@ -631 +778 @@
         else => 1
     );
+
+    return;
 }
 
@@ -642 +791 @@
         else => 1
     );
+
+    return;
 }
 
@@ -654 +805 @@
         else => 1
     );
+
+    return;
 }
 
@@ -665 +818 @@
         else => 0
     );
+
+    return;
 }
 
@@ -676 +831 @@
         else => 1
     );
+
+    return;
 }
 
@@ -687 +844 @@
         else => 1
     );
+
+    return;
 }
 
@@ -699 +858 @@
         else => 0
     );
+
+    return;
 }
 
@@ -710 +871 @@
         else => 1
     );
+
+    return;
 }
 
@@ -721 +884 @@
         else => 1
     );
+
+    return;
 }
 
@@ -732 +897 @@
         else => 1
     );
+
+    return;
 }
 
@@ -744 +911 @@
         else => 1
     );
+
+    return;
 }
 
@@ -753 +922 @@
         else => 0
     );
+
+    return;
 }
 
@@ -762 +933 @@
         else => 1
     );
+
+    return;
 }
 
@@ -773 +946 @@
         else => 1
     );
+
+    return;
 }
 
@@ -785 +960 @@
         else => 0
     );
+
+    return;
 }
 
@@ -794 +971 @@
         else => 1
     );
+
+    return;
 }
 
@@ -803 +982 @@
         else => 1
     );
+
+    return;
 }
 
@@ -814 +995 @@
         else => 1
     );
+
+    return;
 }
 
@@ -826 +1009 @@
         else => 1
     );
+
+    return;
 }
 
@@ -837 +1022 @@
         else => 0
     );
+
+    return;
 }
 
@@ -846 +1033 @@
         else => 1
     );
+
+    return;
 }
 
@@ -857 +1046 @@
         else => 1
     );
+
+    return;
 }
 
@@ -869 +1060 @@
         else => 0
     );
+
+    return;
 }
 
@@ -878 +1071 @@
         else => 1
     );
+
+    return;
 }
 
@@ -887 +1082 @@
         else => 1
     );
+
+    return;
 }
 
@@ -898 +1095 @@
         else => 1
     );
+
+    return;
 }
 
@@ -910 +1109 @@
         else => 1
     );
+
+    return;
 }
 
@@ -921 +1122 @@
         else => 0
     );
+
+    return;
 }
 
@@ -926 +1129 @@
     my $this = shift;
     $this->simpleTest( test => "isweb 'System'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -931 +1136 @@
     my $this = shift;
     $this->simpleTest( test => "isweb 'Not a web'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -936 +1143 @@
     my $this = shift;
     $this->simpleTest( test => "istopic \$'System'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -941 +1150 @@
     my $this = shift;
     $this->simpleTest( test => "istopic \$'Not a web'", then => 0, else => 1 );
+
+    return;
 }
 
@@ -950 +1161 @@
         else => 1
     );
+
+    return;
 }
 
@@ -959 +1172 @@
         else => 1
     );
+
+    return;
 }
 
@@ -968 +1183 @@
         else => 1
     );
+
+    return;
 }
 
@@ -977 +1194 @@
         else => 1
     );
+
+    return;
 }
 
@@ -982 +1201 @@
     my $this = shift;
     $this->simpleTest( test => "isweb \$ 'SYSTEMWEB'", then => 1, else => 0 );
+
+    return;
 }
 
@@ -987 +1208 @@
     my $this = shift;
     $this->simpleTest( test => 'defined \'SYSTEMWEB\'', then => 1, else => 0 );
+
+    return;
 }
 
@@ -994 +1217 @@
 
     # see also test_9 and test_96*
+
+    return;
 }
 
@@ -999 +1224 @@
     my $this = shift;
     $this->simpleTest( test => 'defined( SYSTEMWEB )', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1004 +1231 @@
     my $this = shift;
     $this->simpleTest( test => "defined( 'SYSTEMWEB' )", then => 1, else => 0 );
+
+    return;
 }
 
@@ -1009 +1238 @@
     my $this = shift;
     $this->simpleTest( test => 'defined( UNDEF )', then => 0, else => 1 );
+
+    return;
 }
 
@@ -1014 +1245 @@
     my $this = shift;
     $this->simpleTest( test => "defined( 'UNDEF' )", then => 0, else => 1 );
+
+    return;
 }
 
@@ -1019 +1252 @@
     my $this = shift;
     $this->simpleTest( test => 'defined \'IF\'', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1024 +1259 @@
     my $this = shift;
     $this->simpleTest( test => 'defined IF', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1039 +1276 @@
         #print STDERR "catched error ".shift."\n";
     };
+
+    return;
 }
 
@@ -1045 +1284 @@
     $this->SUPER::set_up(@_);
 
-    my $topicObject = Foswiki::Meta->new(
-        $this->{session},
-        $this->{users_web},
-        "GropeGroup",
-        "   * Set GROUP = "
-          . Foswiki::Func::getWikiName( $this->{session}->{user} ) . "\n"
-    );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{users_web}, "GropeGroup" );
+    $topicObject->text( "   * Set GROUP = "
+          . Foswiki::Func::getWikiName( $this->{session}->{user} )
+          . "\n" );
     $topicObject->save();
+    $topicObject->finish();
 
     # Create WebHome topic to trap existance errors related to
     # normalizeWebTopicName
-    $topicObject = Foswiki::Meta->new(
-        $this->{session}, $this->{test_web},
-        "WebHome",        "Gormless gimboid\n"
-    );
+    ($topicObject) = Foswiki::Func::readTopic( $this->{test_web}, "WebHome" );
+    $topicObject->text("Gormless gimboid\n");
     $topicObject->save();
+    $topicObject->finish();
+
+    return;
 }
 
@@ -1090 +1329 @@
     #print STDERR "$text => $result\n";
     $this->assert_equals( '1', $result, $text . " => " . $result );
+
+    return;
 }
 
@@ -1095 +1336 @@
     my $this = shift;
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, "DeadHerring",
-        <<'SMELL');
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, "DeadHerring" );
+    $topicObject->text( <<'SMELL');
 one %IF{ "defined NAME" then="1" else="0" }%
 two %IF{ "$ NAME='%NAME%'" then="1" else="0" }%
@@ -1103 +1344 @@
 SMELL
     $topicObject->save();
+    $topicObject->finish();
     my $text = <<'PONG';
 %INCLUDE{"DeadHerring" NAME="Red" warn="on"}%
@@ -1108 +1350 @@
     my $result = $this->{test_topicObject}->expandMacros($text);
     $this->assert_matches( qr/^\s*one 1\s+two 1\s+three 1\s*$/s, $result );
+
+    return;
 }
 
@@ -1130 +1374 @@
         $this->assert_str_equals( $test->{expect}, $result );
     }
+
+    return;
 }
 
@@ -1135 +1381 @@
     my $this = shift;
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, "DeadHerring",
-        <<'SMELL');
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, "DeadHerring" );
+    $topicObject->text( <<'SMELL');
 one %IF{ "BleaghForm.Wibble='Woo'" then="1" else="0" }%
 %META:FORM{name="BleaghForm"}%
@@ -1143 +1389 @@
 SMELL
     $topicObject->save();
+    $topicObject->finish();
     my $text = <<'PONG';
 %INCLUDE{"DeadHerring" NAME="Red" warn="on"}%
@@ -1148 +1395 @@
     my $result = $this->{test_topicObject}->expandMacros($text);
     $this->assert_matches( qr/^\s*one 1\s*$/s, $result );
+
+    return;
 }
 
@@ -1153 +1402 @@
     my $this = shift;
     my $wn   = Foswiki::Func::getWikiName( $this->{session}->{user} );
-    my $meta =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, "DeadDog",
-        <<PONG);
+    my ($meta) = Foswiki::Func::readTopic( $this->{test_web}, "DeadDog" );
+    $meta->text( <<"PONG");
    * Set ALLOWTOPICVIEW = WibbleFloon
    * Set ALLOWTOPICCHANGE = $wn
 PONG
     $meta->save();
+    $meta->finish();
 
     my @tests;
@@ -1297 +1546 @@
         }
     );
-    $this->{session}->finish();
-    my $request = new Unit::Request( {} );
+    my $request = Unit::Request->new( {} );
     $request->path_info("/$this->{test_web}/$this->{test_topic}");
-    $this->{session} = new Foswiki( undef, $request );
-    $meta =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        $this->{test_topic} );
+    $this->createNewFoswikiSession( undef, $request );
+    ($meta) =
+      Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} );
 
     foreach my $test (@tests) {
@@ -1311 +1558 @@
             "$text: '$result'" );
     }
+    $meta->finish();
+
+    return;
 }
 
@@ -1318 +1568 @@
    * Set LOOP = %IF{"$ LOOP = '1'" then="ping" else="pong"}%
 PONG
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        $this->{test_topic}, $text );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} );
+    $topicObject->text($text);
     $topicObject->save();
+    $topicObject->finish();
     my $result = $this->{test_topicObject}->expandMacros($text);
     $this->assert_str_equals( "   * Set LOOP = pong\n", $result );
+
+    return;
 }
 
@@ -1331 +1584 @@
     my $topicName = 'TopicInfo';
 
-    my $meta =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, $topicName,
-        <<PONG);
+    my ($meta) = Foswiki::Func::readTopic( $this->{test_web}, $topicName );
+    $meta->text( <<'PONG');
 oneapeny twoapenny we all fall down
 PONG
     $meta->save();
-
-    $meta =
-      Foswiki::Meta->load( $this->{session}, $this->{test_web}, $topicName );
+    $meta->finish();
+
+    ($meta) = Foswiki::Func::readTopic( $this->{test_web}, $topicName );
     $meta->getRevisionInfo();
     my $ti = $meta->get('TOPICINFO');
@@ -1408 +1660 @@
             "$text: '$result'" );
     }
+    $meta->finish();
+
+    return;
 }
 
@@ -1413 +1668 @@
     my $this = shift;
     $this->simpleTest( test => 'isempty notthere', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1419 +1676 @@
     $this->simpleTest( test => 'defined empty', then => 1, else => 0 );
     $this->simpleTest( test => 'isempty empty', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1424 +1683 @@
     my $this = shift;
     $this->simpleTest( test => 'isempty notempty', then => 0, else => 1 );
+
+    return;
 }
 
@@ -1429 +1690 @@
     my $this = shift;
     $this->simpleTest( test => 'isempty NOTTHERE', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1435 +1698 @@
     $this->simpleTest( test => 'defined EMPTY', then => 1, else => 0 );
     $this->simpleTest( test => 'isempty EMPTY', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1440 +1705 @@
     my $this = shift;
     $this->simpleTest( test => 'isempty SNOTEMPTY', then => 0, else => 1 );
+
+    return;
 }
 
@@ -1445 +1712 @@
     my $this = shift;
     $this->simpleTest( test => 'isempty SNOTTHERE', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1451 +1720 @@
     $this->simpleTest( test => 'defined SEMPTY', then => 1, else => 0 );
     $this->simpleTest( test => 'isempty SEMPTY', then => 1, else => 0 );
+
+    return;
 }
 
@@ -1456 +1727 @@
     my $this = shift;
     $this->simpleTest( test => 'isempty NOTEMPTY', then => 0, else => 1 );
+
+    return;
 }
 
@@ -1461 +1734 @@
     my $this = shift;
     $this->simpleTest( test => "isempty ''", then => 1, else => 0 );
+
+    return;
 }
 
@@ -1466 +1741 @@
     my $this = shift;
     $this->simpleTest( test => "isempty undef", then => 1, else => 0 );
+
+    return;
 }
 
@@ -1695 +1972 @@
     );
 
+    return;
 }
 
@@ -1721 +1999 @@
     $this->simpleTest( test => "'0.0'", then => 1, else => 0 );
     $this->simpleTest( test => "''",    then => 0, else => 1 );
+
+    return;
 }