Changeset 12558

Timestamp:

09/18/11 12:43:08 (20 months ago)

Author:

PaulHarvey

Message:

Item11135: wiring up the new store API - now the unit test infrastructure doesn't crash - next up, make some tests pass

Location:

branches/scratch/UnitTestContrib/test/unit

Files:

• FoswikiFnTestCase.pm (modified) (1 diff)
• FoswikiTestCase.pm (modified) (1 diff)
• FuncUsersTests.pm (modified) (1 diff)
• PrefsTests.pm (modified) (2 diffs)

branches/scratch/UnitTestContrib/test/unit/FoswikiFnTestCase.pm

@@ -109 +109 @@
     $this->{test_user_cuid} =
       $this->{session}->{users}->getCanonicalUserID( $this->{test_user_login} );
-    $this->{test_topicObject} = Foswiki::Meta->new(
-        $this->{session},    $this->{test_web},
-        $this->{test_topic}, "BLEEGLE\n"
-    );
+
+    $this->{test_topicObject} = Foswiki::Store::create(address=>{web=>$this->{test_web}, topic=>$this->{test_topic}});
+    $this->{test_topicObject}->text("BLEEGLE\n");
     $this->{test_topicObject}->save(forcedate=>(time()+60));
 }

branches/scratch/UnitTestContrib/test/unit/FoswikiTestCase.pm

@@ -266 +266 @@
 
     try {
-        my $webObject = Foswiki::Meta->new( $session, $web );
+        my $webObject = Foswiki::Store->load( address=>{web=>$web} );
         $webObject->removeFromStore();
     }

branches/scratch/UnitTestContrib/test/unit/FuncUsersTests.pm

@@ -1762 +1762 @@
 }
 
+sub verify_denyNonAdminReadOfAdminGroupTopic {
+    my $this = shift;
+
+    return if ( $this->noUsersRegistered() );
+
+    # Force a re-read
+    $this->{session}->finish();
+    $this->{session} = new Foswiki( $Foswiki::cfg{AdminUserLogin} );
+    $Foswiki::Plugins::SESSION = $this->{session};
+    
+    $this->assert( Foswiki::Func::addUserToGroup( 'UserB',    'AdminGroup', 1 ) );
+
+    my $topicObject =
+      Foswiki::Meta->new( $this->{session}, $this->{users_web},
+        'AdminGroup' );
+    $topicObject->load();
+    $topicObject->text($topicObject."\n\n   * Set ALLOWTOPICVIEW = AdminGroup\n\n");
+    $topicObject->save();
+    
+    
+    {
+        $this->{session}->finish();
+        $this->{session} = new Foswiki( $Foswiki::cfg{AdminUserLogin} );
+        $Foswiki::Plugins::SESSION = $this->{session};
+
+        my $it = Foswiki::Func::eachGroupMember('AdminGroup');
+        my @list;
+        while ( $it->hasNext() ) {
+            my $g = $it->next();
+            push( @list, $g );
+        }
+        #as the baseusermapper is always admin, they should always see the full list
+        $this->assert_str_equals( "AdminUser,UserA,UserB",
+            sort join( ',', @list ) );
+        $this->assert($this->{session}->isAdmin());
+    }
+
+    {
+        # Force a re-read
+        $this->{session}->finish();
+        $this->{session} = new Foswiki( 'UserB' );
+        $Foswiki::Plugins::SESSION = $this->{session};
+
+        my $it = Foswiki::Func::eachGroupMember('AdminGroup');
+        my @list;
+        while ( $it->hasNext() ) {
+            my $g = $it->next();
+            push( @list, $g );
+        }
+        $this->assert_str_equals( "AdminUser,UserA,UserB",
+            sort join( ',', @list ) );
+        $this->assert($this->{session}->isAdmin())
+    }
+
+    {
+        # Force a re-read
+        $this->{session}->finish();
+        $this->{session} = new Foswiki( 'UserZ' );
+        $Foswiki::Plugins::SESSION = $this->{session};
+
+        my $it = Foswiki::Func::eachGroupMember('AdminGroup');
+        my @list;
+        while ( $it->hasNext() ) {
+            my $g = $it->next();
+            push( @list, $g );
+        }
+        $this->assert_str_equals( "AdminUser,UserA,UserB",
+            sort join( ',', @list ) );
+        $this->assert(not $this->{session}->isAdmin())
+    }
+}
+
+
 1;

branches/scratch/UnitTestContrib/test/unit/PrefsTests.pm

@@ -44 +44 @@
         my $webObject = Foswiki::Meta->new( $this->{session}, $TWiki::cfg{SystemWebName} );
         $webObject->populateNewWeb($original);
-        my $m =
-          Foswiki::Meta->load( $this->{session}, $original,
-            $TWiki::cfg{SitePrefsTopicName} );
-        $m->saveAs( $TWiki::cfg{SystemWebName},
-            $TWiki::cfg{SitePrefsTopicName} );
+
+        my $orig_sitepref = Foswiki::Store::load(address=>{web=>$original, topic=>$Foswiki::cfg{SitePrefsTopicName}});
+        my $m = Foswiki::Store::create(address=>{web=>$TWiki::cfg{SystemWebName}, topic=>$Foswiki::cfg{SitePrefsTopicName}}, data=>{_text=>$orig_sitepref->text()});
+        $m->save();
     }
     catch Foswiki::AccessControlException with {
@@ -80 +79 @@
     my $user = $fatwilly->{user};
     $this->assert_not_null($user);
-    my $topicObject = Foswiki::Meta->load( $fatwilly, $web, $topic );
+    my $topicObject = Foswiki::Store::load(address=>{web=>$web, topic=>$topic});
+
     my $text = $topicObject->text() || '';
     $text =~ s/^\s*\* $type $pref =.*$//gm;