Changeset 816 for trunk/UnitTestContrib/test/unit/ClientTests.pm

Timestamp:

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

Author:

CrawfordCurrie

Message:

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

File:

• trunk/UnitTestContrib/test/unit/ClientTests.pm (modified) (10 diffs)

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 {