Item11135: TwikiCompatibilityPlugin Foswiki::Meta purge

git-svn-id: http://svn.foswiki.org/branches/Release01x01@13966 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 12, 2012 · dea92ef · dea92ef
1 parent 676248f
commit dea92ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/TWikiCompatibilityPlugin/lib/TWiki/Meta.pm b/TWikiCompatibilityPlugin/lib/TWiki/Meta.pm
@@ -4,7 +4,7 @@ package TWiki::Meta;
 use strict;
 use warnings;
 
-use Foswiki::Meta;
+use Foswiki::Meta();
 
 sub new {
     shift;

diff --git a/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiFuncTests.pm b/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiFuncTests.pm
@@ -26,8 +26,8 @@ sub set_up {
     $this->SUPER::set_up();
     $this->{tmpdatafile} = $TWiki::cfg{TempfileDir} . '/tmpity-tmp.gif';
     $this->{test_web2}   = $this->{test_web} . 'Extra';
-    my $webObject = Foswiki::Meta->new( $this->{session}, $this->{test_web2} );
-    $webObject->populateNewWeb();
+    my $webObject = $this->populateNewWeb( $this->{test_web2} );
+    $webObject->finish();
 
     return;
 }
@@ -571,8 +571,7 @@ END
     $this->assert($access);
 
     # make sure meta overrides text, as documented - Item2953
-    my $meta =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, $topic );
+    my ($meta) = $this->getUnloadedTopicObject( $this->{test_web}, $topic );
     $meta->putKeyed(
         'PREFERENCE',
         {
@@ -590,7 +589,8 @@ END
         $topic, $this->{test_web}, $meta
     );
     $this->assert($access);
-    $meta = Foswiki::Meta->new( $this->{session}, $this->{test_web}, $topic );
+    $meta->finish();
+    ($meta) = Foswiki::Func::readTopic( $this->{test_web}, $topic );
     $meta->putKeyed(
         'PREFERENCE',
         {
@@ -607,6 +607,7 @@ END
         "   * Set ALLOWTOPICVIEW = $TWiki::cfg{DefaultUserWikiName}\n",
         $topic, $this->{test_web}, $meta
     );
+    $meta->finish();
     $this->assert( !$access );
     $this->createNewFoswikiSession();
 
@@ -646,8 +647,7 @@ END
     $this->assert($access);
 
     # make sure meta overrides text, as documented - Item2953
-    my $meta =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, $topic );
+    my ($meta) = $this->getUnloadedTopicObject( $this->{test_web}, $topic );
     $meta->putKeyed(
         'PREFERENCE',
         {
@@ -665,7 +665,8 @@ END
         $topic, $this->{test_web}, $meta
     );
     $this->assert($access);
-    $meta = Foswiki::Meta->new( $this->{session}, $this->{test_web}, $topic );
+    $meta->finish();
+    ($meta) = Foswiki::Func::readTopic( $this->{test_web}, $topic );
     $meta->putKeyed(
         'PREFERENCE',
         {
@@ -683,6 +684,7 @@ END
         $topic, $this->{test_web}, $meta
     );
     $this->assert( !$access );
+    $meta->finish();
 
     return;
 }