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

trunk/UnitTestContrib/test/unit/ExceptionTests.pm

@@ -1 +1 @@
 package ExceptionTests;
-use FoswikiFnTestCase;
+use strict;
+use warnings;
+
+use FoswikiFnTestCase();
 our @ISA = qw( FoswikiFnTestCase );
 
-use strict;
-
 use Error qw( :try );
-use Foswiki::OopsException;
-use Foswiki::AccessControlException;
+use Foswiki::OopsException();
+use Foswiki::AccessControlException();
 
 my $UI_FN;
@@ -15 +16 @@
     $this->SUPER::set_up();
     $UI_FN ||= $this->getUIFn('oops');
+
+    return;
 }
 
@@ -44 +47 @@
         );
     };
+
+    return;
 }
 
@@ -70 +75 @@
         );
     };
+
+    return;
 }
 
 sub upchuck {
     my $session = shift;
-    my $e       = new Foswiki::OopsException(
+    my $e       = Foswiki::OopsException->new(
         'templatename',
         web    => 'webname',
@@ -81 +88 @@
     );
     $e->redirect($session);
+
+    return;
 }
 
@@ -86 +95 @@
 sub deprecated_test_redirectOopsException {
     my $this = shift;
-    my $t    = new Foswiki();
-    my ($output) = $this->capture( \&upchuck, $t );
-    $t->finish();
+    $this->createNewFoswikiSession();
+    my ($output) = $this->capture( \&upchuck, $this->{session} );
     $this->assert_matches( qr/^Status: 302.*$/m, $output );
     $this->assert_matches(
@@ -94 +102 @@
         $output
     );
+
+    return;
 }
 
 sub test_AccessControlException {
     my $this = shift;
-    my $ace  = new Foswiki::AccessControlException( 'FRY', 'burger', 'Spiders',
+    my $ace  = Foswiki::AccessControlException->new( 'FRY', 'burger', 'Spiders',
         'FlumpNuts', 'Because it was there.' );
     $this->assert_str_equals(
@@ -105 +115 @@
     );
 
+    return;
 }
 
 sub test_oopsScript {
     my $this  = shift;
-    my $query = new Unit::Request(
+    my $query = Unit::Request->new(
         {
             skin     => 'none',
@@ -121 +132 @@
         }
     );
-    my $session = new Foswiki( undef, $query );
+    $this->createNewFoswikiSession( undef, $query );
     my ($output) =
-      $this->capture( $UI_FN, $session, "Flum", "DeDum", $query, 0 );
+      $this->capture( $UI_FN, $this->{session}, "Flum", "DeDum", $query, 0 );
     $this->assert_matches( qr/^phlegm$/m,           $output );
     $this->assert_matches( qr/^<pus>$/m,    $output );
@@ -132 +143 @@
     $this->assert_matches( qr/^phlegm$/m,           $output );
 
-    $session->finish();
+    return;
 }