twiki-dev

[<de...@de...>]

Author: HaraldJoerg
Date: 2017-05-25 22:45:33 +0000 (Thu, 25 May 2017)
New Revision: 30333
Trac url: http://develop.twiki.org/trac/changeset/30333

Modified:
   twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm
   twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm
Log:
Item7623: Two bugs in TWikiUserMapping unit tests

Modified: twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm
===================================================================
--- twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm	2017-05-18 18:40:19 UTC (rev 30332)
+++ twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm	2017-05-25 22:45:33 UTC (rev 30333)
@@ -224,22 +224,18 @@
     #peek at old rev's to see what rcs tells us
     #render diff & history to make sure those are all wikiname
 
-    #render attahcment tables, and rev history of attachment tables,
+    #render attachment tables, and rev history of attachment tables,
     #all must be wikiname
 	my $renderedMeta = $this ->{twiki}->attach->renderMetaData ( $this->{test_web}, 'CuidWithMappers' , 
 				$meta, {template=>'attachtables.tmpl'} );
 	$this->assert_not_null($renderedMeta);
 	#TODO: redo this with custom tmpl and check each username
-my $output = <<'THIS';
-<div class="twikiAttachments">
-| *I* | *%MAKETEXT{"Attachment"}%* | *%MAKETEXT{"Action"}%* | *%MAKETEXT{"Size"}%* | *%MAKETEXT{"Date"}%* | *%MAKETEXT{"Who"}%* | *%MAKETEXT{"Comment"}%* |
-| <img width="16" alt="png" align="top" src="%PUBURLPATH%/TWiki/TWikiDocGraphics/png.gif" height="16" border="0" /><span class="twikiHidden">png</span> | <a href="%ATTACHURLPATH%/%ENCODE{home.org.au.png}%">home.org.au.png</a> | <a href="%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%?filename=%ENCODE{"home.org.au.png"}%;revInfo=1" title="%MAKETEXT{"change, update, previous revisions, move, delete..."}%" rel="nofollow">%MAKETEXT{"manage"}%</a> |  4.1&nbsp;K|<span class="twikiNoBreak">31 May 2007 - 21:58</span> |TemporaryTWikiuserMappingContribTestsUsersWeb.JoeDoe  |&nbsp;  |
-</div>
-THIS
-	$output =~ s/UUUUUUUUUU/$displayedName/e;
-    $output =~ s/%PUBURLPATH%/$TWiki::cfg{PubUrlPath}/e;
-    $output =~ s/%EXPANDEDPUBURL%/$TWiki::cfg{PubUrlPath}/e;
-	$this->assert_str_equals($output, $renderedMeta."\n");
+# The rendered metadata looks approximately like this, but we just check whether the user name is rendered
+# <div class="twikiAttachments">
+# | *I* | *%MAKETEXT{"Attachment"}%* | *%MAKETEXT{"History"}%* | *%MAKETEXT{"Action"}%* | *%MAKETEXT{"Size"}%* | *%MAKETEXT{"Date"}%* | *%MAKETEXT{"Who"}%* | *%MAKETEXT{"Comment"}%* |
+# | <img width="16" alt="png" align="top" src="%PUBURLPATH%/TWiki/TWikiDocGraphics/png.gif" height="16" border="0" /><span class="twikiHidden">png</span>  | <a href="%ATTACHURLPATH%/%ENCODE{home.org.au.png}%">home.org.au.png</a> | <a href="%ATTACHURLPATH%/%ENCODE{home.org.au.png}%">home.org.au.png</a> | <a href="%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%?filename=%ENCODE{"home.org.au.png"}%;revInfo=1" title="%MAKETEXT{"change, update, previous revisions, move, delete..."}%" rel="nofollow">%MAKETEXT{"manage"}%</a> |  4.1&nbsp;K|<span class="twikiNoBreak">31 May 2007 - 21:58</span> |TemporaryTWikiuserMappingContribTestsUsersWeb.JoeDoe  |&nbsp;  |
+# </div>
+    $this->assert_matches(qr/\|\s*TemporaryTWikiuserMappingContribTestsUsersWeb.JoeDoe\s*\|/,$renderedMeta);
 
     
 #see if leases and locks have similar issues

Modified: twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm
===================================================================
--- twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm	2017-05-18 18:40:19 UTC (rev 30332)
+++ twiki/trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm	2017-05-25 22:45:33 UTC (rev 30333)
@@ -71,7 +71,7 @@
             $twiki->{user}, $testUsersWeb, $TWiki::cfg{SuperAdminGroup},
             "   * Set GROUP = $TWiki::cfg{SuperAdminGroup}\n");
 
-        $twiki->{store}->createWeb($twiki->{user}, $testSysWeb, $original);
+        $twiki->{store}->createWeb($twiki->{user}, $testSysWeb, '_default'); # was: $original);
         $twiki->{store}->createWeb($twiki->{user}, $testNormalWeb, '_default');
 
         $twiki->{store}->copyTopic(