Item13897: Getting rid of ->finish() calls.

foswiki · Mar 7, 2016 · dae8e37 · dae8e37
1 parent 250991f
commit dae8e37
Show file tree

Hide file tree

Showing 39 changed files with 351 additions and 466 deletions.
diff --git a/UnitTestContrib/test/unit/ExtensionInstallerTests.pm b/UnitTestContrib/test/unit/ExtensionInstallerTests.pm
@@ -73,16 +73,16 @@ around set_up => sub {
     $this->createNewFoswikiSession( $this->user );
     $this->test_web('Testsystemweb1234');
     my $webObject = $this->populateNewWeb( $this->test_web );
-    $webObject->finish();
+    undef $webObject;
     $this->trash_web('Testtrashweb1234');
     $webObject = $this->populateNewWeb( $this->trash_web );
-    $webObject->finish();
+    undef $webObject;
     $this->sandbox_web('Testsandboxweb1234');
     $webObject = $this->populateNewWeb( $this->sandbox_web );
-    $webObject->finish();
+    undef $webObject;
     $this->sandbox_subweb('Testsandboxweb1234/Subweb');
     $webObject = $this->populateNewWeb( $this->sandbox_subweb );
-    $webObject->finish();
+    undef $webObject;
     $this->tempdir( $Foswiki::cfg{TempfileDir} . '/test_ConfigureTests' );
     rmtree( $this->tempdir )
       if ( -e $this->tempdir );    # Cleanup any old tests
@@ -966,7 +966,7 @@ sub test_Package_makeBackup {
         notes => $this->toolsdir . "/shbtest2"
     );
 
-    $pkg->finish();
+    undef $pkg;
 
     return;
 }
@@ -1225,7 +1225,6 @@ DONE
     $this->assert_matches(
         qr/Foswiki::Plugins::TriggerSyntaxError.*-- syntax error/ms, $missing );
 
-    $pkg->finish();
     undef $pkg;
 
 }
@@ -1267,7 +1266,6 @@ DONE
     $this->sniff();
     $this->assert( $pkg->uninstall($reporter) );
     $this->sniff();
-    $pkg->finish();
     undef $pkg;
 
     #
@@ -1353,7 +1351,6 @@ DONE
         '#! /usr/bin/perl'
     );
 
-    $pkg->finish();
     undef $pkg;
 
     # Clean out and restart the reporter
@@ -1541,7 +1538,6 @@ qr/^Foswiki::Contrib::OptionalDependency version >=14754 required(.*)[- ]+perl m
         notes => $this->toolsdir . "/shbtest2",
     );
 
-    $pkg2->finish();
     undef $pkg2;
 
     eval { rmtree($tempdir) };
@@ -1579,7 +1575,6 @@ DONE
 
     $this->assert( $pkg->uninstall($reporter) );
     $this->sniff();
-    $pkg->finish();
     undef $pkg;
 
     #
@@ -1667,7 +1662,6 @@ qr/Foswiki::Plugins::RequiredTriggeredModule version >=0.1 required[- ]+perl mod
         warnings => "htmldoc is type 'c', and cannot be automatically checked."
     );
 
-    $pkg->finish();
     undef $pkg;
 
     eval { rmtree($tempdir) };
@@ -1912,7 +1906,6 @@ sub test_Package_loadInstaller {
 
     $this->assert_str_equals( '1', $plugins{EmptyPlugin},
         'Failed to discover plugin in manifest' );
-    $pkg->finish();
     undef $pkg;
 
     return;
@@ -2012,7 +2005,6 @@ DONE
     $this->sniff( errors => 'Failed to unpack archive(.*)MyPlugin.tgz' );
 
     unlink $tempdir . "/MyPlugin.tgz";
-    $pkg->finish();
     undef $pkg;
 
     return;
@@ -2072,7 +2064,6 @@ DONE
     $this->assert( !$pkg->install($reporter) );
     $this->sniff( errors => '(format error|unzip failed|Unpack failed)' );
     unlink $tempdir . "/MyPlugin.zip";
-    $pkg->finish();
     undef $pkg;
 
     return;

diff --git a/UnitTestContrib/test/unit/Fn_FORMAT.pm b/UnitTestContrib/test/unit/Fn_FORMAT.pm
@@ -231,7 +231,6 @@ HERE
         }
     );
     $topicObject->save();
-    $topicObject->finish();
 }
 
 sub test_same_topic_listed_twice {
@@ -357,7 +356,7 @@ sub test_formatOfLinks {
 Apache is the [[http://www.apache.org/httpd/][well known web server]].
 HERE
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
 
     my $result =
       $this->test_topicObject->expandMacros(

diff --git a/UnitTestContrib/test/unit/Fn_FORMFIELD.pm b/UnitTestContrib/test/unit/Fn_FORMFIELD.pm
@@ -37,7 +37,7 @@ sub _createTopic {
 | Summary | textarea | 100 |
 FORM
     $formTopicObject->save();
-    $formTopicObject->finish();
+    undef $formTopicObject;
 
     $topicObject->put( 'FORM', { name => 'TestForm' } );
     $topicObject->putKeyed( 'FIELD',
@@ -170,7 +170,7 @@ sub test_FORMFIELD_topic {
     $result = $topicObject->expandMacros(
         '%FORMFIELD{"Marjorie" topic="' . $this->test_topic . '"}%' );
     $this->assert_str_equals( '99', $result );
-    $topicObject->finish;
+    undef $topicObject;
     ($topicObject) = Foswiki::Func::readTopic( $Foswiki::cfg{SystemWebName},
         $Foswiki::cfg{HomeTopicName} );
     $result = $topicObject->expandMacros(
@@ -182,7 +182,6 @@ sub test_FORMFIELD_topic {
           . $this->test_topic
           . '"}%' );
     $this->assert_str_equals( '99', $result );
-    $topicObject->finish;
 }
 
 # web="..."
@@ -192,7 +191,7 @@ sub test_FORMFIELD_web {
     # create other web
     $this->other_web( $this->test_web . "other" );
     my $webObject = $this->populateNewWeb( $this->other_web );
-    $webObject->finish();
+    undef $webObject;
     my ($topicObject) =
       Foswiki::Func::readTopic( $this->other_web, $this->test_topic );
     $this->_createTopic( $this->other_web, $topicObject );

diff --git a/UnitTestContrib/test/unit/Fn_GROUPINFO.pm b/UnitTestContrib/test/unit/Fn_GROUPINFO.pm
@@ -28,49 +28,48 @@ around set_up => sub {
       Foswiki::Func::readTopic( $this->users_web, "GropeGroup" );
     $topicObject->text("   * Set GROUP = ScumBag,WikiGuest\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) = Foswiki::Func::readTopic( $this->users_web, "PopGroup" );
     $topicObject->text("   * Set GROUP = WikiGuest\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "NobodyGroup" );
     $topicObject->text("   * Set GROUP = \n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "NestingGroup" );
     $topicObject->text("   * Set GROUP = GropeGroup\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "OnlyAdminCanChangeGroup" );
     $topicObject->text(
         "   * Set GROUP = WikiGuest\n   * Set TOPICCHANGE = AdminGroup\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "GroupWithHiddenGroup" );
     $topicObject->text("   * Set GROUP = HiddenGroup,WikiGuest\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "HiddenGroup" );
     $topicObject->text(
         "   * Set GROUP = ScumBag\n   * Set ALLOWTOPICVIEW = AdminUser\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "HiddenUserGroup" );
     $topicObject->text("   * Set GROUP = ScumBag,HidemeGood\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) = Foswiki::Func::readTopic( $this->users_web, "HidemeGood" );
     my $topText = $topicObject->text();
     $topText .= "   * Set ALLOWTOPICVIEW = AdminUser\n";
     $topText = $topicObject->text($topText);
     $topicObject->save();
-    $topicObject->finish();
 };
 
 sub test_basic {
@@ -226,7 +225,7 @@ sub test_expandHiddenUserAsAdmin {
     my $this = shift;
 
     $this->createNewFoswikiSession( $Foswiki::cfg{AdminUserLogin} );
-    $this->test_topicObject->finish if $this->test_topicObject;
+    $this->clear_test_topicObject;
     $this->test_topicObject(
         Foswiki::Func::readTopic( $this->test_web, $this->test_topic ) );
     $this->test_topicObject->text("BLEEGLE\n");
@@ -240,7 +239,7 @@ sub test_expandHiddenUserAsAdmin {
     $this->assert_matches( qr/$users_web.HidemeGood/, $ui );
     my @u = split( /,/, $ui );
     $this->assert_equals( 2, scalar(@u) );
-    $this->test_topicObject->finish;
+    $this->clear_test_topicObject;
 
     return;
 }

diff --git a/UnitTestContrib/test/unit/Fn_GROUPS.pm b/UnitTestContrib/test/unit/Fn_GROUPS.pm
@@ -23,37 +23,36 @@ around set_up => sub {
       Foswiki::Func::readTopic( $this->users_web, "GropeGroup" );
     $topicObject->text("   * Set GROUP = ScumBag,WikiGuest\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
 
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "NestingGroup" );
     $topicObject->text("   * Set GROUP = GropeGroup\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "GroupWithHiddenGroup" );
     $topicObject->text("   * Set GROUP = HiddenGroup,WikiGuest\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "HiddenGroup" );
     $topicObject->text(
         "   * Set GROUP = ScumBag\n   * Set ALLOWTOPICVIEW = AdminUser\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
 
     ($topicObject) =
       Foswiki::Func::readTopic( $this->users_web, "HiddenUserGroup" );
     $topicObject->text("   * Set GROUP = ScumBag,HidemeGood\n");
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
 
     ($topicObject) = Foswiki::Func::readTopic( $this->users_web, "HidemeGood" );
     my $topText = $topicObject->text();
     $topText .= "   * Set ALLOWTOPICVIEW = AdminUser\n";
     $topText = $topicObject->text($topText);
     $topicObject->save();
-    $topicObject->finish();
 
 };
 

diff --git a/UnitTestContrib/test/unit/Fn_IF.pm b/UnitTestContrib/test/unit/Fn_IF.pm
@@ -1316,14 +1316,13 @@ sub set_up {
           . Foswiki::Func::getWikiName( $this->session->user )
           . "\n" );
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
 
     # Create WebHome topic to trap existance errors related to
     # normalizeWebTopicName
     ($topicObject) = Foswiki::Func::readTopic( $this->test_web, "WebHome" );
     $topicObject->text("Gormless gimboid\n");
     $topicObject->save();
-    $topicObject->finish();
 
     return;
 }
@@ -1374,7 +1373,7 @@ two %IF{ "$ NAME='%NAME%'" then="1" else="0" }%
 three %IF{ "$ NAME=$ 'NAME{}'" then="1" else="0" }%
 SMELL
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     my $text = <<'PONG';
 %INCLUDE{"DeadHerring" NAME="Red" warn="on"}%
 PONG
@@ -1419,7 +1418,7 @@ one %IF{ "BleaghForm.Wibble='Woo'" then="1" else="0" }%
 %META:FIELD{name="Wibble" title="Wobble" value="Woo"}%
 SMELL
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     my $text = <<'PONG';
 %INCLUDE{"DeadHerring" NAME="Red" warn="on"}%
 PONG
@@ -1438,7 +1437,7 @@ sub test_ALLOWS_and_EXISTS {
    * Set ALLOWTOPICCHANGE = $wn
 PONG
     $meta->save();
-    $meta->finish();
+    undef $meta;
 
     my @tests;
     push(
@@ -1587,7 +1586,7 @@ PONG
         $this->assert_str_equals( $test->{expect}, $result,
             "$text: '$result'" );
     }
-    $meta->finish();
+    undef $meta;
 
     return;
 }
@@ -1601,7 +1600,7 @@ PONG
       Foswiki::Func::readTopic( $this->test_web, $this->test_topic );
     $topicObject->text($text);
     $topicObject->save();
-    $topicObject->finish();
+    undef $topicObject;
     my $result = $this->test_topicObject->expandMacros($text);
     $this->assert_str_equals( "   * Set LOOP = pong\n", $result );
 
@@ -1618,7 +1617,7 @@ sub test_TOPICINFO {
 oneapeny twoapenny we all fall down
 PONG
     $meta->save();
-    $meta->finish();
+    undef $meta;
 
     ($meta) = Foswiki::Func::readTopic( $this->test_web, $topicName );
     $meta->getRevisionInfo();
@@ -1689,7 +1688,7 @@ PONG
         $this->assert_str_equals( $test->{expect}, $result,
             "$text: '$result'" );
     }
-    $meta->finish();
+    undef $meta;
 
     return;
 }

diff --git a/UnitTestContrib/test/unit/Fn_INCLUDE.pm b/UnitTestContrib/test/unit/Fn_INCLUDE.pm
@@ -26,7 +26,6 @@ around set_up => sub {
     $orig->( $this, @_ );
     $this->other_web( $this->test_web . "other" );
     my $webObject = $this->populateNewWeb( $this->other_web );
-    $webObject->finish();
 };
 
 around tear_down => sub {