Changeset 816

Timestamp:

11/19/08 19:11:33 (3 years ago)

Author:

CrawfordCurrie

Message:

Item175: ported unit tests to new namespace. They all pass.

Location:

trunk

Files:

• UnitTestContrib/data/Foswiki (moved) (moved from trunk/UnitTestContrib/data/TWiki)
• UnitTestContrib/lib/Foswiki (moved) (moved from trunk/UnitTestContrib/lib/TWiki)
• UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib.pm (modified) (2 diffs)
• UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST (modified) (3 diffs)
• UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/build.pl (modified) (1 diff)
• UnitTestContrib/lib/Foswiki/UI/Test.pm (modified) (1 diff)
• UnitTestContrib/lib/Unit/Request.pm (modified) (1 diff)
• UnitTestContrib/lib/Unit/Response.pm (modified) (2 diffs)
• UnitTestContrib/lib/Unit/TestCase.pm (modified) (2 diffs)
• UnitTestContrib/pub/Foswiki (moved) (moved from trunk/UnitTestContrib/pub/TWiki)
• UnitTestContrib/test/bin/TestRunner.pl (modified) (3 diffs)
• UnitTestContrib/test/unit/AccessControlTests.pm (modified) (20 diffs)
• UnitTestContrib/test/unit/AddToHeadTests.pm (modified) (4 diffs)
• UnitTestContrib/test/unit/AttrsTests.pm (modified) (20 diffs)
• UnitTestContrib/test/unit/AutoAttachTests.pm (modified) (6 diffs)
• UnitTestContrib/test/unit/CGIEngineTests.pm (modified) (3 diffs)
• UnitTestContrib/test/unit/ClientTests.pm (modified) (10 diffs)
• UnitTestContrib/test/unit/ConfigureTests.pm (modified) (21 diffs)
• UnitTestContrib/test/unit/EmptyTests.pm (modified) (4 diffs)
• UnitTestContrib/test/unit/ExampleTests.pm (modified) (1 diff)
• UnitTestContrib/test/unit/ExceptionTests.pm (modified) (8 diffs)
• UnitTestContrib/test/unit/Fn_GROUPS.pm (modified) (2 diffs)
• UnitTestContrib/test/unit/Fn_IF.pm (modified) (55 diffs)
• UnitTestContrib/test/unit/Fn_INCLUDE.pm (modified) (3 diffs)
• UnitTestContrib/test/unit/Fn_NOP.pm (modified) (1 diff)
• UnitTestContrib/test/unit/Fn_REVINFO.pm (modified) (5 diffs)
• UnitTestContrib/test/unit/Fn_SCRIPTURL.pm (modified) (2 diffs)
• UnitTestContrib/test/unit/Fn_SEARCH.pm (modified) (6 diffs)
• UnitTestContrib/test/unit/Fn_SECTION.pm (modified) (11 diffs)
• UnitTestContrib/test/unit/Fn_SEP.pm (modified) (1 diff)
• UnitTestContrib/test/unit/Fn_URLPARAM.pm (modified) (1 diff)
• UnitTestContrib/test/unit/Fn_USERINFO.pm (modified) (5 diffs)
• UnitTestContrib/test/unit/Fn_VAR.pm (modified) (2 diffs)
• UnitTestContrib/test/unit/FormDefTests.pm (modified) (8 diffs)
• UnitTestContrib/test/unit/FormattingTests.pm (modified) (17 diffs)
• UnitTestContrib/test/unit/FoswikiFnTestCase.pm (moved) (moved from trunk/UnitTestContrib/test/unit/TWikiFnTestCase.pm) (6 diffs)
• UnitTestContrib/test/unit/FoswikiSuite.pm (moved) (moved from trunk/UnitTestContrib/test/unit/TWikiSuite.pm) (1 diff)
• UnitTestContrib/test/unit/FoswikiTestCase.pm (moved) (moved from trunk/UnitTestContrib/test/unit/TWikiTestCase.pm) (9 diffs)
• UnitTestContrib/test/unit/FuncTests.pm (modified) (31 diffs)
• UnitTestContrib/test/unit/FuncUsersTests.pm (modified) (37 diffs)
• UnitTestContrib/test/unit/HierarchicalWebsTests.pm (modified) (25 diffs)
• UnitTestContrib/test/unit/InitFormTests.pm (modified) (7 diffs)
• UnitTestContrib/test/unit/Iterator.pm (modified) (13 diffs)
• UnitTestContrib/test/unit/MergeTests.pm (modified) (6 diffs)
• UnitTestContrib/test/unit/MetaTests.pm (modified) (12 diffs)
• UnitTestContrib/test/unit/PasswordTests.pm (modified) (11 diffs)
• UnitTestContrib/test/unit/PluginHandlerTests.pm (modified) (17 diffs)
• UnitTestContrib/test/unit/PrefsTests.pm (modified) (26 diffs)
• UnitTestContrib/test/unit/QueryTests.pm (modified) (12 diffs)
• UnitTestContrib/test/unit/RcsTests.pm (modified) (16 diffs)
• UnitTestContrib/test/unit/RegisterTests.pm (modified) (73 diffs)
• UnitTestContrib/test/unit/RenameTests.pm (modified) (16 diffs)
• UnitTestContrib/test/unit/RenderFormTests.pm (modified) (7 diffs)
• UnitTestContrib/test/unit/RequestTests.pm (modified) (30 diffs)
• UnitTestContrib/test/unit/ResponseTests.pm (modified) (9 diffs)
• UnitTestContrib/test/unit/RobustnessTests.pm (modified) (14 diffs)
• UnitTestContrib/test/unit/SaveScriptTests.pm (modified) (41 diffs)
• UnitTestContrib/test/unit/SemiAutomaticTestCaseTests.pm (modified) (4 diffs)
• UnitTestContrib/test/unit/StoreSmokeTests.pm (modified) (18 diffs)
• UnitTestContrib/test/unit/StoreTests.pm (modified) (14 diffs)
• UnitTestContrib/test/unit/TOCTests.pm (modified) (4 diffs)
• UnitTestContrib/test/unit/TemplatesTests.pm (modified) (8 diffs)
• UnitTestContrib/test/unit/TimeTests.pm (modified) (3 diffs)
• UnitTestContrib/test/unit/UTF8Tests.pm (modified) (3 diffs)
• UnitTestContrib/test/unit/UploadScriptTests.pm (modified) (8 diffs)
• UnitTestContrib/test/unit/VariableTests.pm (modified) (4 diffs)
• UnitTestContrib/test/unit/ViewParamSectionTests.pm (modified) (3 diffs)
• UnitTestContrib/test/unit/ViewScriptTests.pm (modified) (2 diffs)
• core/lib/Foswiki/LoginManager/ApacheLogin.pm (modified) (1 diff)

trunk/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib.pm

@@ -1 @@
-# Contrib for TWiki Collaboration Platform, http://TWiki.org/
+# Contrib for Foswiki Collaboration Platform, http://Foswiki.org/
 #
 # This program is free software; you can redistribute it and/or
@@ -12 +12 @@
 # http://www.gnu.org/copyleft/gpl.html
 
-package TWiki::Contrib::UnitTestContrib;
+package Foswiki::Contrib::UnitTestContrib;
 
 use strict;

trunk/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST

@@ -1 @@
-lib/TWiki/Contrib/UnitTestContrib.pm 0644
-lib/TWiki/UI/Test.pm 0644
+lib/Foswiki/Contrib/UnitTestContrib.pm 0644
+lib/Foswiki/UI/Test.pm 0644
 lib/Unit/Eavesdrop.pm 0644
 lib/Unit/HTMLDiffer.pm 0644
@@ -55 +55 @@
 test/unit/StoreTests.pm 0644
 test/unit/TOCTests.pm 0644
-test/unit/TWikiFnTestCase.pm 0644
-test/unit/TWikiSuite.pm 0644
-test/unit/TWikiTestCase.pm 0644
+test/unit/FoswikiFnTestCase.pm 0644
+test/unit/FoswikiSuite.pm 0644
+test/unit/FoswikiTestCase.pm 0644
 test/unit/TemplatesTests.pm 0644
 test/unit/TimeTests.pm 0644
@@ -65 +65 @@
 test/unit/ViewParamSectionTests.pm 0755
 test/unit/ViewScriptTests.pm 0644
-pub/TWiki/UnitTestContrib/wikiringlogo20x20.png 0660
-pub/TWiki/UnitTestContrib/logo.gif 0660
-data/TWiki/UnitTestContrib.txt 0660
+pub/Foswiki/UnitTestContrib/wikiringlogo20x20.png 0660
+pub/Foswiki/UnitTestContrib/logo.gif 0660
+data/Foswiki/UnitTestContrib.txt 0660

trunk/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/build.pl

@@ -3 +3 @@
     unshift @INC, split( /:/, $ENV{TWIKI_LIBS} );
 }
-use TWiki::Contrib::Build;
+use Foswiki::Contrib::Build;
 
 # Create the build object
-$build = new TWiki::Contrib::Build('UnitTestContrib');
+$build = new Foswiki::Contrib::Build('UnitTestContrib');
 
 # (Optional) Set the details of the repository for uploads.

trunk/UnitTestContrib/lib/Foswiki/UI/Test.pm

@@ -1 @@
-package TWiki::UI::Test;
+package Foswiki::UI::Test;
 
 use strict;

trunk/UnitTestContrib/lib/Unit/Request.pm

@@ -3 +3 @@
 
 BEGIN {
-    use TWiki;
+    use Foswiki;
     use CGI;
-    my ($release) = $TWiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
-    if ( $release >= 5 ) {
-        require TWiki::Request;
-        import TWiki::Request;
-        @Unit::Request::ISA = 'TWiki::Request';
+    my ($release) = $Foswiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
+    if ( $release >= 2 ) {
+        require Foswiki::Request;
+        import Foswiki::Request;
+        @Unit::Request::ISA = 'Foswiki::Request';
     }
     else {

trunk/UnitTestContrib/lib/Unit/Response.pm

@@ -5 +5 @@
 
 BEGIN {
-    use TWiki;
+    use Foswiki;
     use CGI;
-    my ($release) = $TWiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
+    my ($release) = $Foswiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
     no warnings qw(redefine);
-    if ( $release >= 5 ) {
-        require TWiki::Response;
-        import TWiki::Response;
-        @Unit::Response::ISA = qw(TWiki::Response);
-        my $twiki_new = \&TWiki::new;
-        *TWiki::new =
+    if ( $release >= 2 ) {
+        require Foswiki::Response;
+        import Foswiki::Response;
+        @Unit::Response::ISA = qw(Foswiki::Response);
+        my $twiki_new = \&Foswiki::new;
+        *Foswiki::new =
           sub { my $t = $twiki_new->(@_); $res = $t->{response}; return $t };
     }
@@ -20 +20 @@
         @Unit::Response::ISA = qw(CGI);
         *charset = sub { shift; CGI::charset(@_) };
-        my $twiki_new = \&TWiki::new;
-        *TWiki::new =
+        my $twiki_new = \&Foswiki::new;
+        *Foswiki::new =
           sub { my $t = $twiki_new->(@_); $res = $t->{cgiQuery}; return $t };
     }
-    my $twiki_finish = \&TWiki::finish;
-    *TWiki::finish = sub { $twiki_finish->(@_); $res = undef; };
+    my $twiki_finish = \&Foswiki::finish;
+    *Foswiki::finish = sub { $twiki_finish->(@_); $res = undef; };
 }
 
 sub new {
-    die "You must call Unit::Response::new() *after* TWiki::new()\n"
+    die "You must call Unit::Response::new() *after* Foswiki::new()\n"
       unless defined $res;
     bless $res, __PACKAGE__ unless $res->isa(__PACKAGE__);

trunk/UnitTestContrib/lib/Unit/TestCase.pm

@@ -283 +283 @@
     my @params = @_;
     my $result;
-    my ( $release ) = $TWiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
+    my ( $release ) = $Foswiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
 
     {
@@ -294 +294 @@
     if ( $release >= 5 ) {
         $response =
-          UNIVERSAL::isa( $params[0], 'TWiki' )
+          UNIVERSAL::isa( $params[0], 'Foswiki' )
           ? $params[0]->{response}
-          : $TWiki::Plugins::SESSION->{response};
+          : $Foswiki::Plugins::SESSION->{response};
 
         # Capture headers
-        TWiki::Engine->finalizeCookies($response);
+        Foswiki::Engine->finalizeCookies($response);
         foreach my $header ( keys %{ $response->headers } ) {
             $text .= $header . ': ' . $_ . "\x0D\x0A"

trunk/UnitTestContrib/test/bin/TestRunner.pl

@@ -20 +20 @@
 
 BEGIN {
-        $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
+        $Foswiki::cfg{Engine} = 'Foswiki::Engine::CGI';
     # root the tree
     my $here = Cwd::abs_path;
@@ -44 +44 @@
 
 use strict;
-use TWiki;   # If you take this out then TestRunner.pl will fail on IndigoPerl
+use Foswiki;   # If you take this out then TestRunner.pl will fail on IndigoPerl
 use Unit::TestRunner;
 
@@ -87 +87 @@
 if ($options{-clean}) {
     require File::Path;
-    my @x = glob "$TWiki::cfg{DataDir}/Temp*";
+    my @x = glob "$Foswiki::cfg{DataDir}/Temp*";
     File::Path::rmtree([@x]) if scalar(@x);
-    @x = glob "$TWiki::cfg{PubDir}/Temp*";
+    @x = glob "$Foswiki::cfg{PubDir}/Temp*";
     File::Path::rmtree([@x]) if scalar(@x);
 }
 
-testForFiles($TWiki::cfg{DataDir}.'/Temp*');
-testForFiles($TWiki::cfg{PubDir}.'/Temp*');
+testForFiles($Foswiki::cfg{DataDir}.'/Temp*');
+testForFiles($Foswiki::cfg{PubDir}.'/Temp*');
 
 my $testrunner = Unit::TestRunner->new();

trunk/UnitTestContrib/test/unit/AccessControlTests.pm

@@ -3 +3 @@
 package AccessControlTests;
 
-use base qw(TWikiFnTestCase);
+use base qw(FoswikiFnTestCase);
 
 sub new {
@@ -11 +11 @@
 }
 
-use TWiki;
-use TWiki::Access;
+use Foswiki;
+use Foswiki::Access;
 
 my $testTopic = "TemporaryTestTopic";
@@ -26 +26 @@
     my $this = shift;
     $this->SUPER::set_up();
-    $this->{twiki} = new TWiki();
-
-    $currUser = $TWiki::cfg{DefaultUserLogin};
+    $this->{twiki} = new Foswiki();
+
+    $currUser = $Foswiki::cfg{DefaultUserLogin};
     $this->{twiki}->{store}->saveTopic($this->{twiki}->{user},
-                               $TWiki::cfg{UsersWebName},
-                               $TWiki::cfg{DefaultUserWikiName},'');
+                               $Foswiki::cfg{UsersWebName},
+                               $Foswiki::cfg{DefaultUserWikiName},'');
     $this->registerUser(
         'white', 'Mr', "White", 'white@example.com');
@@ -87 +87 @@
                                 , undef);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
 
     $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrGreen);
@@ -107 +107 @@
                                 , undef);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrGreen);
     $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrYellow);
@@ -126 +126 @@
                                 , undef);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
     $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrGreen);
@@ -146 +146 @@
     my $topicquery = new Unit::Request( "" );
     $topicquery->path_info("/$this->{test_web}/$testTopic");
-    # renew TWiki, so WebPreferences gets re-read
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki(undef, $topicquery);
-    $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki(undef, $topicquery);
+    # renew Foswiki, so WebPreferences gets re-read
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki(undef, $topicquery);
+    $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki(undef, $topicquery);
     $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrGreen);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki(undef, $topicquery);
+    $this->{twiki} = new Foswiki(undef, $topicquery);
     $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrYellow);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki(undef, $topicquery);
-    $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrWhite);
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki(undef, $topicquery);
+    $this->{twiki} = new Foswiki(undef, $topicquery);
+    $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrWhite);
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki(undef, $topicquery);
     $this->DENIED($this->{test_web},$testTopic,"view",$MrBlue);
 }
@@ -174 +174 @@
 THIS
                                 , undef);
-    # renew TWiki, so WebPreferences gets re-read
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-    $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    # renew Foswiki, so WebPreferences gets re-read
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
+    $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
     $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrGreen);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrYellow);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-    $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrWhite);
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
+    $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrWhite);
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
     $this->DENIED($this->{test_web},$testTopic,"view",$MrBlue);
 }
@@ -202 +202 @@
 THIS
                                 , undef);
-    # renew TWiki, so WebPreferences gets re-read
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-    $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    # renew Foswiki, so WebPreferences gets re-read
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
+    $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
     $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrGreen);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrYellow);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-    $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrWhite);
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
+    $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrWhite);
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
     $this->DENIED($this->{test_web},$testTopic,"view",$MrBlue);
 }
@@ -222 +222 @@
 sub test_denyweb {
     my $this = shift;
-    $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $TWiki::cfg{WebPrefsTopicName},
+    $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $Foswiki::cfg{WebPrefsTopicName},
                                 <<THIS
 If DENYWEB is set to a list of wikiname
@@ -229 +229 @@
 THIS
                                 , undef);
-    # renew TWiki, so WebPreferences gets re-read
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    # renew Foswiki, so WebPreferences gets re-read
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic,
                                 "Null points");
@@ -244 +244 @@
     my $this = shift;
     $this->{twiki}->{store}->saveTopic(
-        $currUser, $this->{test_web}, $TWiki::cfg{WebPrefsTopicName},
+        $currUser, $this->{test_web}, $Foswiki::cfg{WebPrefsTopicName},
         <<THIS
 If ALLOWWEB is set to a list of wikinames
@@ -252 +252 @@
 THIS
                                 , undef);
-    # renew TWiki, so WebPreferences gets re-read
-    $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    # renew Foswiki, so WebPreferences gets re-read
+    $this->{twiki}->finish();
+    $this->{twiki} = new Foswiki();
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic,
                                 "Null points");
@@ -294 +294 @@
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic, 'Empty');
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
 
     my $text = <<THIS;
@@ -307 +307 @@
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic, 'Empty');
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-    my $meta = new TWiki::Meta($this->{twiki},$this->{test_web},$testTopic);
+    $this->{twiki} = new Foswiki();
+    my $meta = new Foswiki::Meta($this->{twiki},$this->{test_web},$testTopic);
     my $args =
       {
@@ -325 +325 @@
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic, 'Empty');
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-    my $meta = new TWiki::Meta($this->{twiki},$this->{test_web},$testTopic);
+    $this->{twiki} = new Foswiki();
+    my $meta = new Foswiki::Meta($this->{twiki},$this->{test_web},$testTopic);
     my $args =
       {
@@ -346 +346 @@
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic, 'Empty');
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     my $text = <<THIS;
 %META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="%25USERSWEB%25.MrGreen"}%
@@ -358 +358 @@
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic, 'Empty');
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-    my $meta = new TWiki::Meta($this->{twiki},$this->{test_web},$testTopic);
+    $this->{twiki} = new Foswiki();
+    my $meta = new Foswiki::Meta($this->{twiki},$this->{test_web},$testTopic);
     my $args =
       {
@@ -378 +378 @@
     my $subweb = "$this->{test_web}.SubWeb";
 
-    $TWiki::cfg{EnableHierarchicalWebs} = 1;
+    $Foswiki::cfg{EnableHierarchicalWebs} = 1;
     $this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $subweb);
     $this->{twiki}->{store}->saveTopic( $currUser, $this->{test_web}, $testTopic, "Nowt");
     $this->{twiki}->{store}->saveTopic(
-        $currUser, $this->{test_web}, $TWiki::cfg{WebPrefsTopicName},
+        $currUser, $this->{test_web}, $Foswiki::cfg{WebPrefsTopicName},
         <<THIS, undef);
 \t* Set ALLOWWEBVIEW = MrGreen
 THIS
     $this->{twiki}->{store}->saveTopic(
-        $currUser, $subweb, $TWiki::cfg{WebPrefsTopicName},
+        $currUser, $subweb, $Foswiki::cfg{WebPrefsTopicName},
         <<THIS, undef);
 \t* Set ALLOWWEBVIEW = MrOrange
 THIS
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->PERMITTED($subweb,$testTopic,"VIEW",$MrOrange);
     $this->DENIED($subweb,$testTopic,"VIEW",$MrGreen);
@@ -410 +410 @@
                                 , undef);
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->PERMITTED($this->{test_web},$testTopic,"VIEW",$MrOrange);
     $this->DENIED($this->{test_web},$testTopic,"VIEW",$MrGreen);

trunk/UnitTestContrib/test/unit/AddToHeadTests.pm

@@ -5 +5 @@
 package AddToHeadTests;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
@@ -71 +71 @@
     my $topicName = $this->{test_topic};
     my $webName   = $this->{test_web};
-    TWiki::Func::addToHEAD("first", "QQQ");
+    Foswiki::Func::addToHEAD("first", "QQQ");
     my $raw_tag  = '%RENDERHEAD%';
     my $expected = "<!-- first --> QQQ";
@@ -84 +84 @@
     my $topicName = $this->{test_topic};
     my $webName   = $this->{test_web};
-    TWiki::Func::addToHEAD("first", "QQQ FIRST");
-    TWiki::Func::addToHEAD("second", "QQQ SECOND", "third");
-    TWiki::Func::addToHEAD("third", "QQQ THIRD");
+    Foswiki::Func::addToHEAD("first", "QQQ FIRST");
+    Foswiki::Func::addToHEAD("second", "QQQ SECOND", "third");
+    Foswiki::Func::addToHEAD("third", "QQQ THIRD");
     my $raw_tag  = '%RENDERHEAD%';
     my $expected = "<!-- first --> QQQ FIRST"
@@ -107 +107 @@
     my $topicName = $this->{test_topic};
     my $webName   = $this->{test_web};
-    TWiki::Func::addToHEAD('PATTERN_STYLE','<link id="twikiLayoutCss" rel="stylesheet" type="text/css" href="PatternSkin/layout.css" media="all" />');
+    Foswiki::Func::addToHEAD('PATTERN_STYLE','<link id="twikiLayoutCss" rel="stylesheet" type="text/css" href="PatternSkin/layout.css" media="all" />');
     my $raw_tag  = '%RENDERHEAD%';
     my $expected = '<!-- PATTERN_STYLE --> <link id="twikiLayoutCss" rel="stylesheet" type="text/css" href="PatternSkin/layout.css" media="all" />';

trunk/UnitTestContrib/test/unit/AttrsTests.pm

@@ -3 +3 @@
 package AttrsTests;
 
-use base qw(TWikiTestCase);
-
-use TWiki::Attrs;
+use base qw(FoswikiTestCase);
+
+use Foswiki::Attrs;
 
 sub new {
@@ -15 +15 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new(undef, 1);
-        $this->assert($attrs->isEmpty());
-        $attrs = TWiki::Attrs->new("", 1);
-        $this->assert($attrs->isEmpty());
-        $attrs = TWiki::Attrs->new(" \t  \n\t", 1);
+        my $attrs = Foswiki::Attrs->new(undef, 1);
+        $this->assert($attrs->isEmpty());
+        $attrs = Foswiki::Attrs->new("", 1);
+        $this->assert($attrs->isEmpty());
+        $attrs = Foswiki::Attrs->new(" \t  \n\t", 1);
         $this->assert($attrs->isEmpty());
 }
@@ -26 +26 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("a", 1);
+        my $attrs = Foswiki::Attrs->new("a", 1);
         $this->assert(!$attrs->isEmpty());
         $this->assert_not_null($attrs->{"a"});
         $this->assert_str_equals("1", $attrs->{"a"});
 
-        $attrs = TWiki::Attrs->new("a12g b987", 1);
+        $attrs = Foswiki::Attrs->new("a12g b987", 1);
         $this->assert_not_null($attrs->remove("a12g"));
         $this->assert_null($attrs->{"a12g"});
@@ -38 +38 @@
         $this->assert($attrs->isEmpty(), "Fail ".$attrs->stringify());
 
-        $attrs = TWiki::Attrs->new("Acid AnhydrousCopperSulphate='white' X", 1);
+        $attrs = Foswiki::Attrs->new("Acid AnhydrousCopperSulphate='white' X", 1);
         $this->assert_not_null($attrs->remove("Acid"));
         $this->assert_not_null($attrs->remove("X"));
@@ -48 +48 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("\"wibble\"", 1);
+        my $attrs = Foswiki::Attrs->new("\"wibble\"", 1);
         $this->assert(!$attrs->isEmpty());
         $this->assert_str_equals("wibble", $attrs->remove("_DEFAULT"));
@@ -54 +54 @@
         $this->assert($attrs->isEmpty());
 
-        $attrs = TWiki::Attrs->new("\"wibble\" \"fleegle\"", 1);
+        $attrs = Foswiki::Attrs->new("\"wibble\" \"fleegle\"", 1);
         $this->assert_str_equals("wibble", $attrs->remove("_DEFAULT"));
         $this->assert($attrs->isEmpty());
@@ -62 +62 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("var1=val1 var2= val2, var3 = 3 var4 =val4", 1);
+        my $attrs = Foswiki::Attrs->new("var1=val1 var2= val2, var3 = 3 var4 =val4", 1);
         $this->assert_str_equals("val1", $attrs->remove("var1"));
         $this->assert_str_equals("val2", $attrs->remove("var2"));
@@ -73 +73 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("var1=\\\"val1 var2= \\\'val2, var3 = 3 var4 =val4", 1);
+        my $attrs = Foswiki::Attrs->new("var1=\\\"val1 var2= \\\'val2, var3 = 3 var4 =val4", 1);
         $this->assert_str_equals("\"val1", $attrs->remove("var1"));
         $this->assert_str_equals("\'val2", $attrs->remove("var2"));
@@ -84 +84 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("var1 =\"val 1\", var2= \"val 2\" \" default \" var3 = \" val 3 \"", 1);
+        my $attrs = Foswiki::Attrs->new("var1 =\"val 1\", var2= \"val 2\" \" default \" var3 = \" val 3 \"", 1);
         $this->assert_str_equals("val 1", $attrs->remove("var1"));
         $this->assert_str_equals("val 2", $attrs->remove("var2"));
@@ -95 +95 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("var1 ='val 1', var2= 'val 2' ' default ' var3 = ' val 3 '", 1);
+        my $attrs = Foswiki::Attrs->new("var1 ='val 1', var2= 'val 2' ' default ' var3 = ' val 3 '", 1);
         $this->assert_str_equals("val 1", $attrs->remove("var1"));
         $this->assert_str_equals("val 2", $attrs->remove("var2"));
@@ -106 +106 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("a ='\"', b=\"'\" \"'\"", 1);
+        my $attrs = Foswiki::Attrs->new("a ='\"', b=\"'\" \"'\"", 1);
         $this->assert_str_equals("\"", $attrs->remove("a"));
         $this->assert_str_equals("'", $attrs->remove("b"));
         $this->assert_str_equals("'", $attrs->remove("_DEFAULT"));
         $this->assert($attrs->isEmpty());
-        $attrs = TWiki::Attrs->new("'\"'", 1);
+        $attrs = Foswiki::Attrs->new("'\"'", 1);
         $this->assert_str_equals("\"", $attrs->remove("_DEFAULT"));
         $this->assert($attrs->isEmpty());
@@ -119 +119 @@
         my $this = shift;
 
-        my $attrs = TWiki::Attrs->new("a ='\"', b=\"'\" \"'\"", 1);
+        my $attrs = Foswiki::Attrs->new("a ='\"', b=\"'\" \"'\"", 1);
         my $s = $attrs->stringify();
-        $attrs = TWiki::Attrs->new($attrs->stringify(), 1);
+        $attrs = Foswiki::Attrs->new($attrs->stringify(), 1);
         $this->assert_str_equals("\"", $attrs->remove("a"));
         $this->assert_str_equals("'", $attrs->remove("b"));
@@ -133 +133 @@
     my $s = '"abc def="ghi" jkl" def="mno" pqr=" stu="vwx""';
     $this->assert_str_equals('abc def="ghi" jkl',
-                             TWiki::Attrs::extractValue($s));
+                             Foswiki::Attrs::extractValue($s));
 }
 
@@ -141 +141 @@
     my $s = '"abc def="ghi" jkl" def="mno" pqr=" stu="vwx""';
     $this->assert_str_equals('ghi',
-                             TWiki::Attrs::extractValue($s, "def"));
+                             Foswiki::Attrs::extractValue($s, "def"));
 }
 
@@ -149 +149 @@
     my $s = '"abc def="ghi" jkl" def="mno" pqr=" stu="vwx""';
     $this->assert_str_equals('',
-                             TWiki::Attrs::extractValue($s, "jkl"));
+                             Foswiki::Attrs::extractValue($s, "jkl"));
 }
 
@@ -157 +157 @@
     my $s = '"abc def="ghi" jkl" def="mno" pqr=" stu="vwx""';
     $this->assert_str_equals(' stu=',
-                             TWiki::Attrs::extractValue($s, 'pqr'));
+                             Foswiki::Attrs::extractValue($s, 'pqr'));
 }
 
@@ -165 +165 @@
     my $s = '"abc def="ghi" jkl" def="mno" pqr=" stu="vwx""';
     $this->assert_str_equals('vwx',
-                             TWiki::Attrs::extractValue($s, 'stu'));
+                             Foswiki::Attrs::extractValue($s, 'stu'));
 }
 
@@ -217 +217 @@
     my( $this, $s ) = @_;
 
-    my $new = new TWiki::Attrs($s,0);
+    my $new = new Foswiki::Attrs($s,0);
     my %old = extractParameters($s);
 
@@ -253 +253 @@
     my $this = shift;
     my $s = "\nBarf";
-    my $new = new TWiki::Attrs($s,0);
+    my $new = new Foswiki::Attrs($s,0);
     $s = "Barf\n";
-    $new = new TWiki::Attrs($s,0);
+    $new = new Foswiki::Attrs($s,0);
     $s = "\n";
-    $new = new TWiki::Attrs($s,0);
+    $new = new Foswiki::Attrs($s,0);
     $s = "\"The\nCat\" format=\"Shat\nOn\nThe\nMat\"";
     $this->check_string( $s );
@@ -265 +265 @@
     my $this = shift;
     my $s = "   Barf";
-    my $new = new TWiki::Attrs($s,0);
+    my $new = new Foswiki::Attrs($s,0);
     $this->assert_str_equals($s, $new->{_RAW});
 }

trunk/UnitTestContrib/test/unit/AutoAttachTests.pm

@@ -3 +3 @@
 # Test cases:
 # 1) Autoattach = off. Save a topic referring to an attachmentMissing that does not exist.
-# 2) Add attachmentAdded into the attachment area for that topic, circumventing TWiki
+# 2) Add attachmentAdded into the attachment area for that topic, circumventing Foswiki
 # 3) Turn autoattach = on. Ask for the list of attachments. attachmentAdded should appear. attachmentMissing should not.
 
 package AutoAttachTests;
-use base qw(TWikiFnTestCase);
+use base qw(FoswikiFnTestCase);
 
 use strict;
-use TWiki;
-use TWiki::Meta;
+use Foswiki;
+use Foswiki::Meta;
 use Error qw( :try );
-use TWiki::UI::Save;
-use TWiki::OopsException;
+use Foswiki::UI::Save;
+use Foswiki::OopsException;
 use Devel::Symdump;
 
@@ -72 +72 @@
     my $this = shift;
     my ($topic, @filenames) = @_;
-    my $dir = $TWiki::cfg{PubDir};
+    my $dir = $Foswiki::cfg{PubDir};
     $dir = "$dir/$this->{test_web}/$topic";
     #print STDERR "DEBUG: dir=$dir\n";
@@ -94 +94 @@
 
 sub test_autoattach {
-#   print "Default AutoAttachPubFiles = $TWiki::cfg{AutoAttachPubFiles}\n";
-    $TWiki::cfg{AutoAttachPubFiles} = 1;
-#   print "AutoAttachPubFiles now = $TWiki::cfg{AutoAttachPubFiles}\n";
+#   print "Default AutoAttachPubFiles = $Foswiki::cfg{AutoAttachPubFiles}\n";
+    $Foswiki::cfg{AutoAttachPubFiles} = 1;
+#   print "AutoAttachPubFiles now = $Foswiki::cfg{AutoAttachPubFiles}\n";
 
     my $this = shift; 
@@ -103 +103 @@
     $this->verify_normal_attachment($topic, "afile.txt");
     $this->verify_normal_attachment($topic, "bfile.txt");
-    $this->addMissingAttachment($topic, 'bogusAttachment.txt', "I'm a figment of TWiki's imagination");
+    $this->addMissingAttachment($topic, 'bogusAttachment.txt', "I'm a figment of Foswiki's imagination");
     $this->addMissingAttachment($topic, 'ressurectedComment.txt', 'ressurected attachment comment');
     $this->sneakAttachmentsAddedToTopic($topic, 'sneakedfile1.txt','sneakedfile2.txt', 'commavfilesshouldbeignored2.txt,v','_hiddenAttachment.txt', 'ressurectedComment.txt');
@@ -169 +169 @@
     $this->assert($this->{twiki}->{store}->topicExists($this->{test_web}, $topic));
 
-    open( FILE, ">$TWiki::cfg{TempfileDir}/$attachment" );
+    open( FILE, ">$Foswiki::cfg{TempfileDir}/$attachment" );
     print FILE "Test attachment\n";
     close(FILE);
@@ -179 +179 @@
     $this->{twiki}->{store}->saveAttachment(
         $this->{test_web}, $topic, $attachment, $this->{test_user_wikiname},
-        { file => "$TWiki::cfg{TempfileDir}/$attachment", comment => 'comment 1' } );
-
-    unlink "$TWiki::cfg{TempfileDir}/$attachment";
+        { file => "$Foswiki::cfg{TempfileDir}/$attachment", comment => 'comment 1' } );
+
+    unlink "$Foswiki::cfg{TempfileDir}/$attachment";
 
     # Check revision number

trunk/UnitTestContrib/test/unit/CGIEngineTests.pm

@@ -9 +9 @@
 
 BEGIN {
-    $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
+    $Foswiki::cfg{Engine} = 'Foswiki::Engine::CGI';
 }
 
-use TWiki;
-use TWiki::Response;
-use TWiki::UI;
+use Foswiki;
+use Foswiki::Response;
+use Foswiki::UI;
 
 use File::Temp;
@@ -20 +20 @@
 use Data::Dumper;
 
-$TWiki::cfg{SwitchBoard}{test} = [ 'TWiki::UI::Test', 'test', { test => 1 } ];
+$Foswiki::cfg{SwitchBoard}{test} = [ 'Foswiki::UI::Test', 'test', { test => 1 } ];
 
 sub cgi_env {
@@ -42 +42 @@
 
     %ENV = cgi_env;
-    my $res = new TWiki::Response();
+    my $res = new Foswiki::Response();
     $res->header(-type => 'text/plain', charset => 'iso8859-1');
     $res->body("Teste!\n");
-    $ENV{QUERY_STRING} = 'desired_test_response='.TWiki::urlEncode(freeze($res));
+    $ENV{QUERY_STRING} = 'desired_test_response='.Foswiki::urlEncode(freeze($res));
     my $out = '';
     open my $stdout, '>&', \*STDOUT;
     close STDOUT;
     open STDOUT, '>', \$out;
-    $TWiki::engine->run();
+    $Foswiki::engine->run();
     open STDOUT, '>&', $stdout;
     $out =~ /(?:\r?\n){2}(.*)/s;

trunk/UnitTestContrib/test/unit/ClientTests.pm

@@ -6 +6 @@
 # LoginManager.pm compiles okay.
 
-use base qw(TWikiFnTestCase);
+use base qw(FoswikiFnTestCase);
 
 use Unit::Request;
 use Error qw( :try );
 
-use TWiki;
-use TWiki::LoginManager;
-use TWiki::UI::View;
-use TWiki::UI::Edit;
+use Foswiki;
+use Foswiki::LoginManager;
+use Foswiki::UI::View;
+use Foswiki::UI::Edit;
 
-my $agent = $TWiki::cfg{Register}{RegistrationAgentWikiName};
+my $agent = $Foswiki::cfg{Register}{RegistrationAgentWikiName};
 my $userLogin;
 my $userWikiName;
@@ -32 +32 @@
 
 sub TemplateLoginManager {
-    $TWiki::cfg{LoginManager} = 'TWiki::LoginManager::TemplateLogin';
+    $Foswiki::cfg{LoginManager} = 'Foswiki::LoginManager::TemplateLogin';
 }
 
 sub ApacheLoginManager {
-    $TWiki::cfg{LoginManager} = 'TWiki::LoginManager::ApacheLogin';
+    $Foswiki::cfg{LoginManager} = 'Foswiki::LoginManager::ApacheLogin';
 }
 
 sub NoLoginManager {
-    $TWiki::cfg{LoginManager} = 'none';
+    $Foswiki::cfg{LoginManager} = 'none';
 }
 
 sub BaseUserMapping {
     my $this = shift;
-    $TWiki::cfg{UserMappingManager} = 'TWiki::Users::BaseUserMapping';
+    $Foswiki::cfg{UserMappingManager} = 'Foswiki::Users::BaseUserMapping';
     $this->set_up_for_verify();
 }
@@ -51 +51 @@
 sub TopicUserMapping {
     my $this = shift;
-    $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TopicUserMapping';
+    $Foswiki::cfg{UserMappingManager} = 'Foswiki::Users::TopicUserMapping';
     $this->set_up_for_verify();
 }
@@ -67 +67 @@
 
     $this->{twiki}->finish() if $this->{twiki};
-    $this->{twiki} = new TWiki(undef, new Unit::Request());
-    $this->assert($TWiki::cfg{TempfileDir} && -d $TWiki::cfg{TempfileDir});
-    $TWiki::cfg{UseClientSessions} = 1;
-    $TWiki::cfg{PasswordManager} = "TWiki::Users::HtPasswdUser";
-    $TWiki::cfg{Htpasswd}{FileName} = "$TWiki::cfg{TempfileDir}/htpasswd";
-    $TWiki::cfg{AuthScripts} = "edit";
-    $TWiki::cfg{Register}{EnableNewUserRegistration} = 1;
-    $TWiki::cfg{UsersWebName} = $this->{users_web};
+    $this->{twiki} = new Foswiki(undef, new Unit::Request());
+    $this->assert($Foswiki::cfg{TempfileDir} && -d $Foswiki::cfg{TempfileDir});
+    $Foswiki::cfg{UseClientSessions} = 1;
+    $Foswiki::cfg{PasswordManager} = "Foswiki::Users::HtPasswdUser";
+    $Foswiki::cfg{Htpasswd}{FileName} = "$Foswiki::cfg{TempfileDir}/htpasswd";
+    $Foswiki::cfg{AuthScripts} = "edit";
+    $Foswiki::cfg{Register}{EnableNewUserRegistration} = 1;
+    $Foswiki::cfg{UsersWebName} = $this->{users_web};
 }
 
@@ -85 +85 @@
             $this->annotate("create $userLogin user - cUID = $user_id\n");
     } else {
-        $userLogin = $TWiki::cfg{AdminUserLogin};
+        $userLogin = $Foswiki::cfg{AdminUserLogin};
         $user_id = $this->{twiki}->{users}->getCanonicalUserID($userLogin);
         $userWikiName = $this->{twiki}->{users}->getWikiName($user_id);
@@ -106 +106 @@
     my ( $query, $text );
 
-    #close this TWiki session - its using the wrong mapper and login
+    #close this Foswiki session - its using the wrong mapper and login
     $this->{twiki}->finish();
 
     $query = new Unit::Request();
     $query->path_info( "/$this->{test_web}/$this->{test_topic}" );
-    $this->{twiki} = new TWiki( undef, $query );
+    $this->{twiki} = new Foswiki( undef, $query );
 
     $this->set_up_user();
     try {
-        $text = $this->capture( \&TWiki::UI::View::view, $this->{twiki} );
-    } catch TWiki::OopsException with {
+        $text = $this->capture( \&Foswiki::UI::View::view, $this->{twiki} );
+    } catch Foswiki::OopsException with {
         $this->assert(0,shift->stringify());
     } catch Error::Simple with {
@@ -126 +126 @@
     $this->{twiki}->finish();
 
-    $this->{twiki} = new TWiki( undef, $query );
+    $this->{twiki} = new Foswiki( undef, $query );
 
     try {
-        $text = $this->capture( \&TWiki::UI::Edit::edit, $this->{twiki} );
-    } catch TWiki::AccessControlException with {
+        $text = $this->capture( \&Foswiki::UI::Edit::edit, $this->{twiki} );
+    } catch Foswiki::AccessControlException with {
     } catch Error::Simple with {
         $this->assert(0,shift->stringify());
     } otherwise {
-        unless( $TWiki::cfg{LoginManager} eq 'none' ) {
+        unless( $Foswiki::cfg{LoginManager} eq 'none' ) {
             $this->assert(0, "expected an access control exception: ".
-                            $TWiki::cfg{LoginManager}."\n$text");
+                            $Foswiki::cfg{LoginManager}."\n$text");
         }
     };
@@ -146 +146 @@
     $this->annotate("new session using $userLogin\n");
 
-    $this->{twiki} = new TWiki( $userLogin, $query );
+    $this->{twiki} = new Foswiki( $userLogin, $query );
 
     #clear the lease - one of the previous tests may have different usermapper & thus different user
-    TWiki::Func::setTopicEditLock($this->{test_web}, $this->{test_topic}, 0);
+    Foswiki::Func::setTopicEditLock($this->{test_web}, $this->{test_topic}, 0);
 }
 
@@ -161 +161 @@
     my $secret = "a big mole on my left buttock";
     my $crypted = crypt($secret, "12");
-    $TWiki::cfg{Password} = $crypted;
+    $Foswiki::cfg{Password} = $crypted;
 
     my $query = new Unit::Request({
-        username => [ $TWiki::cfg{AdminUserLogin} ],
+        username => [ $Foswiki::cfg{AdminUserLogin} ],
         password => [ $secret ],
         Logon => [ 1 ],
@@ -171 +171 @@
     $query->path_info( "/$this->{test_web}/$this->{test_topic}" );
 
-    $this->{twiki} = new TWiki(undef, $query);
+    $this->{twiki} = new Foswiki(undef, $query);
     my ($text, $result) = $this->capture(
         sub {

trunk/UnitTestContrib/test/unit/ConfigureTests.pm

@@ -3 +3 @@
 use strict;
 
-use base qw(TWikiTestCase);
+use base qw(FoswikiTestCase);
 
 use Error qw( :try );
 use File::Temp;
 
-use TWiki::Configure::TWikiCfg;
-use TWiki::Configure::Root;
-use TWiki::Configure::Valuer;
-use TWiki::Configure::UI;
+use Foswiki::Configure::FoswikiCfg;
+use Foswiki::Configure::Root;
+use Foswiki::Configure::Valuer;
+use Foswiki::Configure::UI;
 
 # Parse a cfg; change some values; save the changes
@@ -20 +20 @@
     my %cfg = (guff=>"muff");
 
-    my $valuer = new TWiki::Configure::Valuer(\%defaultCfg, \%cfg);
-    my $root = new TWiki::Configure::Root();
+    my $valuer = new Foswiki::Configure::Valuer(\%defaultCfg, \%cfg);
+    my $root = new Foswiki::Configure::Root();
     my ($fh, $fhname) = File::Temp::tempfile(unlink=>1);
     print $fh <<'EXAMPLE';
@@ -45 +45 @@
 #---+ Three
 # ---++++ Three.1.1.One
-# **SELECTCLASS TWiki::Configure::Types::***
-$cfg{Types}{Chosen} = 'TWiki::Configure::Types::BOOLEAN';
+# **SELECTCLASS Foswiki::Configure::Types::***
+$cfg{Types}{Chosen} = 'Foswiki::Configure::Types::BOOLEAN';
 1;
 EXAMPLE
@@ -56 +56 @@
     }
 
-    TWiki::Configure::TWikiCfg::_parse($fhname, $root, 1);
+    Foswiki::Configure::FoswikiCfg::_parse($fhname, $root, 1);
 
     # nothing should have changed
-    my $saver = new TWiki::Configure::TWikiCfg();
+    my $saver = new Foswiki::Configure::FoswikiCfg();
     $saver->{valuer} = $valuer;
     $saver->{root} = $root;
@@ -69 +69 @@
     $cfg{MandatoryPath} = 'fixed';
     $cfg{MandatoryBoolean} = 0;
-    $cfg{Types}{Chosen} = 'TWiki::Configure::Types::STRING';
+    $cfg{Types}{Chosen} = 'Foswiki::Configure::Types::STRING';
     $cfg{OptionalRegex} = qr/^X*$/;
     $cfg{DontIgnore} = 'now is';
@@ -75 +75 @@
     $out = $saver->_save();
     my $expectacle = <<'EXAMPLE';
-$TWiki::cfg{MandatoryBoolean} = 0;
-$TWiki::cfg{MandatoryPath} = 'fixed';
-$TWiki::cfg{OptionalRegex} = '^X*$';
-$TWiki::cfg{DontIgnore} = 'now is';
-$TWiki::cfg{Types}{Chosen} = 'TWiki::Configure::Types::STRING';
+$Foswiki::cfg{MandatoryBoolean} = 0;
+$Foswiki::cfg{MandatoryPath} = 'fixed';
+$Foswiki::cfg{OptionalRegex} = '^X*$';
+$Foswiki::cfg{DontIgnore} = 'now is';
+$Foswiki::cfg{Types}{Chosen} = 'Foswiki::Configure::Types::STRING';
 1;
 EXAMPLE
@@ -92 +92 @@
 sub test_2parse {
     my $this = shift;
-    my $root = new TWiki::Configure::Root();
+    my $root = new Foswiki::Configure::Root();
 
     $this->assert_null($root->getValueObject('{One}'));
@@ -100 +100 @@
     print $f1 <<'EXAMPLE';
 # **STRING 10**
-$TWiki::cfg{One} = 'One';
-1;
-EXAMPLE
-    $f1->close();
-    TWiki::Configure::TWikiCfg::_parse($f1name, $root);
+$Foswiki::cfg{One} = 'One';
+1;
+EXAMPLE
+    $f1->close();
+    Foswiki::Configure::FoswikiCfg::_parse($f1name, $root);
 
     $this->assert_not_null($root->getValueObject('{One}'));
@@ -112 +112 @@
     print $f2 <<'EXAMPLE';
 # **STRING 10**
-$TWiki::cfg{Two} = 'Two';
+$Foswiki::cfg{Two} = 'Two';
 1;
 EXAMPLE
     $f2->close();
-    TWiki::Configure::TWikiCfg::_parse($f2name, $root);
+    Foswiki::Configure::FoswikiCfg::_parse($f2name, $root);
 
     # make sure they are both present
@@ -125 +125 @@
 sub test_loadpluggables {
     my $this = shift;
-    my $root = new TWiki::Configure::Root();
+    my $root = new Foswiki::Configure::Root();
     my ($f1, $f1name) = File::Temp::tempfile(unlink=>1);
     print $f1 <<'EXAMPLE';
 # *LANGUAGES*
 # *PLUGINS*
-$TWiki::cfg{Plugins}{CommentPlugin}{Enabled} = 0;
-1;
-EXAMPLE
-    $f1->close();
-    TWiki::Configure::TWikiCfg::_parse($f1name, $root);
+$Foswiki::cfg{Plugins}{CommentPlugin}{Enabled} = 0;
+1;
+EXAMPLE
+    $f1->close();
+    Foswiki::Configure::FoswikiCfg::_parse($f1name, $root);
     my $vo = $root->getValueObject('{Plugins}{CommentPlugin}{Enabled}');
     $this->assert_not_null($vo);
@@ -147 +147 @@
     my $this = shift;
 
-    my $root = new TWiki::Configure::Root();
+    my $root = new Foswiki::Configure::Root();
 
     my ($f1, $f1name) = File::Temp::tempfile(unlink=>1);
@@ -153 +153 @@
 # **STRING 10**
 # Good description
-$TWiki::cfg{One} = 'One';
-$TWiki::cfg{Two} = 'One';
-1;
-EXAMPLE
-    $f1->close();
-    TWiki::Configure::TWikiCfg::_parse($f1name, $root);
+$Foswiki::cfg{One} = 'One';
+$Foswiki::cfg{Two} = 'One';
+1;
+EXAMPLE
+    $f1->close();
+    Foswiki::Configure::FoswikiCfg::_parse($f1name, $root);
 
     my $vo = $root->getValueObject('{One}');
@@ -168 +168 @@
     my ($f2, $f2name) = File::Temp::tempfile(unlink=>1);
     print $f2 <<'EXAMPLE';
-$TWiki::cfg{Two} = 'Two';
+$Foswiki::cfg{Two} = 'Two';
 # **BOOLEAN 10**
 # Bad description
-$TWiki::cfg{One} = 'One';
-$TWiki::cfg{Three} = 'Three';
+$Foswiki::cfg{One} = 'One';
+$Foswiki::cfg{Three} = 'Three';
 1;
 EXAMPLE
     $f2->close();
-    TWiki::Configure::TWikiCfg::_parse($f2name, $root);
+    Foswiki::Configure::FoswikiCfg::_parse($f2name, $root);
 
     $vo = $root->getValueObject('{One}');
@@ -198 +198 @@
     $cfg{Two} = 'Two';
     $cfg{Three} = 'Three';
-    my $valuer = new TWiki::Configure::Valuer(\%defaultCfg, \%cfg);
-    my $root = new TWiki::Configure::Root();
+    my $valuer = new Foswiki::Configure::Valuer(\%defaultCfg, \%cfg);
+    my $root = new Foswiki::Configure::Root();
 
     my ($f1, $f1name) = File::Temp::tempfile(unlink=>1);
@@ -214 +214 @@
 EXAMPLE
     $f1->close();
-    TWiki::Configure::TWikiCfg::_parse($f1name, $root, 1);
+    Foswiki::Configure::FoswikiCfg::_parse($f1name, $root, 1);
     foreach my $k (keys %cfg) {
         $defaultCfg{$k} = $cfg{$k};
@@ -221 +221 @@
     $cfg{Two} = 2;
     $cfg{Three} = 3;
-    my $saver = new TWiki::Configure::TWikiCfg();
+    my $saver = new Foswiki::Configure::FoswikiCfg();
     $saver->{valuer} = $valuer;
     $saver->{root} = $root;
@@ -227 +227 @@
     my $out = $saver->_save();
     my $expectorate = <<'SPUTUM';
-$TWiki::cfg{One} = 1;
-$TWiki::cfg{Two} = 2;
-$TWiki::cfg{Three} = 3;
+$Foswiki::cfg{One} = 1;
+$Foswiki::cfg{Two} = 2;
+$Foswiki::cfg{Three} = 3;
 1;
 SPUTUM
@@ -237 +237 @@
 sub test_UI {
     my $this = shift;
-    my $root = new TWiki::Configure::Root();
+    my $root = new Foswiki::Configure::Root();
     my %defaultCfg = (Value=>"before");
     my %cfg = (Value=>"after");
-    my $valuer = new TWiki::Configure::Valuer(\%defaultCfg, \%cfg);
-
-    my ($f1, $f1name) = File::Temp::tempfile(unlink=>1);
-    print $f1 <<'EXAMPLE';
-# **STRING 10**
-$TWiki::cfg{One} = 'One';
-# **STRING 10**
-$TWiki::cfg{Two} = 'Two';
+    my $valuer = new Foswiki::Configure::Valuer(\%defaultCfg, \%cfg);
+
+    my ($f1, $f1name) = File::Temp::tempfile(unlink=>1);
+    print $f1 <<'EXAMPLE';
+# **STRING 10**
+$Foswiki::cfg{One} = 'One';
+# **STRING 10**
+$Foswiki::cfg{Two} = 'Two';
 # ---+ Plugins
 # *PLUGINS*
@@ -253 +253 @@
 EXAMPLE
     $f1->close();
-    TWiki::Configure::TWikiCfg::_parse($f1name, $root);
+    Foswiki::Configure::FoswikiCfg::_parse($f1name, $root);
 
     foreach my $k (keys %cfg) {
@@ -262 +262 @@
     $defaultCfg{One} = "Eno";
 
-    my $ui = TWiki::Configure::UI::loadUI('Root', $root);
+    my $ui = Foswiki::Configure::UI::loadUI('Root', $root);
     my $result = $ui->ui($root, $valuer);
     # visual check
@@ -269 +269 @@
 
 #                print F '| ',gmtime(),' | ',$this->{user},' | ',$txt," |\n";
-#            if( $TWiki::cfg{ConfigurationLogName} &&
-#                  open(F, '>>'.$TWiki::cfg{ConfigurationLogName} )) {
+#            if( $Foswiki::cfg{ConfigurationLogName} &&
+#                  open(F, '>>'.$Foswiki::cfg{ConfigurationLogName} )) {
 #                print F '| ',gmtime(),' | ',$this->{user},' | ',$txt," |\n";
 #                close(F);

trunk/UnitTestContrib/test/unit/EmptyTests.pm

@@ -5 +5 @@
 package EmptyTests;
 
-use base qw( TWikiTestCase );
+use base qw( FoswikiTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
@@ -17 +17 @@
     $this->SUPER::set_up();
 
-    # You can now safely modify $TWiki::cfg
+    # You can now safely modify $Foswiki::cfg
 
     $topicquery = new Unit::Request( '' );
     $topicquery->path_info( '/TestCases/WebHome' );
     try {
-        $this->{twiki} = new TWiki( 'AdminUser' || '' );
+        $this->{twiki} = new Foswiki( 'AdminUser' || '' );
         my $user = $this->{twiki}->{user};
 
@@ -37 +37 @@
             $user,
             "Temporarytwikiweb",
-            "TWiki");
+            "System");
 
         # Create a topic like this:
@@ -44 +44 @@
         # to make sure you fixture protects things like .htpasswd
 
-    } catch TWiki::AccessControlException with {
+    } catch Foswiki::AccessControlException with {
         my $e = shift;
         die "???" unless $e;

trunk/UnitTestContrib/test/unit/ExampleTests.pm

@@ -4 +4 @@
 package ExampleTests;
 
-use base qw(TWikiTestCase);
+use base qw(FoswikiTestCase);
 
-use TWiki;
+use Foswiki;
 
 sub set_up {

trunk/UnitTestContrib/test/unit/ExceptionTests.pm

@@ -1 +1 @@
 package ExceptionTests;
-use base TWikiTestCase;
+use base FoswikiTestCase;
 
 use strict;
 
 use Error qw( :try );
-use TWiki::OopsException;
-use TWiki::UI::Oops;
+use Foswiki::OopsException;
+use Foswiki::UI::Oops;
 
 # Check an OopsException with one non-array parameter
@@ -12 +12 @@
     my $this = shift;
     try {
-        throw TWiki::OopsException(
+        throw Foswiki::OopsException(
             'templatename',
             web => 'webname',
@@ -19 +19 @@
             keep => 1,
             params => 'phlegm');
-    } catch TWiki::OopsException with {
+    } catch Foswiki::OopsException with {
         my $e = shift;
-        $this->assert($e->isa('TWiki::OopsException'));
+        $this->assert($e->isa('Foswiki::OopsException'));
         $this->assert_str_equals('webname', $e->{web});
         $this->assert_str_equals('topicname', $e->{topic});
@@ -37 +37 @@
     my $this = shift;
     try {
-        throw TWiki::OopsException(
+        throw Foswiki::OopsException(
             'templatename',
             web => 'webname',
             topic => 'topicname',
             params => [ 'phlegm', '<pus>' ]);
-    } catch TWiki::OopsException with {
+    } catch Foswiki::OopsException with {
         my $e = shift;
-        $this->assert($e->isa('TWiki::OopsException'));
+        $this->assert($e->isa('Foswiki::OopsException'));
         $this->assert_str_equals('webname', $e->{web});
         $this->assert_str_equals('topicname', $e->{topic});
@@ -56 +56 @@
 sub upchuck {
     my $session = shift;
-    my $e = new TWiki::OopsException(
+    my $e = new Foswiki::OopsException(
             'templatename',
             web => 'webname',
@@ -66 +66 @@
 sub test_redirectOopsException {
     my $this = shift;
-    my $t = new TWiki();
+    my $t = new Foswiki();
     my ($output, $result) = $this->capture(\&upchuck, $t);
     $t->finish();
@@ -75 +75 @@
 sub test_AccessControlException {
     my $this = shift;
-    my $ace = new TWiki::AccessControlException(
+    my $ace = new Foswiki::AccessControlException(
         'FRY',
         'burger',
@@ -96 +96 @@
         param4 => 'phlegm',
         param5 => "the cat\nsat on\nthe rat"});
-    my $session = new TWiki(undef, $query);
-    my ($output, $result) = $this->capture(\&TWiki::UI::Oops::oops, $session,
+    my $session = new Foswiki(undef, $query);
+    my ($output, $result) = $this->capture(\&Foswiki::UI::Oops::oops, $session,
                    "Flum", "DeDum", $query, 0);
     $this->assert_matches(qr/^phlegm$/m, $output);

trunk/UnitTestContrib/test/unit/Fn_GROUPS.pm

@@ -5 +5 @@
 package Fn_GROUPS;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
@@ -32 +32 @@
 | *Group* | *Members* |
 | <nop>AdminGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.RegistrationAgent][RegistrationAgent]] |
-| <nop>TWikiBaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.WikiGuest][WikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb.ProjectContributor][ProjectContributor]] [[TemporaryGROUPSUsersWeb.RegistrationAgent][RegistrationAgent]] |
+| <nop>BaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.WikiGuest][WikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb.ProjectContributor][ProjectContributor]] [[TemporaryGROUPSUsersWeb.RegistrationAgent][RegistrationAgent]] |
 | [[TemporaryGROUPSUsersWeb.GropeGroup][GropeGroup]] | [[TemporaryGROUPSUsersWeb.ScumBag][ScumBag]] [[TemporaryGROUPSUsersWeb.WikiGuest][WikiGuest]] |
 HUMPH

trunk/UnitTestContrib/test/unit/Fn_IF.pm

@@ -5 +5 @@
 package Fn_IF;
 
-use base qw( TWikiFnTestCase );
-
-use TWiki;
+use base qw( FoswikiFnTestCase );
+
+use Foswiki;
 use Error qw( :try );
 
@@ -59 +59 @@
     $this->simpleTest(
         test => '$ WIKINAME = \''
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} ) . "'",
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} ) . "'",
         then => 1,
         else => 0
@@ -69 +69 @@
     $this->simpleTest(
         test => '$ \'WIKINAME\' = \''
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} ) . "'",
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} ) . "'",
         then => 1,
         else => 0
@@ -191 +191 @@
     my $this = shift;
     $this->simpleTest(
-        test => "\$PUBURLPATH='" . $TWiki::cfg{PubUrlPath} . "'",
+        test => "\$PUBURLPATH='" . $Foswiki::cfg{PubUrlPath} . "'",
         then => 1,
         else => 0
@@ -200 +200 @@
     my $this = shift;
     $this->simpleTest(
-        test => "\$'PUBURLPATH'='" . $TWiki::cfg{PubUrlPath} . "'",
+        test => "\$'PUBURLPATH'='" . $Foswiki::cfg{PubUrlPath} . "'",
         then => 1,
         else => 0
@@ -235 +235 @@
     $this->simpleTest(
         test => "d2n('2007-03-26')="
-          . TWiki::Time::parseTime( '2007-03-26', 1 ),
+          . Foswiki::Time::parseTime( '2007-03-26', 1 ),
         then => 1,
         else => 0
@@ -280 +280 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           . "' ingroup 'WikiGuest'",
         then => 0,
@@ -291 +291 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::wikiToUserName(
-            TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::wikiToUserName(
+            Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           )
           . "' ingroup 'WikiGuest'",
@@ -314 +314 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -325 +325 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::wikiToUserName(
-            TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::wikiToUserName(
+            Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           )
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
@@ -350 +350 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::wikiToUserName(
-            TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::wikiToUserName(
+            Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           )
-          . "' ingroup '$TWiki::cfg{SuperAdminGroup}'",
+          . "' ingroup '$Foswiki::cfg{SuperAdminGroup}'",
         then => 0,
         else => 1
@@ -363 +363 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
-          . "' ingroup '$TWiki::cfg{SuperAdminGroup}'",
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
+          . "' ingroup '$Foswiki::cfg{SuperAdminGroup}'",
         then => 0,
         else => 1
@@ -375 +375 @@
         test => "'"
           . $this->{twiki}->{user}
-          . "' ingroup '$TWiki::cfg{SuperAdminGroup}'",
+          . "' ingroup '$Foswiki::cfg{SuperAdminGroup}'",
         then => 0,
         else => 1
@@ -386 +386 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::wikiToUserName(
-            TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::wikiToUserName(
+            Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           )
           . "' ingroup 'GropeGroup'",
@@ -399 +399 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           . "' ingroup 'GropeGroup'",
         then => 1,
@@ -439 +439 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'%USERNAME%' ingroup '$TWiki::cfg{SuperAdminGroup}'",
+        test => "'%USERNAME%' ingroup '$Foswiki::cfg{SuperAdminGroup}'",
         then => 0,
         else => 1
@@ -477 +477 @@
     $this->simpleTest(
         test => "'%USERINFO{format=\"\$username\"}%' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 0,
         else => 1
@@ -515 +515 @@
     $this->simpleTest(
         test => "'%USERINFO{format=\"\$wikiname\"}%' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 0,
         else => 1
@@ -553 +553 @@
     $this->simpleTest(
         test => "'%USERINFO{format=\"\$wikiusername\"}%' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 0,
         else => 1
@@ -572 +572 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           . "' ingroup 'WikiGuest'",
         then => 0,
@@ -583 +583 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -594 +594 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           . "' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 0,
         else => 1
@@ -606 +606 @@
     $this->simpleTest(
         test => "'"
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} )
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} )
           . "' ingroup 'GropeGroup'",
         then => 1,
@@ -616 +616 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{AdminUserWikiName} . "' ingroup 'WikiGuest'",
+        test => "'" . $Foswiki::cfg{AdminUserWikiName} . "' ingroup 'WikiGuest'",
         then => 0,
         else => 1
@@ -626 +626 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{AdminUserWikiName}
+          . $Foswiki::cfg{AdminUserWikiName}
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -637 +637 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{AdminUserWikiName}
+          . $Foswiki::cfg{AdminUserWikiName}
           . "' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 1,
         else => 0
@@ -648 +648 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{AdminUserWikiName} . "' ingroup 'GropeGroup'",
+        test => "'" . $Foswiki::cfg{AdminUserWikiName} . "' ingroup 'GropeGroup'",
         then => 0,
         else => 1
@@ -658 +658 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{DefaultUserWikiName}
+          . $Foswiki::cfg{DefaultUserWikiName}
           . "' ingroup 'WikiGuest'",
         then => 0,
@@ -669 +669 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{DefaultUserWikiName}
+          . $Foswiki::cfg{DefaultUserWikiName}
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -680 +680 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{DefaultUserWikiName}
+          . $Foswiki::cfg{DefaultUserWikiName}
           . "' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 0,
         else => 1
@@ -691 +691 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'$TWiki::cfg{DefaultUserWikiName}' ingroup 'GropeGroup'",
+        test => "'$Foswiki::cfg{DefaultUserWikiName}' ingroup 'GropeGroup'",
         then => 1,
         else => 0
@@ -700 +700 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{AdminUserLogin} . "' ingroup 'WikiGuest'",
+        test => "'" . $Foswiki::cfg{AdminUserLogin} . "' ingroup 'WikiGuest'",
         then => 0,
         else => 1
@@ -710 +710 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{AdminUserLogin}
+          . $Foswiki::cfg{AdminUserLogin}
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -721 +721 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{AdminUserLogin}
+          . $Foswiki::cfg{AdminUserLogin}
           . "' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 1,
         else => 0
@@ -732 +732 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{AdminUserLogin} . "' ingroup 'GropeGroup'",
+        test => "'" . $Foswiki::cfg{AdminUserLogin} . "' ingroup 'GropeGroup'",
         then => 0,
         else => 1
@@ -741 +741 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{DefaultUserLogin} . "' ingroup 'WikiGuest'",
+        test => "'" . $Foswiki::cfg{DefaultUserLogin} . "' ingroup 'WikiGuest'",
         then => 0,
         else => 1
@@ -751 +751 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{DefaultUserLogin}
+          . $Foswiki::cfg{DefaultUserLogin}
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -762 +762 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{DefaultUserLogin}
+          . $Foswiki::cfg{DefaultUserLogin}
           . "' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 0,
         else => 1
@@ -773 +773 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{DefaultUserLogin} . "' ingroup 'GropeGroup'",
+        test => "'" . $Foswiki::cfg{DefaultUserLogin} . "' ingroup 'GropeGroup'",
         then => 1,
         else => 0
@@ -782 +782 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{AdminUserLogin} . "' ingroup 'WikiGuest'",
+        test => "'" . $Foswiki::cfg{AdminUserLogin} . "' ingroup 'WikiGuest'",
         then => 0,
         else => 1
@@ -792 +792 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{AdminUserLogin}
+          . $Foswiki::cfg{AdminUserLogin}
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -803 +803 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{AdminUserLogin}
+          . $Foswiki::cfg{AdminUserLogin}
           . "' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 1,
         else => 0
@@ -814 +814 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{AdminUserLogin} . "' ingroup 'GropeGroup'",
+        test => "'" . $Foswiki::cfg{AdminUserLogin} . "' ingroup 'GropeGroup'",
         then => 0,
         else => 1
@@ -823 +823 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{DefaultUserLogin} . "' ingroup 'WikiGuest'",
+        test => "'" . $Foswiki::cfg{DefaultUserLogin} . "' ingroup 'WikiGuest'",
         then => 0,
         else => 1
@@ -833 +833 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{DefaultUserLogin}
+          . $Foswiki::cfg{DefaultUserLogin}
           . "' ingroup 'ThereHadBetterBeNoSuchGroup'",
         then => 0,
@@ -844 +844 @@
     $this->simpleTest(
         test => "'"
-          . $TWiki::cfg{DefaultUserLogin}
+          . $Foswiki::cfg{DefaultUserLogin}
           . "' ingroup '"
-          . $TWiki::cfg{SuperAdminGroup} . "'",
+          . $Foswiki::cfg{SuperAdminGroup} . "'",
         then => 0,
         else => 1
@@ -855 +855 @@
     my $this = shift;
     $this->simpleTest(
-        test => "'" . $TWiki::cfg{DefaultUserLogin} . "' ingroup 'GropeGroup'",
+        test => "'" . $Foswiki::cfg{DefaultUserLogin} . "' ingroup 'GropeGroup'",
         then => 1,
         else => 0
@@ -863 +863 @@
 sub test_90 {
     my $this = shift;
-    $this->simpleTest( test => "isweb 'TWiki'", then => 1, else => 0 );
+    $this->simpleTest( test => "isweb 'System'", then => 1, else => 0 );
 }
 
@@ -873 +873 @@
 sub test_92 {
     my $this = shift;
-    $this->simpleTest( test => "istopic \$'TWiki'", then => 0, else => 1 );
+    $this->simpleTest( test => "istopic \$'System'", then => 0, else => 1 );
 }
 
@@ -935 +935 @@
         "GropeGroup",
         "   * Set GROUP = "
-          . TWiki::Func::getWikiName( $this->{twiki}->{user} ) . "\n"
+          . Foswiki::Func::getWikiName( $this->{twiki}->{user} ) . "\n"
     );
 
@@ -951 +951 @@
     my ( $this, %test ) = @_;
     $this->{twiki}->enterContext('test');
-    $TWiki::cfg{Fnargle} = 'Fleeble';
-    $TWiki::cfg{A}{B} = 'C';
+    $Foswiki::cfg{Fnargle} = 'Fleeble';
+    $Foswiki::cfg{A}{B} = 'C';
     $this->{request}->param('notempty','v');
     $this->{request}->param('empty','');
@@ -963 +963 @@
 
     my $meta =
-      new TWiki::Meta( $this->{twiki}, $this->{test_web}, $this->{test_topic} );
+      new Foswiki::Meta( $this->{twiki}, $this->{test_web}, $this->{test_topic} );
     my $text = '%IF{"'
       . $test{test}
@@ -1038 +1038 @@
 sub test_ALLOWS_and_EXISTS {
     my $this = shift;
-    my $wn   = TWiki::Func::getWikiName( $this->{twiki}->{user} );
+    my $wn   = Foswiki::Func::getWikiName( $this->{twiki}->{user} );
     $this->{twiki}->{store}
       ->saveTopic( $this->{twiki}->{user}, $this->{test_web}, "DeadDog",
@@ -1184 +1184 @@
 
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->{twiki}->{webName} = $this->{test_web};    # hack
 
@@ -1231 +1231 @@
         $this->{twiki}->{store}->topicExists( $this->{test_web}, $topicName ) );
 
-#TODO: these need to be moved into Fn_META and then implemented (its a really simple change in TWiki.pm
+#TODO: these need to be moved into Fn_META and then implemented (its a really simple change in Foswiki.pm
 #    $this->assert_str_equals(
 #        $this->{twiki}->handleCommonTags(

trunk/UnitTestContrib/test/unit/Fn_INCLUDE.pm

@@ -5 +5 @@
 package Fn_INCLUDE;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
@@ -55 +55 @@
 7 ($includedTopic)
 8 #$includedTopic
-9 [[system.$includedTopic]]
+9 [[System.$includedTopic]]
 10 [[$includedTopic]]
 11 [[http://fleegle][$includedTopic]]
@@ -81 +81 @@
 7 ($this->{other_web}.$includedTopic)
 8 #$includedTopic
-9 [[system.$includedTopic]]
+9 [[System.$includedTopic]]
 10 [[$this->{other_web}.$includedTopic][$includedTopic]]
 11 [[http://fleegle][$includedTopic]]

trunk/UnitTestContrib/test/unit/Fn_NOP.pm

@@ -5 +5 @@
 package Fn_NOP;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 

trunk/UnitTestContrib/test/unit/Fn_REVINFO.pm

@@ -4 +4 @@
 
 package Fn_REVINFO;
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
 use strict;
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
 sub new {
-    $TWiki::cfg{Register}{AllowLoginName} =  1;
+    $Foswiki::cfg{Register}{AllowLoginName} =  1;
     my $self = shift()->SUPER::new('REVINFO', @_);
     return $self;
@@ -33 +33 @@
     my $ui = $this->{twiki}->handleCommonTags(
         '%REVINFO%', $this->{test_web}, $this->{test_topic});
-    my $guest = TWiki::Func::getWikiName();
+    my $guest = Foswiki::Func::getWikiName();
     unless ($ui =~ /^r1 - \d+ \w+ \d+ - \d+:\d+:\d+ - $this->{users_web}\.$guest$/) {
         $this->assert(0, $ui);
@@ -126 +126 @@
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.
-    if ($TWiki::cfg{StoreImpl} ne 'RcsLite' &&
-          $TWiki::cfg{StoreImpl} ne 'RcsWrap') {
+    if ($Foswiki::cfg{StoreImpl} ne 'RcsLite' &&
+          $Foswiki::cfg{StoreImpl} ne 'RcsWrap') {
         return;
     }
     $this->assert(open(
-        F, '>', "$TWiki::cfg{DataDir}/$this->{test_web}/CrikeyMoses.txt"));
+        F, '>', "$Foswiki::cfg{DataDir}/$this->{test_web}/CrikeyMoses.txt"));
     print F <<'HERE';
 %META:TOPICINFO{author="ScumBag" date="1120846368" format="1.1" version="$Rev: 16686 $"}%
@@ -149 +149 @@
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.
-    if ($TWiki::cfg{StoreImpl} ne 'RcsLite' &&
-          $TWiki::cfg{StoreImpl} ne 'RcsWrap') {
+    if ($Foswiki::cfg{StoreImpl} ne 'RcsLite' &&
+          $Foswiki::cfg{StoreImpl} ne 'RcsWrap') {
         return;
     }
     $this->assert(open(
-        F, '>', "$TWiki::cfg{DataDir}/$this->{test_web}/CrikeyMoses.txt"));
+        F, '>', "$Foswiki::cfg{DataDir}/$this->{test_web}/CrikeyMoses.txt"));
     print F <<'HERE';
 %META:TOPICINFO{author="scum" date="1120846368" format="1.1" version="$Rev: 16686 $"}%
@@ -172 +172 @@
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.
-    if ($TWiki::cfg{StoreImpl} ne 'RcsLite' &&
-          $TWiki::cfg{StoreImpl} ne 'RcsWrap') {
+    if ($Foswiki::cfg{StoreImpl} ne 'RcsLite' &&
+          $Foswiki::cfg{StoreImpl} ne 'RcsWrap') {
         return;
     }
     $this->assert(open(
-        F, '>', "$TWiki::cfg{DataDir}/$this->{test_web}/GeeWillikins.txt"));
+        F, '>', "$Foswiki::cfg{DataDir}/$this->{test_web}/GeeWillikins.txt"));
     print F <<'HERE';
 %META:TOPICINFO{author="eltonjohn" date="1120846368" format="1.1" version="$Rev: 16686 $"}%
 HERE
     close(F);
-    $TWiki::cfg{RenderLoggedInButUnknownUsers} = 0;
+    $Foswiki::cfg{RenderLoggedInButUnknownUsers} = 0;
     my $ui = $this->{twiki}->handleCommonTags(
         '%REVINFO{format="$username $wikiname $wikiusername"}%',
         $this->{test_web}, 'GeeWillikins');
     $this->assert_str_equals("eltonjohn eltonjohn eltonjohn", $ui);
-    $TWiki::cfg{RenderLoggedInButUnknownUsers} = 1;
+    $Foswiki::cfg{RenderLoggedInButUnknownUsers} = 1;
     $ui = $this->{twiki}->handleCommonTags(
         '%REVINFO{format="$username $wikiname $wikiusername"}%',

trunk/UnitTestContrib/test/unit/Fn_SCRIPTURL.pm

@@ -5 +5 @@
 package Fn_SCRIPTURL;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
@@ -18 +18 @@
     my $this = shift;
 
-    $TWiki::cfg{ScriptUrlPaths}{snarf} = "sausages";
-    undef $TWiki::cfg{ScriptUrlPaths}{view};
-    $TWiki::cfg{ScriptSuffix} = ".dot";
+    $Foswiki::cfg{ScriptUrlPaths}{snarf} = "sausages";
+    undef $Foswiki::cfg{ScriptUrlPaths}{view};
+    $Foswiki::cfg{ScriptSuffix} = ".dot";
 
     my $result = $this->{twiki}->handleCommonTags("%SCRIPTURL%", $this->{test_web}, $this->{test_topic});
     $this->assert_str_equals(
-        "$TWiki::cfg{DefaultUrlHost}$TWiki::cfg{ScriptUrlPath}", $result);
+        "$Foswiki::cfg{DefaultUrlHost}$Foswiki::cfg{ScriptUrlPath}", $result);
 
     $result = $this->{twiki}->handleCommonTags(
         "%SCRIPTURLPATH{view}%", $this->{test_web}, $this->{test_topic});
-    $this->assert_str_equals("$TWiki::cfg{ScriptUrlPath}/view.dot", $result);
+    $this->assert_str_equals("$Foswiki::cfg{ScriptUrlPath}/view.dot", $result);
 
     $result = $this->{twiki}->handleCommonTags(

trunk/UnitTestContrib/test/unit/Fn_SEARCH.pm

@@ -6 +6 @@
 package Fn_SEARCH;
 
-use base qw( TWikiFnTestCase );
-
-use TWiki;
+use base qw( FoswikiFnTestCase );
+
+use Foswiki;
 use Error qw( :try );
 
@@ -36 +36 @@
     my (%salgs, %qalgs);
     foreach my $dir (@INC) {
-        if (opendir(D, "$dir/TWiki/Store/SearchAlgorithms")) {
+        if (opendir(D, "$dir/Foswiki/Store/SearchAlgorithms")) {
             foreach my $alg (readdir D) {
                 next unless $alg =~ /^(.*)\.pm$/;
@@ -44 +44 @@
             closedir(D);
         }
-        if (opendir(D, "$dir/TWiki/Store/QueryAlgorithms")) {
+        if (opendir(D, "$dir/Foswiki/Store/QueryAlgorithms")) {
             foreach my $alg (readdir D) {
                 next unless $alg =~ /^(.*)\.pm$/;
@@ -60 +60 @@
         eval <<SUB;
 sub $fn {
-require TWiki::Store::SearchAlgorithms::$alg;
-\$TWiki::cfg{RCS}{SearchAlgorithm} = 'TWiki::Store::SearchAlgorithms::$alg'; }
+require Foswiki::Store::SearchAlgorithms::$alg;
+\$Foswiki::cfg{RCS}{SearchAlgorithm} = 'Foswiki::Store::SearchAlgorithms::$alg'; }
 SUB
         die $@ if $@;
@@ -71 +71 @@
         eval <<SUB;
 sub $fn {
-require TWiki::Store::QueryAlgorithms::$alg;
-\$TWiki::cfg{RCS}{QueryAlgorithm} = 'TWiki::Store::QueryAlgorithms::$alg'; }
+require Foswiki::Store::QueryAlgorithms::$alg;
+\$Foswiki::cfg{RCS}{QueryAlgorithm} = 'Foswiki::Store::QueryAlgorithms::$alg'; }
 SUB
         die $@ if $@;
@@ -611 +611 @@
     $query->path_info("/$this->{test_web}/$this->{test_topic}");
 
-    $this->{twiki} = new TWiki(undef, $query);
+    $this->{twiki} = new Foswiki(undef, $query);
     $this->assert_str_equals($this->{test_web}, $this->{twiki}->{webName});
-    $TWiki::Plugins::SESSION = $this->{twiki};
+    $Foswiki::Plugins::SESSION = $this->{twiki};
 }
 

trunk/UnitTestContrib/test/unit/Fn_SECTION.pm

@@ -5 +5 @@
 package Fn_SECTION;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
@@ -25 +25 @@
     # Named section closed without being opened
     my $text = '0%ENDSECTION{"name"}%1';
-    my( $nt, $s ) = TWiki::parseSections( $text );
+    my( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01",$nt);
     $this->assert_str_equals('',dumpsec($s));
@@ -35 +35 @@
     # Named section opened but never closed
     my $text = '0%STARTSECTION{"name"}%1';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01",$nt);
     $this->assert_str_equals('end="2" name="name" start="1" type="section"',dumpsec($s));
@@ -45 +45 @@
     # Unnamed section closed without being opened
     my $text = '0%ENDSECTION%1';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01",$nt);
     $this->assert_str_equals('',dumpsec($s));
@@ -55 +55 @@
     # Unnamed section opened but never closed
     my $text = '0%STARTSECTION%1';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01",$nt);
     $this->assert_str_equals('end="2" name="_SECTION0" start="1" type="section"',dumpsec($s));
@@ -65 +65 @@
     # Unnamed section closed by opening another section of the same type
     my $text = '0%STARTSECTION%1%STARTSECTION%2';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("012",$nt);
     $this->assert_str_equals('end="2" name="_SECTION0" start="1" type="section";end="3" name="_SECTION1" start="2" type="section"',dumpsec($s));
@@ -75 +75 @@
     # Named section overlaps unnamed section before it
     my $text = '0%STARTSECTION%1%STARTSECTION{"named"}%2%ENDSECTION%3%ENDSECTION{"named"}%4';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01234",$nt);
     $this->assert_str_equals('end="2" name="_SECTION0" start="1" type="section";end="4" name="named" start="2" type="section"',dumpsec($s));
@@ -85 +85 @@
     # Named section overlaps unnamed section after it
     my $text = '0%STARTSECTION{"named"}%1%STARTSECTION%2%ENDSECTION{"named"}%3%ENDSECTION%4';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01234",$nt);
     $this->assert_str_equals('end="3" name="named" start="1" type="section";end="4" name="_SECTION0" start="2" type="section"',dumpsec($s));
@@ -95 +95 @@
     # Unnamed sections of different types overlap
     my $text = '0%STARTSECTION{type="include"}%1%STARTSECTION{type="templateonly"}%2%ENDSECTION{type="include"}%3%ENDSECTION{type="templateonly"}%4';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01234",$nt);
     $this->assert_str_equals('end="3" name="_SECTION0" start="1" type="include";end="4" name="_SECTION1" start="2" type="templateonly"',dumpsec($s));
@@ -105 +105 @@
     # Named sections of same type overlap
     my $text = '0%STARTSECTION{"one"}%1%STARTSECTION{"two"}%2%ENDSECTION{"one"}%3%ENDSECTION{"two"}%4';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01234",$nt);
     $this->assert_str_equals('end="3" name="one" start="1" type="section";end="4" name="two" start="2" type="section"',dumpsec($s));
@@ -115 +115 @@
     # Named sections nested
     my $text = '0%STARTSECTION{name="one"}%1%STARTSECTION{name="two"}%2%ENDSECTION{name="two"}%3%ENDSECTION{name="one"}%4';
-    my ( $nt, $s ) = TWiki::parseSections( $text );
+    my ( $nt, $s ) = Foswiki::parseSections( $text );
     $this->assert_str_equals("01234",$nt);
     $this->assert_str_equals('end="4" name="one" start="1" type="section";end="3" name="two" start="2" type="section"',dumpsec($s));

trunk/UnitTestContrib/test/unit/Fn_SEP.pm

@@ -5 +5 @@
 package Fn_SEP;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 

trunk/UnitTestContrib/test/unit/Fn_URLPARAM.pm

@@ -4 +4 @@
 #
 package Fn_URLPARAM;
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
 use strict;

trunk/UnitTestContrib/test/unit/Fn_USERINFO.pm

@@ -5 +5 @@
 package Fn_USERINFO;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
 sub new {
-    $TWiki::cfg{Register}{AllowLoginName}    =  1;
+    $Foswiki::cfg{Register}{AllowLoginName}    =  1;
     my $self = shift()->SUPER::new('USERINFO', @_);
     return $self;
@@ -28 +28 @@
     my $this = shift;
 
-    $TWiki::cfg{AntiSpam}{HideUserDetails} = 0;
+    $Foswiki::cfg{AntiSpam}{HideUserDetails} = 0;
     my $ui = $this->{twiki}->handleCommonTags(
         '%USERINFO%', $this->{test_web}, $this->{test_topic});
     $this->assert_str_equals(
-        $TWiki::cfg{DefaultUserLogin}.", $TWiki::cfg{UsersWebName}.".$TWiki::cfg{DefaultUserWikiName}.", ", $ui);
+        $Foswiki::cfg{DefaultUserLogin}.", $Foswiki::cfg{UsersWebName}.".$Foswiki::cfg{DefaultUserWikiName}.", ", $ui);
 }
 
@@ -38 +38 @@
     my $this = shift;
 
-    $TWiki::cfg{AntiSpam}{HideUserDetails} = 0;
+    $Foswiki::cfg{AntiSpam}{HideUserDetails} = 0;
     my $ui = $this->{twiki}->handleCommonTags('%USERINFO{"ScumBag"}%', $this->{test_web}, $this->{test_topic});
     $this->assert_str_equals(
-        "scum, $TWiki::cfg{UsersWebName}.ScumBag, scumbag\@example.com", $ui);
+        "scum, $Foswiki::cfg{UsersWebName}.ScumBag, scumbag\@example.com", $ui);
 }
 
@@ -47 +47 @@
     my $this = shift;
 
-    $TWiki::cfg{AntiSpam}{HideUserDetails} = 0;
+    $Foswiki::cfg{AntiSpam}{HideUserDetails} = 0;
     my $ui = $this->{twiki}->handleCommonTags('%USERINFO{"scum"}%', $this->{test_web}, $this->{test_topic});
     $this->assert_str_equals(
-        "scum, $TWiki::cfg{UsersWebName}.ScumBag, scumbag\@example.com", $ui);
+        "scum, $Foswiki::cfg{UsersWebName}.ScumBag, scumbag\@example.com", $ui);
 }
 
@@ -56 +56 @@
     my $this = shift;
 
-    $TWiki::cfg{AntiSpam}{HideUserDetails} = 0;
+    $Foswiki::cfg{AntiSpam}{HideUserDetails} = 0;
     my $ui = $this->{twiki}->handleCommonTags('%USERINFO{"ScumBag" format="W$wikiusernameU$wikinameE$emailsG$groupsE"}%', $this->{test_web}, $this->{test_topic});
     $this->assert_str_equals(
-        "W$TWiki::cfg{UsersWebName}.ScumBagUScumBagEscumbag\@example.comGGropeGroupE", $ui);
+        "W$Foswiki::cfg{UsersWebName}.ScumBagUScumBagEscumbag\@example.comGGropeGroupE", $ui);
 
     my $guest_ui = $this->{twiki}->handleCommonTags('%USERINFO{"WikiGuest" format="W$wikiusernameU$wikinameE$emailsG$groupsE"}%', $this->{test_web}, $this->{test_topic});
     $this->assert_str_equals(
-                "WTemporaryUSERINFOUsersWeb.WikiGuestUWikiGuestEGTWikiBaseGroup, GropeGroupE", $guest_ui);
+                "WTemporaryUSERINFOUsersWeb.WikiGuestUWikiGuestEGBaseGroup, GropeGroupE", $guest_ui);
 }
 

trunk/UnitTestContrib/test/unit/Fn_VAR.pm

@@ -5 +5 @@
 package Fn_VAR;
 
-use base qw( TWikiFnTestCase );
+use base qw( FoswikiFnTestCase );
 
-use TWiki;
+use Foswiki;
 use Error qw( :try );
 
@@ -32 +32 @@
 
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
 
     $result = $this->{twiki}->handleCommonTags("%VAR{\"VAR\"}%", $this->{test_web}, $this->{test_topic});

trunk/UnitTestContrib/test/unit/FormDefTests.pm

@@ -3 +3 @@
 package FormDefTests;
 
-use base qw(TWikiFnTestCase);
+use base qw(FoswikiFnTestCase);
 
-use TWiki;
-use TWiki::Form;
+use Foswiki;
+use Foswiki::Form;
 use strict;
 use Assert;
@@ -19 +19 @@
 | Date | date | 30 |
 FORM
-    my $def = TWiki::Form->new($this->{twiki}, $this->{test_web}, 'TestForm');
+    my $def = Foswiki::Form->new($this->{twiki}, $this->{test_web}, 'TestForm');
 
     $this->assert_equals(1, scalar @{$def->getFields()});
@@ -42 +42 @@
 | Checky Egg | checkbox | 1      | 1,2,3,4   | Blip      |              |
 FORM
-    my $def = new TWiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
+    my $def = new Foswiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
 
     $this->assert_equals(2, scalar @{$def->getFields()});
@@ -82 +82 @@
 | Age |
 FORM
-    my $def = new TWiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
+    my $def = new Foswiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
 
     $this->assert_equals(1, scalar @{$def->getFields()});
@@ -111 +111 @@
 | Age |
 FORM
-    my $def = new TWiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
+    my $def = new Foswiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
 
     $this->assert_equals(1, scalar @{$def->getFields()});
@@ -139 +139 @@
 | Beauty |
 FORM
-    my $def = new TWiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
+    my $def = new Foswiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
 
     $this->assert_equals(1, scalar @{$def->getFields()});
@@ -164 +164 @@
 FORM
 
-    my $def = new TWiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
+    my $def = new Foswiki::Form($this->{twiki}, $this->{test_web}, 'TestForm');
 
     my $f = $def->getField('Ecks');
@@ -186 +186 @@
       $this->{twiki}->{store}->readTopic(
           undef, $this->{test_web}, 'SplodgeOne');
-    my $form = new TWiki::Form(
+    my $form = new Foswiki::Form(
         $this->{twiki}, $this->{test_web}, 'NonExistantForm', $meta);
     my $f = $form->getField('Ecks');