Changeset 5375

Timestamp:

10/25/09 07:49:40 (2 years ago)

Author:

SvenDowideit

Message:

Item2286: lots of missing calls to Foswiki::finish(), will refactor in trunk - just cleaning in release branch

Location:

branches/Release01x00

Files:

• MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm (modified) (1 diff)
• UnitTestContrib/lib/Unit/TestRunner.pm (modified) (3 diffs)
• UnitTestContrib/test/unit/AccessControlTests.pm (modified) (1 diff)
• UnitTestContrib/test/unit/ExceptionTests.pm (modified) (1 diff)
• UnitTestContrib/test/unit/FoswikiTestCase.pm (modified) (1 diff)
• UnitTestContrib/test/unit/RegisterTests.pm (modified) (1 diff)
• WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm (modified) (1 diff)
• WysiwygPlugin/test/unit/WysiwygPlugin/WysiwygPluginTests.pm (modified) (3 diffs)
• core/lib/Foswiki.pm (modified) (3 diffs)
• core/lib/Foswiki/Prefs/PrefsCache.pm (modified) (2 diffs)
• core/tools/extender.pl (modified) (1 diff)

branches/Release01x00/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm

@@ -73 +73 @@
     # Must create a new twiki to force re-registration of users
     $Foswiki::cfg{EnableEmail} = 1;
+    $this->{twiki}->finish();
     $this->{twiki} = new Foswiki();
     $this->{twiki}->net->setMailHandler( \&FoswikiFnTestCase::sentMail );

branches/Release01x00/UnitTestContrib/lib/Unit/TestRunner.pm

@@ -5 +5 @@
 use Devel::Symdump;
 use Error qw(:try);
+#use Devel::Leak::Object qw{ GLOBAL_bless };
+#$Devel::Leak::Object::TRACKSOURCELINES = 1;
 
 sub new {
@@ -101 +103 @@
             }
             foreach my $test (@tests) {
+                #Devel::Leak::Object::checkpoint();
                 print "\t$test\n";
                 $tester->set_up();
@@ -127 +130 @@
             }
         }
-    }
+   }
 
     if ( $this->{unexpected_failures} || $this->{unexpected_passes} ) {

branches/Release01x00/UnitTestContrib/test/unit/AccessControlTests.pm

@@ -26 +26 @@
     my $this = shift;
     $this->SUPER::set_up();
-    $this->{twiki} = new Foswiki();
 
     $currUser = $Foswiki::cfg{DefaultUserLogin};

branches/Release01x00/UnitTestContrib/test/unit/ExceptionTests.pm

@@ -108 +108 @@
     $this->assert_matches(qr/^the rat$/m, $output);
     $this->assert_matches(qr/^phlegm$/m, $output);
+    
+    $session->finish();
 }
 

branches/Release01x00/UnitTestContrib/test/unit/FoswikiTestCase.pm

@@ -159 +159 @@
         }
     }
+#    undef $this->{twiki};
 }
 

branches/Release01x00/UnitTestContrib/test/unit/RegisterTests.pm

@@ -789 +789 @@
                       });
     $query->path_info( "/$this->{users_web}/UserRegistration" );
+    $this->{twiki}->finish();
     $this->{twiki} = Foswiki->new($Foswiki::cfg{DefaultUserName}, $query);
     $this->{twiki}->net->setMailHandler(\&FoswikiFnTestCase::sentMail);

branches/Release01x00/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -2116 +2116 @@
     }
     $query->path_info("/Current/TestTopic");
+    $this->{session}->finish() if (defined($this->{session}));
     $this->{session} = new Foswiki( undef, $query );
     $Foswiki::Plugins::SESSION = $this->{session};

branches/Release01x00/WysiwygPlugin/test/unit/WysiwygPlugin/WysiwygPluginTests.pm

@@ -94 +94 @@
     $query->method('GET');
 
-    $Foswiki::Plugins::SESSION = new Foswiki( 'guest', $query );
+        $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki( 'guest', $query );
+    $Foswiki::Plugins::SESSION = $this->{twiki};
 
     # charset definition affects output, so it is a response method and
@@ -174 +176 @@
     $this->assert( $text eq $out,
         "'" . anal($out) . "' !=\n'" . anal($text) . "'" );
+    $foswiki->finish();
 }
 
@@ -226 +229 @@
     $this->assert_str_equals( $text, $out,
         "'" . anal($out) . "' !=\n'" . anal($text) . "'" );
+    $foswiki->finish();
 }
 

branches/Release01x00/core/lib/Foswiki.pm

@@ -1394 +1394 @@
     $query ||= new Foswiki::Request();
     my $this = bless( { sandbox => 'Foswiki::Sandbox' }, $class );
+
     $this->{request}  = $query;
     $this->{cgiQuery} = $query;    # for backwards compatibility in contribs
@@ -1766 +1767 @@
 =begin TML
 
+---++ ObjectMethod DESTROY()
+
+called by Perl when the Foswiki object goes out of scope
+(maybe should be used kist to ASSERT that finish() was called..
+
+=cut
+
+#sub DESTROY {
+#    my $this = shift;
+#    $this->finish();
+#}
+
+=begin TML
+
 ---++ ObjectMethod finish()
 Break circular references.
@@ -1779 +1794 @@
     $_->finish() foreach values %{ $this->{forms} };
     $this->{plugins}->finish()   if $this->{plugins};
+    undef $this->{plugins};
     $this->{users}->finish()     if $this->{users};
+    undef $this->{users};
     $this->{prefs}->finish()     if $this->{prefs};
+    undef $this->{prefs};
     $this->{templates}->finish() if $this->{templates};
+    undef $this->{templates};
     $this->{renderer}->finish()  if $this->{renderer};
+    undef $this->{renderer};
     $this->{net}->finish()       if $this->{net};
+    undef $this->{net};
     $this->{store}->finish()     if $this->{store};
+    undef $this->{store};
     $this->{search}->finish()    if $this->{search};
+    undef $this->{search};
     $this->{attach}->finish()    if $this->{attach};
+    undef $this->{attach};
     $this->{security}->finish()  if $this->{security};
+    undef $this->{security};
     $this->{i18n}->finish()      if $this->{i18n};
-
+    undef $this->{i18n};
+#TODO: the logger doesn't seem to have a finish...
+#    $this->{logger}->finish()      if $this->{logger};
+    undef $this->{logger};
+    
     undef $this->{_HTMLHEADERS};
     undef $this->{request};

branches/Release01x00/core/lib/Foswiki/Prefs/PrefsCache.pm

@@ -32 +32 @@
 require Foswiki::Prefs::Parser;
 
+#SMELL: I don't know why this is a global - and where it should be undef'd..
 use vars qw( $parser );
 
@@ -175 +176 @@
     }
 
-    my $parser = new Foswiki::Prefs::Parser();
+    $parser ||= new Foswiki::Prefs::Parser();
     $parser->parseText( $meta->text(), $this, '' );
     $parser->parseMeta( $meta, $this, '' );

branches/Release01x00/core/tools/extender.pl

@@ -124 +124 @@
     }
     &$check_perl_module('CPAN');
+    
+    $session->finish();
+    undef $session;
 }