Changeset 13843 for branches/Release01x01/UnitTestContrib/test/unit/Fn_SEARCH.pm

Timestamp:

01/27/12 06:20:36 (4 months ago)

Author:

PaulHarvey

Message:

Item11456: Remove Foswiki::Address from Fn_SEARCH

File:

• branches/Release01x01/UnitTestContrib/test/unit/Fn_SEARCH.pm (modified) (2 diffs)

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

@@ -21 +21 @@
 our @ISA = qw( FoswikiFnTestCase );
 
+use Assert;
 use Foswiki();
-use Error qw( :try );
-use Assert;
-use English qw( -no_match_vars );
+use Foswiki::Func();
 use Foswiki::Search();
 use Foswiki::Search::InfoCache();
+use English qw( -no_match_vars );
+use Error qw( :try );
 
 use File::Spec qw(case_tolerant)
@@ -5920 +5921 @@
     $this->createNewFoswikiSession( $Foswiki::cfg{AdminUserLogin}, $query );
     $this->assert_str_equals( $this->{test_web}, $this->{session}->{webName} );
-    require Foswiki::Address;
     while ( my ( $fwaddress, $metatext ) = each %topics ) {
-        my $addrObj = Foswiki::Address->new( string => $fwaddress );
+        my ( $web, $topic ) =
+          Foswiki::Func::normalizeWebTopicName( '', $fwaddress );
         my $topicObj;
 
-        if ( not Foswiki::Func::webExists( $addrObj->web() ) ) {
+        if ( not Foswiki::Func::webExists($web) ) {
             my @webs;
 
-            foreach my $part ( @{ $addrObj->webpath() } ) {
-                my $web;
+            foreach my $part ( split( /\//, $web ) ) {
+                my $w;
 
                 push( @webs, $part );
-                $web = join( '/', @webs );
-                if ( not Foswiki::Func::webExists($web) ) {
-                    Foswiki::Func::createWeb( $web, '_default' );
+                $w = join( '/', @webs );
+                if ( not Foswiki::Func::webExists($w) ) {
+                    Foswiki::Func::createWeb( $w, '_default' );
                 }
             }
         }
-        ($topicObj) =
-          Foswiki::Func::readTopic( $addrObj->web(), $addrObj->topic() );
+        ($topicObj) = Foswiki::Func::readTopic( $web, $topic );
         $topicObj->text($metatext);
         $topicObj->save();