Changeset 13791 for trunk/UnitTestContrib/test/unit/ConfigureTests.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/ConfigureTests.pm (modified) (3 diffs)

trunk/UnitTestContrib/test/unit/ConfigureTests.pm

@@ -4 +4 @@
 use warnings;
 
-use FoswikiTestCase;
+use FoswikiTestCase();
 our @ISA = qw( FoswikiTestCase );
 
 use Error qw( :try );
-use File::Temp;
+use File::Temp();
 use FindBin;
 use File::Path qw(mkpath rmtree);
@@ -32 +32 @@
     $root =~ s|\\|/|g;
 
-    $this->{rootdir}  = $root;
-    $this->{user}     = $Foswiki::cfg{AdminUserLogin};
-    $this->{session}  = Foswiki->new( $this->{user} );
+    $this->{rootdir} = $root;
+    $this->{user}    = $Foswiki::cfg{AdminUserLogin};
+    $this->createNewFoswikiSession( $this->{user} );
     $this->{test_web} = 'Testsystemweb1234';
     my $webObject = Foswiki::Meta->new( $this->{session}, $this->{test_web} );
     $webObject->populateNewWeb();
+    $webObject->finish();
     $this->{trash_web} = 'Testtrashweb1234';
     $webObject = Foswiki::Meta->new( $this->{session}, $this->{trash_web} );
     $webObject->populateNewWeb();
+    $webObject->finish();
     $this->{sandbox_web} = 'Testsandboxweb1234';
     $webObject = Foswiki::Meta->new( $this->{session}, $this->{sandbox_web} );
     $webObject->populateNewWeb();
+    $webObject->finish();
     $this->{sandbox_subweb} = 'Testsandboxweb1234/Subweb';
     $webObject =
       Foswiki::Meta->new( $this->{session}, $this->{sandbox_subweb} );
     $webObject->populateNewWeb();
+    $webObject->finish();
     $this->{tempdir} = $Foswiki::cfg{TempfileDir} . '/test_ConfigureTests';
     rmtree( $this->{tempdir} )
@@ -1926 +1930 @@
     my ( $result, $err ) = $pkg->loadInstaller();
 
-    my $expected = <<HERE;
+    my $expected = <<'HERE';
 I can't download http://foswiki.org/pub/Extensions/EmptyPluginx/EmptyPluginx_installer because of the following error:
 Not Found