[TWiki-Dev] [SVN] SvenDowideit r13515 - twiki/branches/MAIN/test/unit

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

Author: SvenDowideit
Date: 2007-04-24 10:08:29 -0500 (Tue, 24 Apr 2007)
New Revision: 13515

Modified:
   twiki/branches/MAIN/test/unit/TableRenderingTests.pm
Log:
Item3741: found a way to fix the tests properly, so that they can be run both form TWikiSuite and by themselves

Modified: twiki/branches/MAIN/test/unit/TableRenderingTests.pm
===================================================================
--- twiki/branches/MAIN/test/unit/TableRenderingTests.pm	2007-04-24 13:08:21 UTC (rev 13514)
+++ twiki/branches/MAIN/test/unit/TableRenderingTests.pm	2007-04-24 15:08:29 UTC (rev 13515)
@@ -68,6 +68,11 @@
 
 sub test_simpleTheadTableusingTablePlugin {
     my $this = shift;
+
+    my $cgi = $this->{twiki}->{cgiQuery};
+    my $url = $cgi->url . $cgi->path_info();
+    $url =~ s/\&/\&/go;
+
     my $expected = <<EXPECTED;
 <nop>
 <nop>
@@ -75,7 +80,7 @@
 <table style="border-width:1px;" cellspacing="0" cellpadding="0" class="twikiTable" border="1">
     <thead>
         <tr class="twikiTableEven">
-            <th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" class="twikiFirstCol" maxcols="0"> <a rel="nofollow" href="http://localhost/TemporaryTableFormattingTestWebTableFormatting/TestTopicTableFormatting?sortcol=0;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">a</a> </th><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" maxcols="0"> <a rel="nofollow" href="http://localhost/TemporaryTableFormattingTestWebTableFormatting/TestTopicTableFormatting?sortcol=1;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">b</a> </th>
+            <th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" class="twikiFirstCol" maxcols="0"> <a rel="nofollow" href="$url?sortcol=0;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">a</a> </th><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" maxcols="0"> <a rel="nofollow" href="$url?sortcol=1;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">b</a> </th>
         </tr>
     </thead>
     <tr class="twikiTableOdd">
@@ -126,12 +131,17 @@
 
 sub test_doubleTheadTableusingTablePlugin {
     my $this = shift;
+
+    my $cgi = $this->{twiki}->{cgiQuery};
+    my $url = $cgi->url . $cgi->path_info();
+    $url =~ s/\&/\&amp;/go;
+
     my $expected = <<EXPECTED;
 <nop>
 <nop>
 <nop>
 <nop>
-<table style="border-width:1px;" cellspacing="0" cellpadding="0" class="twikiTable" border="1"><thead><tr class="twikiTableEven"><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" class="twikiFirstCol" maxcols="0"> <a rel="nofollow" href="http://localhost/TemporaryTableFormattingTestWebTableFormatting/TestTopicTableFormatting?sortcol=0;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">a</a> </th><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" maxcols="0"> <a rel="nofollow" href="http://localhost/TemporaryTableFormattingTestWebTableFormatting/TestTopicTableFormatting?sortcol=1;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">b</a> </th></tr></thead>
+<table style="border-width:1px;" cellspacing="0" cellpadding="0" class="twikiTable" border="1"><thead><tr class="twikiTableEven"><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" class="twikiFirstCol" maxcols="0"> <a rel="nofollow" href="$url?sortcol=0;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">a</a> </th><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" maxcols="0"> <a rel="nofollow" href="$url?sortcol=1;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">b</a> </th></tr></thead>
 <thead><tr class="twikiTableOdd"><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" class="twikiFirstCol" maxcols="0"> <span style="color:#ffffff"> <strong> c </strong> </span> </th><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" maxcols="0"> <span style="color:#ffffff"> <strong> c </strong> </span> </th></tr></thead>
 <tr class="twikiTableEven"><td bgcolor="#ffffff" valign="top" style="vertical-align:top;" class="twikiFirstCol"> 2 </td><td bgcolor="#ffffff" valign="top" style="vertical-align:top;"> 3 </td></tr>
 <tr class="twikiTableOdd"><td bgcolor="#edf4f9" valign="top" style="vertical-align:top;" class="twikiFirstCol twikiLast"> ok </td><td bgcolor="#edf4f9" valign="top" style="vertical-align:top;" class="twikiLast"> bad </td></tr>
@@ -148,6 +158,11 @@
 
 sub test_doubleTheadandTfootTableusingTablePlugin {
     my $this = shift;
+
+    my $cgi = $this->{twiki}->{cgiQuery};
+    my $url = $cgi->url . $cgi->path_info();
+    $url =~ s/\&/\&amp;/go;
+
     my $expected = <<EXPECTED;
 <nop>
 <nop>
@@ -162,7 +177,7 @@
     </thead>
     <thead>
         <tr class="twikiTableOdd">
-            <th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" class="twikiFirstCol" maxcols="0"> <a rel="nofollow" href="http://localhost/TemporaryTableFormattingTestWebTableFormatting/TestTopicTableFormatting?sortcol=0;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">c</a> </th><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" maxcols="0"> <a rel="nofollow" href="http://localhost/TemporaryTableFormattingTestWebTableFormatting/TestTopicTableFormatting?sortcol=1;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">c</a> </th>
+            <th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" class="twikiFirstCol" maxcols="0"> <a rel="nofollow" href="$url?sortcol=0;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">c</a> </th><th bgcolor="#6b7f93" valign="top" style="vertical-align:top;" maxcols="0"> <a rel="nofollow" href="$url?sortcol=1;table=1;up=0#sorted_table" style="color:#ffffff" title="Sort by this column">c</a> </th>
         </tr>
     </thead>
     <tr class="twikiTableEven">