Changeset 13791 for trunk/UnitTestContrib/test/unit/CacheTests.pm

Timestamp:

01/23/12 06:00:05 (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...

File:

• trunk/UnitTestContrib/test/unit/CacheTests.pm (modified) (9 diffs)

trunk/UnitTestContrib/test/unit/CacheTests.pm

@@ -1 +1 @@
 package CacheTests;
+use strict;
+use warnings;
 
-use FoswikiFnTestCase;
+use FoswikiFnTestCase();
 our @ISA = qw( FoswikiFnTestCase );
 
-use strict;
-use Foswiki;
-use Foswiki::Meta;
+use Foswiki();
+use Foswiki::Meta();
+use File::Spec();
+use Foswiki::OopsException();
+use Foswiki::PageCache();
 use Error qw( :try );
-use Foswiki::OopsException;
-use Foswiki::PageCache;
 use Benchmark qw(:hireswallclock);
 
@@ -17 +19 @@
     my $this = shift;
     my @page;
+
     foreach my $dir (@INC) {
-        if ( opendir( D, "$dir/Foswiki/Cache" ) ) {
-            foreach my $alg ( readdir D ) {
+        if ( opendir( my $D, File::Spec->catdir( $dir, 'Foswiki', 'Cache' ) ) )
+        {
+            foreach my $alg ( readdir $D ) {
                 next unless $alg =~ s/^(.*)\.pm$/$1/;
-                next if defined &$alg;
+                next if defined &{$alg};
                 $ENV{PATH} =~ /^(.*)$/ms;
-                $ENV{PATH} = $1;
+                local $ENV{PATH} = $1;
                 ($alg) = $alg =~ /^(.*)$/ms;
-                eval "require Foswiki::Cache::$alg";
-                if ($@) {
-                    print STDERR
-"Cannot test Foswiki::Cache::$alg\nCompilation error when trying to 'require' it\n";
-                }
-                else {
+
+                if ( eval "require Foswiki::Cache::$alg; 1;" ) {
                     no strict 'refs';
-                    *$alg = sub {
+                    *{$alg} = sub {
                         my $this = shift;
                         $Foswiki::cfg{CacheManager} = 'Foswiki::Cache::' . $alg;
@@ -39 +39 @@
                     push( @page, $alg );
                 }
+                else {
+                    print STDERR
+"Cannot test Foswiki::Cache::$alg\nCompilation error when trying to 'require' it\n";
+                }
             }
-            closedir(D);
+            closedir($D);
         }
     }
@@ -50 +54 @@
 sub DBFileMeta {
     $Foswiki::cfg{MetaCacheManager} = 'Foswiki::Cache::DB_File';
+
+    return;
 }
 
 sub BDBMeta {
     $Foswiki::cfg{MetaCacheManager} = 'Foswiki::Cache::BDB';
+
+    return;
 }
 
@@ -59 +67 @@
     $Foswiki::cfg{HttpCompress} = 1;
     $Foswiki::cfg{Cache}{Compress} = 1;
+
+    return;
 }
 
@@ -64 +74 @@
     $Foswiki::cfg{HttpCompress} = 0;
     $Foswiki::cfg{Cache}{Compress} = 0;
+
+    return;
 }
 
@@ -90 +102 @@
     $Foswiki::cfg{Cache}{Compress} = 0;
     $UI_FN ||= $this->getUIFn('view');
-}
 
-sub tear_down {
-    my $this = shift;
-    $this->SUPER::tear_down();
+    return;
 }
 
@@ -102 +111 @@
     $UI_FN ||= $this->getUIFn('view');
 
-    my $query = new Unit::Request( { skin => ['none'], } );
+    my $query = Unit::Request->new( { skin => ['none'], } );
     $query->path_info("/");
     $query->method('POST');
 
-    my $fatwilly = new Foswiki( $this->{test_user_login}, $query );
+    $this->createNewFoswikiSession( $this->{test_user_login}, $query );
 
     # This first request should *not* be satisfied from the cache, but
     # the cache should be populated with the result.
-    my $p1start = new Benchmark();
+    my $p1start = Benchmark->new();
     my ($one) = $this->capture(
         sub {
             no strict 'refs';
-            &$UI_FN($fatwilly);
+            &{$UI_FN}( $this->{session} );
             use strict 'refs';
-            $Foswiki::engine->finalize( $fatwilly->{response},
-                $fatwilly->{request} );
+            $Foswiki::engine->finalize( $this->{session}{response},
+                $this->{session}{request} );
         }
     );
 
-    my $p1end = new Benchmark();
+    my $p1end = Benchmark->new();
     print STDERR "R1 " . timestr( timediff( $p1end, $p1start ) ) . "\n";
-    $fatwilly->finish();
 
-    $fatwilly = new Foswiki( $this->{test_user_login}, $query );
+    $this->createNewFoswikiSession( $this->{test_user_login}, $query );
 
     # This second request should be satisfied from the cache
-    my $p2start = new Benchmark();
+    my $p2start = Benchmark->new();
     my ($two) = $this->capture(
         sub {
             no strict 'refs';
-            &$UI_FN($fatwilly);
+            &{$UI_FN}( $this->{session} );
             use strict 'refs';
-            $Foswiki::engine->finalize( $fatwilly->{response},
-                $fatwilly->{request} );
+            $Foswiki::engine->finalize( $this->{session}{response},
+                $this->{session}{request} );
         }
     );
-    my $p2end = new Benchmark();
+    my $p2end = Benchmark->new();
     print STDERR "R2 " . timestr( timediff( $p2end, $p2start ) ) . "\n";
-    $fatwilly->finish();
 
     # Massage the HTML for comparison
@@ -164 +171 @@
 
     $this->assert_html_equals( $one, $two );
+
+    return;
 }