Changeset 13794 for branches/Release01x01/UnitTestContrib/test/unit/ClientTests.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/ClientTests.pm (modified) (13 diffs)

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

@@ +1 @@
+package ClientTests;
 use strict;
-
-package ClientTests;
+use warnings;
 
 # This is woefully incomplete, but it does at least check that
 # LoginManager.pm compiles okay.
 
-use FoswikiFnTestCase;
+use FoswikiFnTestCase();
 our @ISA = qw( FoswikiFnTestCase );
 
-use Unit::Request;
+use Foswiki();
+use Foswiki::LoginManager();
+use Unit::Request();
 use Error qw( :try );
-
-use Foswiki;
-use Foswiki::LoginManager;
 
 my $agent = $Foswiki::cfg{Register}{RegistrationAgentWikiName};
@@ -29 +28 @@
     my $topicObject = Foswiki::Meta->new(
         $this->{session},    $this->{test_web},
-        $this->{test_topic}, <<CONSTRAINT);
+        $this->{test_topic}, <<'CONSTRAINT');
    * Set ALLOWTOPICCHANGE = AdminGroup
 CONSTRAINT
     $topicObject->save();
+
+    return;
 }
 
 sub TemplateLoginManager {
     $Foswiki::cfg{LoginManager} = 'Foswiki::LoginManager::TemplateLogin';
+
+    return;
 }
 
 sub ApacheLoginManager {
     $Foswiki::cfg{LoginManager} = 'Foswiki::LoginManager::ApacheLogin';
+
+    return;
 }
 
 sub NoLoginManager {
     $Foswiki::cfg{LoginManager} = 'none';
+
+    return;
 }
 
@@ -51 +58 @@
     $Foswiki::cfg{UserMappingManager} = 'Foswiki::Users::BaseUserMapping';
     $this->set_up_for_verify();
+
+    return;
 }
 
@@ -57 +66 @@
     $Foswiki::cfg{UserMappingManager} = 'Foswiki::Users::TopicUserMapping';
     $this->set_up_for_verify();
+
+    return;
 }
 
@@ -70 +81 @@
     my $this = shift;
 
-    $this->{session}->finish() if $this->{session};
-    $this->{session} = new Foswiki( undef, new Unit::Request() );
+    $this->createNewFoswikiSession( undef, Unit::Request->new() );
     $this->assert( $Foswiki::cfg{TempfileDir}
           && -d $Foswiki::cfg{TempfileDir} );
@@ -80 +90 @@
     $Foswiki::cfg{Register}{EnableNewUserRegistration} = 1;
     $Foswiki::cfg{UsersWebName} = $this->{users_web};
+
+    return;
 }
 
@@ -101 +113 @@
 
 #print STDERR "\n------------- set_up_user (login: $userLogin) (cUID:$user_id) -----------------\n";
+
+    return;
 }
 
 sub capture {
-    my $this = shift;
-    my ( $proc, $session ) = @_;
+    my ( $this, $proc, $session, @args ) = @_;
     $session->getLoginManager()->checkAccess();
-    $this->SUPER::capture(@_);
+    $this->SUPER::capture( $proc, $session, @args );
+
+    return;
 }
 
@@ -118 +133 @@
 
     #close this Foswiki session - its using the wrong mapper and login
-    $this->{session}->finish();
-
-    $query = new Unit::Request();
+
+    $query = Unit::Request->new();
     $query->path_info("/$this->{test_web}/$this->{test_topic}");
-    $this->{session} = new Foswiki( undef, $query );
+    $this->createNewFoswikiSession( undef, $query );
 
     $this->set_up_user();
@@ -135 +149 @@
     };
 
-    $query = new Unit::Request();
+    $query = Unit::Request->new();
     $query->path_info("/$this->{test_web}/$this->{test_topic}?breaklock=1");
-    $this->{session}->finish();
-
-    $this->{session} = new Foswiki( undef, $query );
+
+    $this->createNewFoswikiSession( undef, $query );
 
     try {
@@ -156 +169 @@
     };
 
-    $query = new Unit::Request();
+    $query = Unit::Request->new();
     $query->path_info("/$this->{test_web}/$this->{test_topic}");
-    $this->{session}->finish();
 
     $this->annotate("new session using $userLogin\n");
 
-    $this->{session} = new Foswiki( $userLogin, $query );
+    $this->createNewFoswikiSession( $userLogin, $query );
 
 #clear the lease - one of the previous tests may have different usermapper & thus different user
     Foswiki::Func::setTopicEditLock( $this->{test_web}, $this->{test_topic},
         0 );
+
+    return;
 }
 
@@ -175 +189 @@
         return;
     }
-    $this->{session}->finish();
     my $secret = "a big mole on my left buttock";
     my $crypted = crypt( $secret, "12" );
     $Foswiki::cfg{Password} = $crypted;
 
-    my $query = new Unit::Request(
+    my $query = Unit::Request->new(
         {
             username => [ $Foswiki::cfg{AdminUserLogin} ],
@@ -190 +203 @@
     $query->path_info("/$this->{test_web}/$this->{test_topic}");
 
-    $this->{session} = new Foswiki( undef, $query );
+    $this->createNewFoswikiSession( undef, $query );
     $this->{session}->getLoginManager()->login( $query, $this->{session} );
     my $script = $Foswiki::cfg{LoginManager} =~ /Apache/ ? 'viewauth' : 'view';
@@ -199 +212 @@
     $this->assert_matches( qr/^$surly/,
         $this->{session}->{response}->headers()->{Location} );
+
+    return;
 }