Changeset 13835

Timestamp:

01/27/12 04:43:16 (4 weeks ago)

Author:

PaulHarvey

Message:

Item11456: Finally, sync Fn_SEARCH

File:

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

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

@@ -1 +1 @@
 # tests for the correct expansion of SEARCH
 # SMELL: this test is pathetic, becase SEARCH has dozens of untested modes
-
+#
+# In order to keep this test down to a manageable run time, the fixture
+# groups are only applied to those tests where we are testing the correct
+# parsing of the search expression and its correct application in searching.
+# Where we are primarily testing formatting and pagination, we keep the
+# test out of the fixture groups on the assumption that all search and
+# query algorithms output is formatted by the same code.
+#
+# NOTE: When developing, or after modifying search or query algorithms,
+# you are highly recommended to run this suite with the "test" functions
+# converted to "verify" - just in case!
+#
 package Fn_SEARCH;
 
@@ -7 +18 @@
 use warnings;
 
-use FoswikiFnTestCase;
+use FoswikiFnTestCase();
 our @ISA = qw( FoswikiFnTestCase );
 
-use Foswiki;
+use Foswiki();
 use Error qw( :try );
 use Assert;
-use Foswiki::Search;
-use Foswiki::Search::InfoCache;
-use Foswiki::Render;
+use English qw( -no_match_vars );
+use Foswiki::Search();
+use Foswiki::Search::InfoCache();
 
 use File::Spec qw(case_tolerant)
@@ -21 +32 @@
 
 sub new {
-    my $self = shift()->SUPER::new( 'SEARCH', @_ );
+    my ( $class, @args ) = @_;
+    my $self = $class->SUPER::new( 'SEARCH', @args );
+
     return $self;
 }
@@ -34 +47 @@
 
 sub set_up {
-    my $this = shift;
-
-    $this->SUPER::set_up();
-
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'OkTopic',
-        "BLEEGLE blah/matchme.blah" );
-    $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'OkATopic',
-        "BLEEGLE dontmatchme.blah" );
-    $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'OkBTopic',
-        "BLEEGLE dont.matchmeblah" );
-    $topicObject->save();
+    my ($this) = shift;
+    $this->SUPER::set_up(@_);
+
+    my $timestamp = time();
+
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'OkTopic' );
+    $topicObject->text("BLEEGLE blah/matchme.blah");
+    $topicObject->save( forcedate => $timestamp + 120 );
+    $topicObject->finish();
+    ($topicObject) = Foswiki::Func::readTopic( $this->{test_web}, 'OkATopic' );
+    $topicObject->text("BLEEGLE dontmatchme.blah");
+    $topicObject->save( forcedate => $timestamp + 240 );
+    $topicObject->finish();
+    ($topicObject) = Foswiki::Func::readTopic( $this->{test_web}, 'OkBTopic' );
+    $topicObject->text("BLEEGLE dont.matchmeblah");
+    $topicObject->save( forcedate => $timestamp + 480 );
+    $topicObject->finish();
+
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'InvisibleTopic' );
+    $topicObject->text("BLEEGLE dont.matchmeblah");
+    $topicObject->putKeyed( 'PREFERENCE',
+        { name => 'ALLOWTOPICVIEW', value => 'OnlySuperman' } );
+    $topicObject->save( forcedate => $timestamp + 480 );
+    $topicObject->finish();
+
+    return;
 }
 
@@ -60 +85 @@
                 next unless $alg =~ /^(.*)\.pm$/;
                 $alg = $1;
-                if ( $^O eq 'MSWin32' ) {
-
-                   #skip forking search for now, its extremely broken on windows
-                    next if ( $alg eq 'Forking' );
-                }
+
+                # skip forking search for now, its extremely broken
+                # on windows
+                next if ( $^O eq 'MSWin32' && $alg eq 'Forking' );
                 $salgs{$alg} = 1;
             }
@@ -82 +106 @@
         my $fn = $alg . 'Search';
         push( @groups, $fn );
-        next if ( defined(&$fn) );
-        eval <<SUB;
+        next if ( defined( &{$fn} ) );
+        if ( not eval <<"SUB" or $EVAL_ERROR ) {
 sub $fn {
-require Foswiki::Store::SearchAlgorithms::$alg;
-\$Foswiki::cfg{Store}{SearchAlgorithm} = 'Foswiki::Store::SearchAlgorithms::$alg'; }
+    require Foswiki::Store::SearchAlgorithms::$alg;
+    \$Foswiki::cfg{Store}{SearchAlgorithm} = 'Foswiki::Store::SearchAlgorithms::$alg';
+}
+1;
 SUB
-        die $@ if $@;
+            die $EVAL_ERROR;
+        }
     }
     foreach my $alg ( keys %qalgs ) {
@@ -94 +121 @@
         push( @groups, $fn );
         next if ( defined(&$fn) );
-        eval <<SUB;
+        if ( not eval <<"SUB" or $EVAL_ERROR ) {
 sub $fn {
-require Foswiki::Store::QueryAlgorithms::$alg;
-\$Foswiki::cfg{Store}{QueryAlgorithm} = 'Foswiki::Store::QueryAlgorithms::$alg'; }
+    require Foswiki::Store::QueryAlgorithms::$alg;
+    \$Foswiki::cfg{Store}{QueryAlgorithm} = 'Foswiki::Store::QueryAlgorithms::$alg';
+}
+1;
 SUB
-        die $@ if $@;
+            die $EVAL_ERROR;
+        }
     }
 
-    return \@groups;
+    return ( \@groups );
 }
 
 sub loadExtraConfig {
+    my ( $this, $context, @args ) = @_;    # the Test::Unit::TestCase object
+
+    $this->SUPER::loadExtraConfig( $context, @args );
+
+#turn on the MongoDBPlugin so that the saved data goes into mongoDB
+#This is temoprary until Crawford and I cna find a way to push dependencies into unit tests
+    if (   ( $Foswiki::cfg{Store}{SearchAlgorithm} =~ /MongoDB/ )
+        or ( $Foswiki::cfg{Store}{QueryAlgorithm} =~ /MongoDB/ )
+        or ( $context =~ /MongoDB/ ) )
+    {
+        $Foswiki::cfg{Plugins}{MongoDBPlugin}{Module} =
+          'Foswiki::Plugins::MongoDBPlugin';
+        $Foswiki::cfg{Plugins}{MongoDBPlugin}{Enabled}             = 1;
+        $Foswiki::cfg{Plugins}{MongoDBPlugin}{EnableOnSaveUpdates} = 1;
+
+#push(@{$Foswiki::cfg{Store}{Listeners}}, 'Foswiki::Plugins::MongoDBPlugin::Listener');
+        $Foswiki::cfg{Store}{Listeners}
+          {'Foswiki::Plugins::MongoDBPlugin::Listener'} = 1;
+        require Foswiki::Plugins::MongoDBPlugin;
+        Foswiki::Plugins::MongoDBPlugin::getMongoDB()
+          ->remove( $this->{test_web}, 'current',
+            { '_web' => $this->{test_web} } );
+    }
+
+    return;
+}
+
+sub tear_down {
     my $this = shift;    # the Test::Unit::TestCase object
-    $this->SUPER::loadExtraConfig();
+
+    $this->SUPER::tear_down(@_);
+
+    #need to clear the web every test?
+    if (   ( $Foswiki::cfg{Store}{SearchAlgorithm} =~ /MongoDB/ )
+        or ( $Foswiki::cfg{Store}{QueryAlgorithm} =~ /MongoDB/ ) )
+    {
+        require Foswiki::Plugins::MongoDBPlugin;
+        Foswiki::Plugins::MongoDBPlugin::getMongoDB()
+          ->remove( $this->{test_web}, 'current',
+            { '_web' => $this->{test_web} } );
+    }
+
+    return;
 }
 
@@ -121 +192 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -131 +204 @@
 
     $this->assert_str_equals( '', $result );
+
+    return;
 }
 
@@ -145 +220 @@
     $this->assert_does_not_match( qr/OkBTopic/, $result );
     $this->assert_does_not_match( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -160 +237 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -173 +252 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -188 +269 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -203 +286 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -220 +305 @@
     # 'blah' is in OkATopic, but not as a word
     $this->assert_does_not_match( qr/OkBTopic/, $result, $result );
+
+    return;
 }
 
@@ -225 +312 @@
     my $this = shift;
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'VirtualBeer',
-        "There are alot of Virtual Beers to go around" );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'VirtualBeer' );
+    $topicObject->text("There are alot of Virtual Beers to go around");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'RealBeer',
-        "There are alot of Virtual Beer to go around" );
+    $topicObject->finish();
+    ($topicObject) = Foswiki::Func::readTopic( $this->{test_web}, 'RealBeer' );
+    $topicObject->text("There are alot of Virtual Beer to go around");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'FamouslyBeered',
-        "Virtually speaking there could be alot of famous Beers" );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'FamouslyBeered' );
+    $topicObject->text(
+        "Virtually speaking there could be alot of famous Beers");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'VirtualLife',
-        "In a all life, I would expect to find fine Beer" );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'VirtualLife' );
+    $topicObject->text("In a all life, I would expect to find fine Beer");
     $topicObject->save();
+    $topicObject->finish();
 
     my $result =
@@ -247 +338 @@
       );
 
-    my $expected = <<EXPECT;
+    my $expected = <<'EXPECT';
 RealBeer
 VirtualBeer
@@ -253 +344 @@
 EXPECT
     $this->assert_str_equals( $expected, $result . "\n" );
+
+    return;
 }
 
@@ -258 +351 @@
     my $this = shift;
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'VirtualBeer',
-        "There are alot of Virtual Beers to go around" );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'VirtualBeer' );
+    $topicObject->text("There are alot of Virtual Beers to go around");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'RealBeer',
-        "There are alot of Virtual Beer to go around" );
+    $topicObject->finish();
+    ($topicObject) = Foswiki::Func::readTopic( $this->{test_web}, 'RealBeer' );
+    $topicObject->text("There are alot of Virtual Beer to go around");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'FamouslyBeered',
-        "Virtually speaking there could be alot of famous Beers" );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'FamouslyBeered' );
+    $topicObject->text(
+        "Virtually speaking there could be alot of famous Beers");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'VirtualLife',
-        "In a all life, I would expect to find fine Beer" );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'VirtualLife' );
+    $topicObject->text("In a all life, I would expect to find fine Beer");
     $topicObject->save();
+    $topicObject->finish();
 
     my $result =
@@ -280 +377 @@
       );
 
-    my $expected = <<EXPECT;
+    my $expected = <<'EXPECT';
 FamouslyBeered
 RealBeer
@@ -287 +384 @@
 EXPECT
     $this->assert_str_equals( $expected, $result . "\n" );
+
+    return;
 }
 
@@ -292 +391 @@
     my $this = shift;
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'VirtualBeer',
-        "There are alot of Virtual Beers to go around" );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'VirtualBeer' );
+    $topicObject->text("There are alot of Virtual Beers to go around");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'RealBeer',
-        "There are alot of Virtual Beer to go around" );
+    $topicObject->finish();
+    ($topicObject) = Foswiki::Func::readTopic( $this->{test_web}, 'RealBeer' );
+    $topicObject->text("There are alot of Virtual Beer to go around");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'FamouslyBeered',
-        "Virtually speaking there could be alot of famous Beers" );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'FamouslyBeered' );
+    $topicObject->text(
+        "Virtually speaking there could be alot of famous Beers");
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'VirtualLife',
-        "In a all life, I would expect to find fine Beer" );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'VirtualLife' );
+    $topicObject->text("In a all life, I would expect to find fine Beer");
     $topicObject->save();
+    $topicObject->finish();
 
     my $result =
@@ -314 +417 @@
       );
 
-    my $expected = <<EXPECT;
+    my $expected = <<'EXPECT';
 RealBeer
 VirtualBeer
 EXPECT
     $this->assert_str_equals( $expected, $result . "\n" );
-}
+
+    return;
+}
+
+sub _expect_with_deps {
+    my ( $this, $default, %expectations ) = @_;
+    my @deps = sort( keys %expectations );
+    my $expected;
+    my $checking = 1;
+
+    while ( $checking && scalar(@deps) ) {
+        my $dep = shift(@deps);
+
+        if ( $this->check_dependency($dep) ) {
+            $expected = $expectations{$dep};
+            $checking = 0;
+        }
+    }
+    if ($checking) {
+        $expected = $default;
+    }
+
+    return $expected;
+}
+
+# Verify that the default result orering is independent of the web= and
+# topic= parameters
+sub verify_default_alpha_order_query {
+    my $this   = shift;
+    my $result = $this->{test_topicObject}->expandMacros(
+        '%SEARCH{
+                "1" 
+                type="query"
+                web="System,Main,Sandbox"
+                topic="WebSearch,WebHome,WebPreferences"
+                nonoise="on" 
+                format="$web.$topic"
+        }%'
+    );
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Main.WebHome
+Main.WebPreferences
+Main.WebSearch
+Sandbox.WebHome
+Sandbox.WebPreferences
+Sandbox.WebSearch
+System.WebHome
+System.WebPreferences
+System.WebSearch
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
+System.WebHome
+System.WebPreferences
+System.WebSearch
+Main.WebHome
+Main.WebPreferences
+Main.WebSearch
+Sandbox.WebHome
+Sandbox.WebPreferences
+Sandbox.WebSearch
+FOSWIKI11
+    $expected =~ s/\n$//s;
+    $this->assert_str_equals( $expected, $result );
+
+    return;
+}
+
+sub verify_default_alpha_order_search {
+    my $this   = shift;
+    my $result = $this->{test_topicObject}->expandMacros(
+        '%SEARCH{
+                "." 
+                type="regex"
+                web="System,Main,Sandbox"
+                topic="WebSearch,WebHome,WebPreferences"
+                nonoise="on" 
+                format="$web.$topic"
+        }%'
+    );
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Main.WebHome
+Main.WebPreferences
+Main.WebSearch
+Sandbox.WebHome
+Sandbox.WebPreferences
+Sandbox.WebSearch
+System.WebHome
+System.WebPreferences
+System.WebSearch
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
+System.WebHome
+System.WebPreferences
+System.WebSearch
+Main.WebHome
+Main.WebPreferences
+Main.WebSearch
+Sandbox.WebHome
+Sandbox.WebPreferences
+Sandbox.WebSearch
+FOSWIKI11
+    $expected =~ s/\n$//s;
+    $this->assert_str_equals( $expected, $result );
+
+    return;
+}
+
 #####################
 sub _septic {
@@ -333 +544 @@
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
+
+    return;
 }
 
 #####################
 
-sub verify_no_header_no_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_septic( 0, 0, undef, 1, <<EXPECT);
+sub test_no_header_no_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_septic( 0, 0, undef, 1, <<'EXPECT');
 OkATopic
 OkBTopic
 OkTopic
 EXPECT
-}
-
-sub verify_no_header_no_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_septic( 0, 0, undef, 0, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_no_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_septic( 0, 0, undef, 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_no_header_no_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_septic( 0, 0, "", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_no_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_septic( 0, 0, "", 1, <<'EXPECT');
 OkATopicOkBTopicOkTopic
 EXPECT
-}
-
-sub verify_no_header_no_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_septic( 0, 0, "", 0, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_no_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_septic( 0, 0, "", 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_no_header_no_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_septic( 0, 0, ",", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_no_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_septic( 0, 0, ",", 1, <<'EXPECT');
 OkATopic,OkBTopic,OkTopic
 EXPECT
-}
-
-sub verify_no_header_no_footer_with_nl_separator_with_results {
-    my $this = shift;
-    $this->_septic( 0, 0, '$n', 1, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_no_footer_with_nl_separator_with_results {
+    my $this = shift;
+    $this->_septic( 0, 0, '$n', 1, <<'EXPECT');
 OkATopic
 OkBTopic
 OkTopic
 EXPECT
-}
-
-sub verify_no_header_no_footer_with_separator_no_results {
-    my $this = shift;
-    $this->_septic( 0, 0, ",", 0, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_no_footer_with_separator_no_results {
+    my $this = shift;
+    $this->_septic( 0, 0, ",", 0, <<'EXPECT');
 EXPECT
+
+    return;
 }
 #####################
 
-sub verify_no_header_with_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_septic( 0, 1, undef, 1, <<EXPECT);
+sub test_no_header_with_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_septic( 0, 1, undef, 1, <<'EXPECT');
 OkATopic
 OkBTopic
@@ -396 +623 @@
 FOOT
 EXPECT
-}
-
-sub verify_no_header_with_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_septic( 0, 1, undef, 0, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_with_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_septic( 0, 1, undef, 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_no_header_with_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_septic( 0, 1, "", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_with_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_septic( 0, 1, "", 1, <<'EXPECT');
 OkATopicOkBTopicOkTopicFOOT
 EXPECT
-}
-
-sub verify_no_header_with_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_septic( 0, 1, "", 0, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_with_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_septic( 0, 1, "", 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_no_header_with_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_septic( 0, 1, ",", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_with_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_septic( 0, 1, ",", 1, <<'EXPECT');
 OkATopic,OkBTopic,OkTopicFOOT
 EXPECT
+
+    return;
 }
 
 #####################
 
-sub verify_with_header_with_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_septic( 1, 1, undef, 1, <<EXPECT);
+sub test_with_header_with_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_septic( 1, 1, undef, 1, <<'EXPECT');
 HEAD
 OkATopic
@@ -435 +672 @@
 FOOT
 EXPECT
-}
-
-sub verify_with_header_with_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_septic( 1, 1, undef, 0, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_with_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_septic( 1, 1, undef, 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_with_header_with_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_septic( 1, 1, "", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_with_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_septic( 1, 1, "", 1, <<'EXPECT');
 HEADOkATopicOkBTopicOkTopicFOOT
 EXPECT
-}
-
-sub verify_with_header_with_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_septic( 1, 1, "", 0, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_with_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_septic( 1, 1, "", 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_with_header_with_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_septic( 1, 1, ",", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_with_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_septic( 1, 1, ",", 1, <<'EXPECT');
 HEADOkATopic,OkBTopic,OkTopicFOOT
 EXPECT
-}
-
-sub verify_with_header_with_footer_with_separator_no_results {
-    my $this = shift;
-    $this->_septic( 1, 1, ",", 0, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_with_footer_with_separator_no_results {
+    my $this = shift;
+    $this->_septic( 1, 1, ",", 0, <<'EXPECT');
 EXPECT
+
+    return;
 }
 
 #####################
 
-sub verify_with_header_no_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_septic( 1, 0, undef, 1, <<EXPECT);
+sub test_with_header_no_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_septic( 1, 0, undef, 1, <<'EXPECT');
 HEAD
 OkATopic
@@ -479 +728 @@
 OkTopic
 EXPECT
-}
-
-sub verify_with_header_no_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_septic( 1, 0, undef, 0, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_no_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_septic( 1, 0, undef, 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_with_header_no_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_septic( 1, 0, "", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_no_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_septic( 1, 0, "", 1, <<'EXPECT');
 HEADOkATopicOkBTopicOkTopic
 EXPECT
-}
-
-sub verify_with_header_no_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_septic( 1, 0, "", 0, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_no_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_septic( 1, 0, "", 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_with_header_no_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_septic( 1, 0, ",", 1, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_no_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_septic( 1, 0, ",", 1, <<'EXPECT');
 HEADOkATopic,OkBTopic,OkTopic
 EXPECT
-}
-
-sub verify_with_header_no_footer_with_separator_no_results {
-    my $this = shift;
-    $this->_septic( 1, 0, ",", 0, <<EXPECT);
+
+    return;
+}
+
+sub test_with_header_no_footer_with_separator_no_results {
+    my $this = shift;
+    $this->_septic( 1, 0, ",", 0, <<'EXPECT');
 EXPECT
-}
-
-sub verify_no_header_no_footer_with_nl_separator {
-    my $this = shift;
-    $this->_septic( 0, 0, '$n', 1, <<EXPECT);
+
+    return;
+}
+
+sub test_no_header_no_footer_with_nl_separator {
+    my $this = shift;
+    $this->_septic( 0, 0, '$n', 1, <<'EXPECT');
 OkATopic
 OkBTopic
 OkTopic
 EXPECT
-}
-
-#####################
-
-sub verify_footer_with_ntopics {
-    my $this = shift;
-
-    my $result =
-      $this->{test_topicObject}->expandMacros(
-'%SEARCH{"name~\'*Topic\'" type="query"  nonoise="on" footer="Total found: $ntopics" format="$topic"}%'
-      );
-
-    $this->assert_str_equals(
-        join( "\n", sort qw(OkATopic OkBTopic OkTopic) ) . "\nTotal found: 3",
-        $result );
-}
-
-sub verify_multiple_and_footer_with_ntopics_and_nhits {
-    my $this = shift;
-
-    $this->set_up_for_formatted_search();
-
-    my $result =
-      $this->{test_topicObject}->expandMacros(
-'%SEARCH{"Bullet" type="regex" multiple="on" nonoise="on" footer="Total found: $ntopics, Hits: $nhits" format="$text - $nhits"}%'
-      );
-
-    $this->assert_str_equals(
-"   * Bullet 1 - 1\n   * Bullet 2 - 2\n   * Bullet 3 - 3\n   * Bullet 4 - 4\nTotal found: 1, Hits: 4",
-        $result
-    );
-}
-
-sub verify_footer_with_ntopics_empty_format {
-    my $this = shift;
-
-    my $result =
-      $this->{test_topicObject}->expandMacros(
-'%SEARCH{"name~\'*Topic\'" type="query"  nonoise="on" footer="Total found: $ntopics" format="" separator=""}%'
-      );
-
-    $this->assert_str_equals( "Total found: 3", $result );
-}
-
-sub verify_nofinalnewline {
-    my $this = shift;
-
-    # nofinalnewline="off"
-    my $result =
-      $this->{test_topicObject}->expandMacros(
-'%SEARCH{"name~\'OkTopic\'" type="query"  nonoise="on" format="$topic" nofinalnewline="off"}%'
-      );
-
-    $this->assert_str_equals( "OkTopic\n", $result );
-
-    # nofinalnewline="on"
-    $result =
-      $this->{test_topicObject}->expandMacros(
-'%SEARCH{"name~\'OkTopic\'" type="query"  nonoise="on" format="$topic" nofinalnewline="on"}%'
-      );
-
-    $this->assert_str_equals( "OkTopic", $result );
-
-    # nofinalnewline should default be on
-    $result =
-      $this->{test_topicObject}->expandMacros(
-'%SEARCH{"name~\'OkTopic\'" type="query"  nonoise="on" format="$topic"}%'
-      );
-
-    $this->assert_str_equals( "OkTopic", $result );
-
+
+    return;
 }
 
@@ -604 +796 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -619 +813 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -634 +830 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -649 +847 @@
     $this->assert_does_not_match( qr/OkBTopic/, $result );
     $this->assert_does_not_match( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -666 +866 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -681 +883 @@
     $this->assert_matches( qr/OkBTopic/, $result );
     $this->assert_matches( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -697 +901 @@
     $this->assert_matches( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -713 +918 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -730 +936 @@
     $this->assert_does_not_match( qr/OkBTopic/, $result );
     $this->assert_does_not_match( qr/OkATopic/, $result );
+
+    return;
 }
 
@@ -746 +954 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -762 +971 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -778 +988 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -796 +1007 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -812 +1024 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -828 +1041 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -844 +1058 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -862 +1077 @@
     $this->assert_does_not_match( qr/OkBTopic/, $result );
 
+    return;
 }
 
@@ -878 +1094 @@
     $this->assert_does_not_match( qr/OkBTopic/, $result );
 
+    return;
 }
 
@@ -894 +1111 @@
     $this->assert_matches( qr/OkATopic/, $result );
 
+    return;
 }
 
@@ -907 +1125 @@
     $this->assert_does_not_match( qr/OkATopic/, $result );
     $this->assert_matches( qr/OkBTopic/, $result );
+
+    return;
 }
 
@@ -922 +1142 @@
 HERE
     $this->assert_str_equals( "$wn $this->{users_web}.$wn\n", $result );
+
+    return;
 }
 
@@ -931 +1153 @@
         '%SEARCH{"" type="regex" scope="text" nonoise="on" format="$topic"}%');
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -941 +1165 @@
       );
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -951 +1177 @@
       );
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -960 +1188 @@
         '%SEARCH{"" type="word" scope="text" nonoise="on" format="$topic"}%');
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -970 +1200 @@
       );
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -980 +1212 @@
       );
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -990 +1224 @@
       );
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -1000 +1236 @@
       );
     $this->assert_str_equals( "", $result );
+
+    return;
 }
 
@@ -1021 +1259 @@
 HERE
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        'FormattedSearchTopic1', $text );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'FormattedSearchTopic1' );
+    $topicObject->text($text);
     $topicObject->save();
-}
-
-sub verify_formatted_search_summary_with_exclamation_marks {
+    $topicObject->finish();
+
+    return;
+}
+
+sub test_footer_with_ntopics {
+    my $this = shift;
+
+    my $result =
+      $this->{test_topicObject}->expandMacros(
+'%SEARCH{"name~\'*Topic\'" type="query"  nonoise="on" footer="Total found: $ntopics" format="$topic"}%'
+      );
+
+    $this->assert_str_equals(
+        join( "\n", sort qw(OkATopic OkBTopic OkTopic) ) . "\nTotal found: 3",
+        $result );
+
+    return;
+}
+
+sub test_multiple_and_footer_with_ntopics_and_nhits {
+    my $this = shift;
+
+    $this->set_up_for_formatted_search();
+
+    my $result =
+      $this->{test_topicObject}->expandMacros(
+'%SEARCH{"Bullet" type="regex" multiple="on" nonoise="on" footer="Total found: $ntopics, Hits: $nhits" format="$text - $nhits"}%'
+      );
+
+    $this->assert_str_equals(
+"   * Bullet 1 - 1\n   * Bullet 2 - 2\n   * Bullet 3 - 3\n   * Bullet 4 - 4\nTotal found: 1, Hits: 4",
+        $result
+    );
+
+    return;
+}
+
+sub test_footer_with_ntopics_empty_format {
+    my $this = shift;
+
+    my $result =
+      $this->{test_topicObject}->expandMacros(
+'%SEARCH{"name~\'*Topic\'" type="query"  nonoise="on" footer="Total found: $ntopics" format="" separator=""}%'
+      );
+
+    $this->assert_str_equals( "Total found: 3", $result );
+
+    return;
+}
+
+sub test_nofinalnewline {
+    my $this = shift;
+
+    # nofinalnewline="off"
+    my $result =
+      $this->{test_topicObject}->expandMacros(
+'%SEARCH{"name~\'OkTopic\'" type="query"  nonoise="on" format="$topic" nofinalnewline="off"}%'
+      );
+
+    $this->assert_str_equals( "OkTopic\n", $result );
+
+    # nofinalnewline="on"
+    $result =
+      $this->{test_topicObject}->expandMacros(
+'%SEARCH{"name~\'OkTopic\'" type="query"  nonoise="on" format="$topic" nofinalnewline="on"}%'
+      );
+
+    $this->assert_str_equals( "OkTopic", $result );
+
+    # nofinalnewline should default be on
+    $result =
+      $this->{test_topicObject}->expandMacros(
+'%SEARCH{"name~\'OkTopic\'" type="query"  nonoise="on" format="$topic"}%'
+      );
+
+    $this->assert_str_equals( "OkTopic", $result );
+
+    return;
+}
+
+sub test_formatted_search_summary_with_exclamation_marks {
     my $this    = shift;
     my $session = $this->{session};
@@ -1050 +1367 @@
     $expected = '<nop>AnnaAnchor';
     $this->assert_str_equals( $expected, $actual );
+
+    return;
 }
 
 # Item8718
-sub verify_formatted_search_with_exclamation_marks_inside_bracket_link {
+sub test_formatted_search_with_exclamation_marks_inside_bracket_link {
     my $this    = shift;
     my $session = $this->{session};
@@ -1069 +1388 @@
 
     $this->assert_str_equals( $expected, $actual );
+
+    return;
 }
 
@@ -1085 +1406 @@
         $result
     );
+
+    return;
 }
 
@@ -1099 +1422 @@
     $this->assert_str_equals( "FormattedSearchTopic1 \$email \$html \$time",
         $result );
-}
-
-sub verify_METASEARCH {
+
+    return;
+}
+
+sub test_METASEARCH {
     my $this    = shift;
     my $session = $this->{session};
@@ -1124 +1449 @@
       $this->{test_topicObject}->renderTML('Children: FormattedSearchTopic1 ');
     $this->assert_str_equals( $expected, $actual );
+
+    return;
 }
 
@@ -1142 +1469 @@
 %META:FILEATTACHMENT{name="README" comment="Blah Blah" date="1157965062" size="5504"}%
 HERE
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'QueryTopic',
-        $text );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'QueryTopic' );
+    $topicObject->text($text);
     $topicObject->save();
+    $topicObject->finish();
 
     $text = <<'HERE';
@@ -1160 +1488 @@
 %META:FIELD{name="form" attributes="" title="Blah" value="form good"}%
 %META:FIELD{name="FORM" attributes="" title="Blah" value="FORM GOOD"}%
-%META:FIELD{name="NewField" attributes="" title="Item10269" value="TaxonProfile/Builder.TermForm"}%
+%META:FIELD{name="NewField" attributes="" title="Item10269" value="Profile/Builder.TermForm"}%
 %META:FILEATTACHMENT{name="porn.gif" comment="Cor" date="15062" size="15504"}%
 %META:FILEATTACHMENT{name="flib.xml" comment="Cor" date="1157965062" size="1"}%
 HERE
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'QueryTopicTwo',
-        $text );
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'QueryTopicTwo' );
+    $topicObject->text($text);
     $topicObject->save();
-
-    $this->{session}->finish();
-    my $query = new Unit::Request("");
+    $topicObject->finish();
+
+    my $query = Unit::Request->new('');
     $query->path_info("/$this->{test_web}/$this->{test_topic}");
 
-    $this->{session} = new Foswiki( undef, $query );
+    $this->createNewFoswikiSession( undef, $query );
     $this->assert_str_equals( $this->{test_web}, $this->{session}->{webName} );
-    $Foswiki::Plugins::SESSION = $this->{session};
-
-    $this->{test_topicObject} =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        $this->{test_topic} );
+
+    return;
 }
 
@@ -1195 +1520 @@
       ->expandMacros( '%SEARCH{"parent.name=\'WebHome\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopic', $result );
+
+    return;
 }
 
@@ -1206 +1533 @@
       ->expandMacros( '%SEARCH{"attachments[size > 0]"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopic QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1217 +1546 @@
         '%SEARCH{"META:FILEATTACHMENT[size > 10000]"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1228 +1559 @@
       ->expandMacros( '%SEARCH{"attachments[name=\'flib.xml\']"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1239 +1572 @@
       ->expandMacros( '%SEARCH{"Lastname=\'Peel\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopic QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1250 +1585 @@
         '%SEARCH{"text ~ \'*SMONG*\' AND Lastname=\'Peel\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1261 +1598 @@
         '%SEARCH{"text ~ \'*FURTLE*\' AND Lastname=\'Peel\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopic', $result );
+
+    return;
 }
 
@@ -1272 +1611 @@
       ->expandMacros( '%SEARCH{"Lastname=\'Peel\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopic QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1283 +1624 @@
       ->expandMacros( '%SEARCH{"form.name=\'TestyForm\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
-}
-
+
+    return;
+}
+
+#Item10520: in Sven's reading of System.QuerySearch, this should return no results, as there is no field of the name 'TestForm'
 sub verify_formQuery2 {
     my $this = shift;
@@ -1293 +1637 @@
       $this->{test_topicObject}
       ->expandMacros( '%SEARCH{"TestForm"' . $stdCrap );
-    $this->assert_str_equals( 'QueryTopic', $result );
+    my $expected =
+      $this->_expect_with_deps( '', 'Foswiki,<,1.2' => 'QueryTopic' );
+
+    $this->assert_str_equals( $expected, $result );
+
+    return;
 }
 
@@ -1305 +1654 @@
         '%SEARCH{"TestForm[name=\'Field1\'].value=\'A Field\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopic', $result );
+
+    return;
 }
 
@@ -1328 +1679 @@
       ->expandMacros( '%SEARCH{"TestForm.Field1=\'A Field\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopic', $result );
+
+    return;
 }
 
@@ -1355 +1708 @@
       ->expandMacros( '%SEARCH{"TestyForm.FORM=\'FORM GOOD\'"' . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1367 +1722 @@
           . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
+
+    return;
 }
 
@@ -1412 +1769 @@
 
     my $result =
-      $this->{test_topicObject}->expandMacros( '%SEARCH{"A * B"' . $stdCrap );
-    $this->assert_matches( qr/Error was: Syntax error in 'A \* B' at ' \* B'/s,
+      $this->{test_topicObject}->expandMacros( '%SEARCH{"A ¬ B"' . $stdCrap );
+    $this->assert_matches( qr/Error was: Syntax error in 'A ¬ B' at ' ¬ B'/s,
         $result );
+
+    return;
 }
 
@@ -1434 +1793 @@
         my $vD = ( $n == 1 )   ? 'A' : 'B';
         my $vE = ( $n == 2 )   ? 'A' : 'B';
-        my $text = <<HERE;
+        my $text = <<"HERE";
 %META:TOPICINFO{author="TopicUserMapping_guest" date="12" format="1.1" version="1.2"}%
 ---+ Progressive Sexuality
@@ -1461 +1820 @@
 %META:FIELD{name="FieldE" attributes="" title="Banother Field" value="$vE"}%
 HERE
-        my $topicObject =
-          Foswiki::Meta->new( $this->{session}, $this->{test_web},
-            "QueryTopic$n", $text );
+        my ($topicObject) =
+          Foswiki::Func::readTopic( $this->{test_web}, "QueryTopic$n", );
+        $topicObject->text($text);
         $topicObject->save();
+        $topicObject->finish();
     }
     require Benchmark;
 
     # Search using a regular expression
-    my $start = new Benchmark;
+    my $start = Benchmark->new();
 
     my $result =
@@ -1475 +1835 @@
 '%SEARCH{"^[%]META:FIELD{name=\"FieldA\".*\bvalue=\"A\";^[%]META:FIELD{name=\"FieldB\".*\bvalue=\"A\";^[%]META:FIELD{name=\"FieldC\".*\bvalue=\"A\";^[%]META:FIELD{name=\"FieldD\".*\bvalue=\"A\"|^[%]META:FIELD{name=\"FieldE\".*\bvalue=\"A\"" type="regex" nonoise="on" format="$topic" separator=" "}%'
       );
-    my $retime = Benchmark::timediff( new Benchmark, $start );
+    my $retime = Benchmark::timediff( Benchmark->new(), $start );
     $this->assert_str_equals( 'QueryTopic1 QueryTopic2', $result );
 
     # Repeat using a query
-    $start = new Benchmark;
+    $start = Benchmark->new;
     $result =
       $this->{test_topicObject}->expandMacros(
@@ -1488 +1848 @@
     print STDERR "Query " . Benchmark::timestr($querytime),
       "\nRE " . Benchmark::timestr($retime), "\n";
-}
-
-sub verify_4347 {
+
+    return;
+}
+
+sub test_4347 {
     my $this = shift;
 
@@ -1498 +1860 @@
       );
     $this->assert_str_equals( '', $result );
+
+    return;
 }
 
@@ -1515 +1879 @@
     $this->assert_str_equals( 'QueryTopicTwo', $result );
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        'QueryTopicTwo' );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'QueryTopicTwo' );
     $result =
       $topicObject->expandMacros( '%SEARCH{"text ~ \'*SMONG*\'" ' . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
 
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        'QueryTopicTwo' );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'QueryTopicTwo' );
     $result = $topicObject->expandMacros(
         '%SEARCH{"text ~ \'*QueryTopicTwo*\'" ' . $stdCrap );
     $this->assert_str_equals( 'QueryTopicTwo', $result );
-
+    $topicObject->finish();
+
+    return;
 }
 
@@ -1612 +1977 @@
     $this->assert_str_equals( 'QueryTopicTwo', $result );
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        'QueryTopicTwo' );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'QueryTopicTwo' );
     $result =
       $topicObject->expandMacros( '%SEARCH{"text ~ \'*SMONG*\'" web="'
@@ -1621 +1985 @@
     $this->assert_str_equals( 'QueryTopicTwo', $result );
 
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        'QueryTopicTwo' );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'QueryTopicTwo' );
     $result =
       $topicObject->expandMacros( '%SEARCH{"text ~ \'*QueryTopicTwo*\'" web="'
@@ -1630 +1994 @@
     $this->assert_str_equals( 'QueryTopicTwo', $result );
 
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        'QueryTopicTwo' );
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'QueryTopicTwo' );
     $result =
       $topicObject->expandMacros( '%SEARCH{"text ~ \'*Notinthetopics*\'" web="'
@@ -1638 +2002 @@
           . $stdCrap );
     $this->assert_str_equals( '', $result );
+    $topicObject->finish();
 
     $result =
@@ -1645 +2010 @@
           . $stdCrap );
     $this->assert_str_equals( 'QueryTopic', $result );
-}
-
-sub verify_pattern {
+
+    return;
+}
+
+sub test_pattern {
     my $this = shift;
 
@@ -1657 +2024 @@
     $this->assert_matches( qr/Xdont.matchmeY/,  $result );
     $this->assert_matches( qr/XY/,              $result );
-}
-
-sub verify_badpattern {
+
+    return;
+}
+
+sub test_badpattern {
     my $this = shift;
 
@@ -1677 +2046 @@
     # and format should be XY for all 3 topics
     $this->assert_equals( 3, $result =~ s/^XY$//gm );
-}
-
-sub verify_validatepattern {
+
+    return;
+}
+
+sub test_validatepattern {
     my $this = shift;
     my ( $pattern, $temp );
@@ -1713 +2084 @@
     $this->assert_matches( qr/$pattern/, 'foobluebar' );
 
+    return;
 }
 
 #Item977
-sub verify_formatOfLinks {
-    my $this = shift;
-
-    my $topicObject = Foswiki::Meta->new(
-        $this->{session},
-        $this->{test_web}, 'Item977', "---+ Apache
+sub test_formatOfLinks {
+    my $this = shift;
+
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'Item977' );
+    $topicObject->text(<<'HERE');
+---+ Apache
 
 Apache is the [[http://www.apache.org/httpd/][well known web server]].
-"
-    );
+HERE
     $topicObject->save();
+    $topicObject->finish();
 
     my $result =
@@ -1765 +2138 @@
           ->TML2PlainText('Apache is the well known web server.') );
 
+    return;
 }
 
 sub _getTopicList {
-    my $this    = shift;
-    my $web     = shift;
-    my $options = shift;
+    my ( $this, $web, $options, $sadness, $default_expected, %expected_list ) =
+      @_;
+    my $expected =
+      $this->_expect_with_deps( $default_expected, %expected_list );
 
     #    my $options = {
@@ -1779 +2154 @@
     #    };
 
+    $this->assert_str_equals( 'ARRAY', ref($expected) );
     my $webObject = Foswiki::Meta->new( $this->{session}, $web );
 
@@ -1786 +2162 @@
       Foswiki::Search::InfoCache::getTopicListIterator( $webObject, $options );
 
-    ASSERT( UNIVERSAL::isa( $iter, 'Foswiki::Iterator' ) ) if DEBUG;
+    ASSERT( $iter->isa('Foswiki::Iterator') ) if DEBUG;
     my @topicList = ();
     while ( my $t = $iter->next() ) {
+        next if ( $t eq 'InvisibleTopic' );    #and user != admin or...
         push( @topicList, $t );
     }
-
+    $webObject->finish();
+
+    my $l1 = join( ',', @{$expected} );
+    my $l2 = join( ',', @topicList );
+    $this->assert_str_equals( $l1, $l2, "$sadness:\nwant: $l2\n got: $l1" );
     return \@topicList;
 }
@@ -1799 +2180 @@
 
     #no topics specified..
-    $this->assert_deep_equals(
+    $this->_getTopicList(
+        $this->{test_web},
+        {},
+        'no filters, all topics in test_web',
         [
             'OkATopic', 'OkBTopic',
@@ -1805 +2189 @@
             'WebPreferences'
         ],
-        $this->_getTopicList( $this->{test_web}, {} ),
-        'no filters, all topics in test_web'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        '_default',
+        {},
+        'no filters, all topics in test_web',
         [
             'WebAtom',           'WebChanges',
@@ -1817 +2202 @@
             'WebSearchAdvanced', 'WebTopicList'
         ],
-        $this->_getTopicList( '_default', {} ),
-        'no filters, all topics in _default web'
     );
 
     #use wildcards
-    $this->assert_deep_equals(
+    $this->_getTopicList(
+        $this->{test_web},
+        { includeTopics => 'Ok*' },
+        'comma separated list',
         [ 'OkATopic', 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList( $this->{test_web}, { includeTopics => 'Ok*' } ),
-        'test_web, Wildcard includeTopics Ok*'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        '_default',
+        { includeTopics => 'Web*' },
+        'no filters, all topics in test_web',
         [
             'WebAtom',           'WebChanges',
@@ -1836 +2223 @@
             'WebSearchAdvanced', 'WebTopicList'
         ],
-        $this->_getTopicList( '_default', { includeTopics => 'Web*' } ),
-        '_default web, Wildcard includeTopics Web*'
     );
 
     #comma separated list specifed for inclusion
-    $this->assert_deep_equals(
-        [ 'TestTopicSEARCH', 'OkTopic' ],
-        $this->_getTopicList(
-            $this->{test_web},
-            { includeTopics => 'TestTopicSEARCH,OkTopic,NoSuchTopic' }
-        ),
-        'test_web, comma separated includeTopics, missing topic'
-    );
-    $this->assert_deep_equals(
-        [ 'WebTopicList', 'WebCreateNewTopic' ],
-        $this->_getTopicList(
-            '_default',
-            { includeTopics => 'WebTopicList, WebCreateNewTopic, NoSuchTopic' }
-        ),
-        '_default web, comma-space separated includeTopics, missing topic '
+    $this->_getTopicList(
+        $this->{test_web},
+        { includeTopics => 'TestTopicSEARCH,OkTopic,NoSuchTopic' },
+        'comma separated list',
+        [ 'OkTopic', 'TestTopicSEARCH' ],
+        'Foswiki,<,1.2' => [ 'TestTopicSEARCH', 'OkTopic' ],
+    );
+    $this->_getTopicList(
+        '_default',
+        { includeTopics => 'WebTopicList, WebCreateNewTopic, NoSuchTopic' },
+        'no filters, all topics in test_web',
+        [ 'WebCreateNewTopic', 'WebTopicList' ],
+        'Foswiki,<,1.2' => [ 'WebTopicList', 'WebCreateNewTopic' ],
     );
 
     #excludes
-    $this->assert_deep_equals(
+    $this->_getTopicList(
+        $this->{test_web},
+        { excludeTopics => 'NoSuchTopic,OkBTopic' },
+        'no filters, all topics in test_web',
         [ 'OkATopic', 'OkTopic', 'TestTopicSEARCH', 'WebPreferences' ],
-        $this->_getTopicList(
-            $this->{test_web}, { excludeTopics => 'NoSuchTopic,OkBTopic' }
-        ),
-        'test_web, comma separated excludeTopics list'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        '_default',
+        { excludeTopics => 'WebSearch' },
+        'no filters, all topics in test_web',
         [
             'WebAtom',           'WebChanges',
@@ -1875 +2260 @@
             'WebTopicList'
         ],
-        $this->_getTopicList( '_default', { excludeTopics => 'WebSearch' } ),
-        '_default web, exclude WebSearch'
     );
 
     #Talk about missing alot of tests
-    $this->assert_deep_equals(
+    $this->_getTopicList(
+        $this->{test_web},
+        { includeTopics => '*' },
+        'all topics, using wildcard',
         [
             'OkATopic', 'OkBTopic',
@@ -1886 +2272 @@
             'WebPreferences'
         ],
-        $this->_getTopicList( $this->{test_web}, { includeTopics => '*' } ),
-        'all topics, using wildcard'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        $this->{test_web},
+        { includeTopics => 'Ok*' },
+        'Ok* topics, using wildcard',
         [ 'OkATopic', 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList( $this->{test_web}, { includeTopics => 'Ok*' } ),
-        'Ok* topics, using wildcard'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'ok*',
+            casesensitive => 1
+        },
+        'case sensitive ok* topics, using wildcard',
         [],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'ok*',
-                casesensitive => 1
-            }
-        ),
-        'case sensitive ok* topics, using wildcard'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'ok*',
+            casesensitive => 0
+        },
+        'case insensitive ok* topics, using wildcard',
         [ 'OkATopic', 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'ok*',
-                casesensitive => 0
-            }
-        ),
-        'case insensitive ok* topics, using wildcard'
     );
 
@@ -1923 +2304 @@
 
         # this test won't work on Mac OS X or windows.
-        $this->assert_deep_equals(
-            [],
-            $this->_getTopicList(
-                $this->{test_web},
-                {
-                    includeTopics => 'okatopic',
-                    casesensitive => 1
-                }
-            ),
-            'case sensitive okatopic topic 1'
-        );
-    }
-
-    $this->assert_deep_equals(
-        ['OkATopic'],
         $this->_getTopicList(
             $this->{test_web},
             {
                 includeTopics => 'okatopic',
-                casesensitive => 0
-            }
-        ),
-        'case insensitive okatopic topic'
+                casesensitive => 1
+            },
+            'case sensitive okatopic topic 1',
+            [],
+        );
+    }
+
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'okatopic',
+            casesensitive => 0
+        },
+        'case insensitive okatopic topic',
+        ['OkATopic'],
     );
     ##### same again, with excludes.
-    $this->assert_deep_equals(
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => '*',
+            excludeTopics => 'web*'
+        },
+        'all topics, using wildcard',
         [
             'OkATopic', 'OkBTopic',
@@ -1954 +2337 @@
             'WebPreferences'
         ],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => '*',
-                excludeTopics => 'web*'
-            }
-        ),
-        'all topics, using wildcard'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'Ok*',
+            excludeTopics => 'okatopic'
+        },
+        'Ok* topics, using wildcard',
         [ 'OkATopic', 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'Ok*',
-                excludeTopics => 'okatopic'
-            }
-        ),
-        'Ok* topics, using wildcard'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'ok*',
+            excludeTopics => 'WebPreferences',
+            casesensitive => 1
+        },
+        'case sensitive ok* topics, using wildcard',
         [],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'ok*',
-                excludeTopics => 'WebPreferences',
-                casesensitive => 1
-            }
-        ),
-        'case sensitive ok* topics, using wildcard'
-    );
-    $this->assert_deep_equals(
+    );
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'ok*',
+            excludeTopics => '',
+            casesensitive => 0
+        },
+        'case insensitive ok* topics, using wildcard',
         [ 'OkATopic', 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'ok*',
-                excludeTopics => '',
-                casesensitive => 0
-            }
-        ),
-        'case insensitive ok* topics, using wildcard'
-    );
-
-    $this->assert_deep_equals(
+    );
+
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'Ok*',
+            excludeTopics => '*ATopic',
+            casesensitive => 1
+        },
+        'case sensitive okatopic topic 2',
         [ 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'Ok*',
-                excludeTopics => '*ATopic',
-                casesensitive => 1
-            }
-        ),
-        'case sensitive okatopic topic 2'
-    );
-
-    $this->assert_deep_equals(
+    );
+
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'Ok*',
+            excludeTopics => '*atopic',
+            casesensitive => 1
+        },
+        'case sensitive okatopic topic 3',
         [ 'OkATopic', 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'Ok*',
-                excludeTopics => '*atopic',
-                casesensitive => 1
-            }
-        ),
-        'case sensitive okatopic topic 3'
-    );
-
-    $this->assert_deep_equals(
+    );
+
+    $this->_getTopicList(
+        $this->{test_web},
+        {
+            includeTopics => 'ok*topic',
+            excludeTopics => 'okatopic',
+            casesensitive => 0
+        },
+        'case insensitive okatopic topic',
         [ 'OkBTopic', 'OkTopic' ],
-        $this->_getTopicList(
-            $this->{test_web},
-            {
-                includeTopics => 'ok*topic',
-                excludeTopics => 'okatopic',
-                casesensitive => 0
-            }
-        ),
-        'case insensitive okatopic topic'
-    );
-
+    );
+
+    return;
 }
 
@@ -2111 +2475 @@
     $this->assert_str_equals( $expected, $actual );
 
+    return;
 }
 
@@ -2116 +2481 @@
     my $this = shift;
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'TestForm',
-        <<'FORM');
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'TestForm' );
+    $topicObject->text(<<'FORM');
 | *Name*         | *Type* | *Size* | *Value*   | *Tooltip message* | *Attributes* |
 | Why | text | 32 | | Mandatory field | M |
@@ -2124 +2489 @@
 FORM
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'SplodgeOne',
-        <<FORM);
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'SplodgeOne' );
+    $topicObject->text( <<'FORM');
 %META:FORM{name="TestForm"}%
 %META:FIELD{name="Ecks" attributes="" title="X" value="Blah"}%
@@ -2137 +2503 @@
     my $expected = 'SplodgeOne;Blah';
     $this->assert_str_equals( $expected, $actual );
-
+    $topicObject->finish();
+
+    return;
 }
 
@@ -2143 +2511 @@
     my $this = shift;
 
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'TestForm',
-        <<'FORM');
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'TestForm' );
+    $topicObject->text( <<'FORM');
 | *Name*         | *Type* | *Size* | *Value*   | *Tooltip message* | *Attributes* |
 | Why | text | 32 | | Mandatory field | M |
@@ -2151 +2519 @@
 FORM
     $topicObject->save();
-    $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web}, 'SplodgeOne',
-        <<FORM);
+    $topicObject->finish();
+    ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, 'SplodgeOne' );
+    $topicObject->text(<<'FORM');
 %META:FORM{name="TestForm"}%
 %META:FIELD{name="Ecks" attributes="" title="X" value="Blah"}%
@@ -2164 +2533 @@
     my $expected = 'SplodgeOne;Blah';
     $this->assert_str_equals( $expected, $actual );
-
+    $topicObject->finish();
+
+    return;
 }
 
@@ -2188 +2559 @@
 HERE
     $this->assert_str_equals( $expected, $actual );
+
+    return;
 }
 
@@ -2195 +2568 @@
 #need summary, and multiple
 sub _multiWebSeptic {
-    my ( $this, $head, $foot, $sep, $results, $expected, $format ) = @_;
+    my ( $this, $head, $foot, $sep, $results, $format, $default, %expectations )
+      = @_;
     my $str = $results ? '*Preferences' : 'Septic';
     $head = $head        ? 'header="HEAD($web)"'            : '';
@@ -2201 +2575 @@
     $sep  = defined $sep ? "separator=\"$sep\""             : '';
     $format = '$topic' unless ( defined($format) );
+    my $expected = $this->_expect_with_deps( $default, %expectations );
 
     my $result = $this->{test_topicObject}->expandMacros(
@@ -2214 +2589 @@
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
+
+    return;
 }
 
 #####################
 
-sub verify_multiWeb_no_header_no_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 0, undef, 1, <<EXPECT);
+sub test_multiWeb_no_header_no_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        0, 0, undef, 1, undef, <<'FOSWIKI12',
+SitePreferences
+WebPreferences
+DefaultPreferences
+WebPreferences
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 DefaultPreferences
 WebPreferences
 SitePreferences
 WebPreferences
-EXPECT
-}
-
-sub verify_multiWeb_no_header_no_footer_no_separator_with_results_counters {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 0, undef, 1,
-        <<EXPECT, '$nhits, $ntopics, $index, $topic' );
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_no_header_no_footer_no_separator_with_results_counters {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        0,                                  0, undef, 1,
+        '$nhits, $ntopics, $index, $topic', <<'FOSWIKI12',
+1, 1, 1, SitePreferences
+2, 2, 2, WebPreferences
+1, 1, 3, DefaultPreferences
+2, 2, 4, WebPreferences
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 1, 1, 1, DefaultPreferences
 2, 2, 2, WebPreferences
 1, 1, 3, SitePreferences
 2, 2, 4, WebPreferences
-EXPECT
-}
-
-sub verify_multiWeb_no_header_no_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 0, undef, 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_no_header_no_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 0, "", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_no_header_no_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 0, 0, undef, 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_no_header_no_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        0, 0, "", 1, undef, <<'FOSWIKI12',
+SitePreferencesWebPreferencesDefaultPreferencesWebPreferences
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 DefaultPreferencesWebPreferencesSitePreferencesWebPreferences
-EXPECT
-}
-
-sub verify_multiWeb_no_header_no_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 0, "", 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_no_header_no_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 0, ",", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_no_header_no_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 0, 0, "", 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_no_header_no_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        0, 0, ",", 1, undef, <<'FOSWIKI12',
+SitePreferences,WebPreferences,DefaultPreferences,WebPreferences
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 DefaultPreferences,WebPreferences,SitePreferences,WebPreferences
-EXPECT
-}
-
-sub verify_multiWeb_no_header_no_footer_with_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 0, ",", 0, <<EXPECT);
-EXPECT
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_no_header_no_footer_with_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 0, 0, ",", 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
 }
 #####################
 
-sub verify_multiWeb_no_header_with_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 1, undef, 1, <<EXPECT);
+sub test_multiWeb_no_header_with_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        0, 1, undef, 1, undef, <<'FOSWIKI12',
+SitePreferences
+WebPreferences
+FOOT(2,2)DefaultPreferences
+WebPreferences
+FOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 DefaultPreferences
 WebPreferences
@@ -2280 +2701 @@
 WebPreferences
 FOOT(2,2)
-EXPECT
-}
-
-sub verify_multiWeb_no_header_with_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 1, undef, 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_no_header_with_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 1, "", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_no_header_with_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 0, 1, undef, 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_no_header_with_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        0, 1, "", 1, undef, <<'FOSWIKI12',
+SitePreferencesWebPreferencesFOOT(2,2)DefaultPreferencesWebPreferencesFOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 DefaultPreferencesWebPreferencesFOOT(2,2)SitePreferencesWebPreferencesFOOT(2,2)
-EXPECT
-}
-
-sub verify_multiWeb_no_header_with_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 1, "", 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_no_header_with_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 0, 1, ",", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_no_header_with_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 0, 1, "", 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_no_header_with_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        0, 1, ",", 1, undef, <<'FOSWIKI12',
+SitePreferences,WebPreferencesFOOT(2,2)DefaultPreferences,WebPreferencesFOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 DefaultPreferences,WebPreferencesFOOT(2,2)SitePreferences,WebPreferencesFOOT(2,2)
-EXPECT
+FOSWIKI11
+
+    return;
 }
 
 #####################
 
-sub verify_multiWeb_with_header_with_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 1, undef, 1, <<EXPECT);
+sub test_multiWeb_with_header_with_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        1, 1, undef, 1, undef, <<'FOSWIKI12',
+HEAD(Main)
+SitePreferences
+WebPreferences
+FOOT(2,2)HEAD(System)
+DefaultPreferences
+WebPreferences
+FOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 HEAD(System)
 DefaultPreferences
@@ -2321 +2770 @@
 WebPreferences
 FOOT(2,2)
-EXPECT
-}
-
-sub verify_multiWeb_with_header_with_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 1, undef, 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_with_header_with_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 1, "", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_with_header_with_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 1, 1, undef, 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_with_header_with_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        1, 1, "", 1, undef, <<'FOSWIKI12',
+HEAD(Main)SitePreferencesWebPreferencesFOOT(2,2)HEAD(System)DefaultPreferencesWebPreferencesFOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 HEAD(System)DefaultPreferencesWebPreferencesFOOT(2,2)HEAD(Main)SitePreferencesWebPreferencesFOOT(2,2)
-EXPECT
-}
-
-sub verify_multiWeb_with_header_with_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 1, "", 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_with_header_with_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 1, ",", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_with_header_with_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 1, 1, "", 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_with_header_with_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        1, 1, ",", 1, undef, <<'FOSWIKI12',
+HEAD(Main)SitePreferences,WebPreferencesFOOT(2,2)HEAD(System)DefaultPreferences,WebPreferencesFOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 HEAD(System)DefaultPreferences,WebPreferencesFOOT(2,2)HEAD(Main)SitePreferences,WebPreferencesFOOT(2,2)
-EXPECT
-}
-
-sub verify_multiWeb_with_header_with_footer_with_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 1, ",", 0, <<EXPECT);
-EXPECT
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_with_header_with_footer_with_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 1, 1, ",", 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
 }
 
 #####################
 
-sub verify_multiWeb_with_header_no_footer_no_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 0, undef, 1, <<EXPECT);
+sub test_multiWeb_with_header_no_footer_no_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        1, 0, undef, 1, undef, <<'FOSWIKI12',
+HEAD(Main)
+SitePreferences
+WebPreferences
+HEAD(System)
+DefaultPreferences
+WebPreferences
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 HEAD(System)
 DefaultPreferences
@@ -2367 +2845 @@
 SitePreferences
 WebPreferences
-EXPECT
-}
-
-sub verify_multiWeb_with_header_no_footer_no_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 0, undef, 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_with_header_no_footer_empty_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 0, "", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_with_header_no_footer_no_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 1, 0, undef, 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_with_header_no_footer_empty_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        1, 0, "", 1, undef, <<'FOSWIKI12',
+HEAD(Main)SitePreferencesWebPreferencesHEAD(System)DefaultPreferencesWebPreferences
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 HEAD(System)DefaultPreferencesWebPreferencesHEAD(Main)SitePreferencesWebPreferences
-EXPECT
-}
-
-sub verify_multiWeb_with_header_no_footer_empty_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 0, "", 0, <<EXPECT);
-EXPECT
-}
-
-sub verify_multiWeb_with_header_no_footer_with_separator_with_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 0, ",", 1, <<EXPECT);
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_with_header_no_footer_empty_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 1, 0, "", 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
+}
+
+sub test_multiWeb_with_header_no_footer_with_separator_with_results {
+    my $this = shift;
+    $this->_multiWebSeptic(
+        1, 0, ",", 1, undef, <<'FOSWIKI12',
+HEAD(Main)SitePreferences,WebPreferencesHEAD(System)DefaultPreferences,WebPreferences
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 HEAD(System)DefaultPreferences,WebPreferencesHEAD(Main)SitePreferences,WebPreferences
-EXPECT
-}
-
-sub verify_multiWeb_with_header_no_footer_with_separator_no_results {
-    my $this = shift;
-    $this->_multiWebSeptic( 1, 0, ",", 0, <<EXPECT);
-EXPECT
+FOSWIKI11
+
+    return;
+}
+
+sub test_multiWeb_with_header_no_footer_with_separator_no_results {
+    my $this = shift;
+    $this->_multiWebSeptic( 1, 0, ",", 0, undef, <<'FOSWIKI12');
+FOSWIKI12
+
+    return;
 }
 
 #Item1992: calling Foswiki::Search::_makeTopicPattern repeatedly made a big mess.
-sub verify_web_and_topic_expansion {
+sub test_web_and_topic_expansion {
     my $this   = shift;
     my $result = $this->{test_topicObject}->expandMacros(
@@ -2417 +2915 @@
         }%'
     );
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Main.WebHome
+Main.WebPreferences
+FOOT(2,2)Sandbox.WebHome
+Sandbox.WebPreferences
+FOOT(2,2)System.WebHome
+System.WebPreferences
+FOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 System.WebHome
 System.WebPreferences
@@ -2425 +2933 @@
 Sandbox.WebPreferences
 FOOT(2,2)
-EXPECT
+FOSWIKI11
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
+
+    return;
 }
 
 #####################
 # PAGING
-sub verify_paging_three_webs_first_five {
-    my $this = shift;
-
+sub test_paging_three_webs_first_page {
+    my $this   = shift;
     my $result = $this->{test_topicObject}->expandMacros(
         '%SEARCH{
@@ -2450 +2959 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Main.WebChanges
+Main.WebHome
+Main.WebIndex
+Main.WebPreferences
+FOOT(4,4)Sandbox.WebChanges
+FOOT(1,1)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 System.WebChanges
 System.WebHome
@@ -2457 +2975 @@
 FOOT(4,4)Main.WebChanges
 FOOT(1,1)
-EXPECT
+FOSWIKI11
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_three_webs_second_five {
+
+    return;
+}
+
+sub test_paging_three_webs_second_page {
     my $this = shift;
 
@@ -2480 +3000 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Sandbox.WebHome
+Sandbox.WebIndex
+Sandbox.WebPreferences
+FOOT(3,3)System.WebChanges
+System.WebHome
+FOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 Main.WebHome
 Main.WebIndex
@@ -2487 +3016 @@
 Sandbox.WebHome
 FOOT(2,2)
-EXPECT
+FOSWIKI11
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_three_webs_third_five {
+
+    return;
+}
+
+sub test_paging_three_webs_third_page {
     my $this = shift;
 
@@ -2510 +3041 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+System.WebIndex
+System.WebPreferences
+FOOT(2,2)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 Sandbox.WebIndex
 Sandbox.WebPreferences
 FOOT(2,2)
-EXPECT
+FOSWIKI11
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_three_webs_fourth_five {
+
+    return;
+}
+
+sub test_paging_three_webs_fourth_page {
     my $this = shift;
 
@@ -2537 +3076 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = <<'EXPECT';
 EXPECT
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_three_webs_way_too_far {
+
+    return;
+}
+
+sub test_paging_three_webs_way_too_far {
     my $this = shift;
 
@@ -2561 +3102 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = <<'EXPECT';
 EXPECT
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
+
+    return;
 }
 
@@ -2586 +3129 @@
 }%'
     );
-
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Main.WebPreferences
+FOOT(1,1)
+Sandbox.WebPreferences
+FOOT(1,1)
+System.WebPreferences
+FOOT(1,1)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 System.WebPreferences
 FOOT(1,1)
@@ -2594 +3145 @@
 Sandbox.WebPreferences
 FOOT(1,1)
-EXPECT
+FOSWIKI11
+
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
+
+    return;
 }
 
 #------------------------------------
 # PAGING with limit= does weird things.
-sub verify_paging_with_limit_first_five {
+sub test_paging_with_limit_first_page {
     my $this = shift;
 
@@ -2620 +3174 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Main.WebChanges
+Main.WebHome
+Main.WebIndex
+FOOT(3,3)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 System.WebChanges
 System.WebHome
 System.WebIndex
 FOOT(3,3)
-EXPECT
+FOSWIKI11
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_with_limit_second_five {
+
+    return;
+}
+
+sub test_paging_with_limit_second_page {
     my $this = shift;
 
@@ -2649 +3212 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+Sandbox.WebChanges
+Sandbox.WebHome
+Sandbox.WebIndex
+FOOT(3,3)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 Main.WebChanges
 Main.WebHome
 Main.WebIndex
 FOOT(3,3)
-EXPECT
+FOSWIKI11
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_with_limit_third_five {
+
+    return;
+}
+
+sub test_paging_with_limit_third_page {
     my $this = shift;
 
@@ -2678 +3250 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = $this->_expect_with_deps(
+        <<'FOSWIKI12',
+System.WebChanges
+System.WebHome
+System.WebIndex
+FOOT(3,3)
+FOSWIKI12
+        'Foswiki,<,1.2' => <<'FOSWIKI11');
 Sandbox.WebChanges
 Sandbox.WebHome
 Sandbox.WebIndex
 FOOT(3,3)
-EXPECT
+FOSWIKI11
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_with_limit_fourth_five {
+
+    return;
+}
+
+sub test_paging_with_limit_fourth_page {
     my $this = shift;
 
@@ -2707 +3288 @@
     );
 
-    my $expected = <<EXPECT;
+    my $expected = <<'EXPECT';
 EXPECT
     $expected =~ s/\n$//s;
     $this->assert_str_equals( $expected, $result );
-}
-
-sub verify_paging_with_limit_way_too_far {
+
+    return;
+}
+
+sub test_paging_with_limit_way_too_far {
     my $this = shift;
 
@@ -2732 +3315 @@
     );