Changeset 1323 for trunk/MailInContrib/test/unit/MailInContrib/MailInContribSuite.pm

Timestamp:

12/13/08 16:58:36 (3 years ago)

Author:

CrawfordCurrie

Message:

Item456: work in progress

File:

• trunk/MailInContrib/test/unit/MailInContrib/MailInContribSuite.pm (modified) (12 diffs)

trunk/MailInContrib/test/unit/MailInContrib/MailInContribSuite.pm

@@ -2 +2 @@
 
 package MailInContribSuite;
-
-use base qw( FoswikiFnTestCase! );
-
-use TWiki;
+use base 'FoswikiFnTestCase';
+
+use Foswiki;
 use Error qw( :try );
 use File::Path;
 use Error qw( :try );
-use TWiki::Contrib::MailInContrib;
+use Foswiki::Contrib::MailInContrib;
 
 my $box;
@@ -23 +22 @@
     $this->{twiki}->{store}->createWeb(
         $this->{twiki}->{user}, $this->{system_web},
-        $TWiki::cfg{SystemWebName} );
+        $Foswiki::cfg{SystemWebName} );
+    my $adm = Foswiki::Func::getCanonicalUserID(
+        $Foswiki::cfg{AdminUserWikiName});
     $this->{twiki}->{store}->saveTopic(
-        $TWiki::cfg{AdminUserWikiName}, $this->{system_web},
+        $adm, $this->{system_web},
         'WebPreferences', "");
 
-    $TWiki::cfg{SystemWebName} = $this->{system_web};
+    $Foswiki::cfg{SystemWebName} = $this->{system_web};
 
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
-
-    my $workdir = TWiki::Func::getWorkArea('MailInContrib');
+    $this->{twiki} = new Foswiki();
+
+    my $workdir = Foswiki::Func::getWorkArea('MailInContrib');
     open(F, ">$workdir/timestamp") || die $!;
     print F "0\n";
@@ -50 +51 @@
 
     $this->{twiki}->finish();
-    $this->{twiki} = new TWiki();
+    $this->{twiki} = new Foswiki();
     $this->{twiki}->net->setMailHandler(\&sentMail);
 
     $box = {};
-
     # Make a maildir
     my $tmp = "/tmp/mail$$";
@@ -62 +62 @@
     $box->{folder} = "$tmp/";
 
-    $TWiki::cfg{MailInContrib} = [ $box ];
+    $Foswiki::cfg{MailInContrib} = [ $box ];
     @mails = ();
 }
@@ -94 +94 @@
 sub cron {
     my $this = shift;
-    my $min = new TWiki::Contrib::MailInContrib( $this->{twiki}, 0 );
+    my $min = new Foswiki::Contrib::MailInContrib( $this->{twiki}, 0 );
     $min->processInbox( $box );
     $min->wrapUp();
@@ -119 +119 @@
 and there is no valid default username', $c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},$this->{test_topic});
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},$this->{test_topic});
 
     $this->assert($t !~ /\S/, $t);
@@ -154 +154 @@
     $this->assert_null($c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},$this->{test_topic});
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},$this->{test_topic});
 
     $this->assert($t =~ s/^ *\* \*$this->{test_web}\.NotHere\*: Message 1 text here\s*-- $this->{users_web}\.MoleInnaHole -\s+\d+\s+\w+\s+\d+\s+-\s+\d+:\d+\n//m, $t);
@@ -190 +190 @@
     $this->assert_null($c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},$this->{test_topic});
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},$this->{test_topic});
 
     $this->assert($t =~ s/^\s*\* \*\*: Message 1 text here\s* -- $this->{users_web}\.MoleInnaHole -\s+\d+\s+\w+\s+\d+\s+-\s+\d+:\d+$//m, $t);
@@ -223 +223 @@
     $this->assert_null($c->{error});
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},'DangleBerries');
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},'DangleBerries');
 
     $t =~ s/\* \*no valid topic\*: Message 1 text here\s*-- $this->{users_web}.AllyGator -\s+\d+\s+\w+\s+\d+\s+-\s+\d+:\d+//s;
@@ -367 +367 @@
     my $c = $this->cron();
 
+print STDERR "VBLO\n";
     $this->assert_equals(1, scalar(@mails));
     $this->assert_matches(qr/Thank you for your successful/, $mails[0]);
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},'AnotherTopic');
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},'AnotherTopic');
     my @a = $m->get('FILEATTACHMENT');
     $this->assert_equals(1, scalar(@a));
     $this->assert_str_equals("data.asc", $a[0]->{attachment});
 
-    $this->assert(-e "$TWiki::cfg{PubDir}/$this->{test_web}/AnotherTopic/data.asc");
+    $this->assert(-e "$Foswiki::cfg{PubDir}/$this->{test_web}/AnotherTopic/data.asc");
 }
 
@@ -395 +396 @@
     $box->{onSuccess} = 'reply delete';
     $this->{twiki}->{store}->saveTopic(
-        $this->{twiki}->{user}, $TWiki::cfg{SystemWebName},
+        $this->{twiki}->{user}, $Foswiki::cfg{SystemWebName},
         'MailInContribUserTemplate', <<'HERE');
 %TMPL:DEF{MAILIN:wierd}%
@@ -414 +415 @@
     $this->assert_matches(qr/Thank you for your successful/, $mails[0]);
 
-    my( $m, $t ) = TWiki::Func::readTopic($this->{test_web},'TargetTopic');
+    my( $m, $t ) = Foswiki::Func::readTopic($this->{test_web},'TargetTopic');
 
     $this->assert_matches(qr/BEGIN\s*Subject: Object\s*Body: Message 1 text here\s*<!--MAIL{/s, $t);