Changeset 1984

Timestamp:

01/15/09 05:49:06 (3 years ago)

Author:

SvenDowideit

Message:

Item727: data loss issue when missing anchor or location

Location:

trunk/CommentPlugin

Files:

• data/System/CommentPlugin.txt (modified) (1 diff)
• lib/Foswiki/Plugins/CommentPlugin/Comment.pm (modified) (1 diff)
• test/unit/CommentPlugin/CommentPluginTests.pm (modified) (5 diffs)

trunk/CommentPlugin/data/System/CommentPlugin.txt

@@ -249 +249 @@
 |  Plugin Version: | 13 Jan 2009 %$VERSION% |
 |  Change History: | |
+|  15 Jan 2008 | Foswikitask:Item727 - data loss issue when missing anchor or location |
 |  13 Jan 2009 | Foswikitask:736 Make !CommentPlugin aware of CompareRevisionsAddOn bin script. |
 |  16 Dec 2008 | Foswiki version |

trunk/CommentPlugin/lib/Foswiki/Plugins/CommentPlugin/Comment.pm

@@ -300 +300 @@
             $inpost = 1;
         }
+    }
+    #make sure the anchor or location exits
+    if (defined($location) and not($text =~ /(?<!location\=\")($location)/)) {
+        undef $location;
+    }
+    if (defined($anchor) and not($text =~ /^($anchor\s)/)) {
+        undef $anchor;
     }
 

trunk/CommentPlugin/test/unit/CommentPlugin/CommentPluginTests.pm

@@ -66 +66 @@
             $sattrs .= $anchor;
         }
-        $sattrs .= '"';
+        $sattrs .= '" ';
     }
 
@@ -72 +72 @@
 
     if ( $location ) {
-        $sattrs .= ' location="'.$location.'"';
+        $sattrs .= ' location="'.$location.'" ';
     }
 
@@ -78 +78 @@
     $sattrs .= 'type="'.$type.'" ';
 
-    my $commentref = '%COMMENT{type="'.$type.'" refmark="here"}%';
+    my $commentref = '%COMMENT{'.$sattrs.' refmark="here"}%';
 
     # Build the target topic
     my $sample = <<HERE;
 TopOfTopic
-%COMMENT{type="$type"}%
+%COMMENT{$sattrs}%
 HERE
     if ($anchor ) {
@@ -205 +205 @@
     $this->assert_matches(qr/$comm/, $text, "$web.$topic: $text");
 
+#uncomment this to debug what the actual output looks like.
+#$this->assert_str_equals($sample, $text);
+
     my $refexpr;
     if ($anchor) {
         $refexpr = $anchor;
     } elsif ($location) {
-        $refexpr = "HereIsTheLocation";
+        $refexpr = $location;
     } else {
         $refexpr = $commentref;
@@ -422 +425 @@
 }
 
+
+sub test_targetWebTopicAboveAnchor_Missing_Item727 {
+    my $this = shift;
+
+    my $sample = <<HERE;
+before
+%COMMENT{type="above" cols="100" target="%INCLUDINGTOPIC%#LatestComment"}%
+after
+HERE
+    $this->writeTopic($this->{test_web}, $this->{test_topic}, $sample);
+    my $pidx = 99;
+    my $html =
+      Foswiki::Plugins::CommentPlugin::Comment::_handleInput(
+          'remove="on"',
+          $this->{test_web},
+          $this->{test_topic},
+          \$pidx,
+          "The Message",
+          "",
+          "bottom");
+    $this->assert_matches(qr/<input type="hidden" name="comment_remove" value="99"/, $html);
+
+    # Compose the query
+    my $comm = "This is the comment";
+    my $query = new Unit::Request(
+                        {
+                         'comment_action' => 'save',
+                         'comment_type' => 'above',
+                         'comment' => $comm,
+                         'comment_anchor' => '#LatestComment',
+                        });
+    $query->path_info("/$this->{test_web}/$this->{test_topic}");
+
+    my $session = new Foswiki( $Foswiki::cfg{DefaultUserLoginName}, $query);
+    my $text = "Ignore this text";
+
+    # invoke the save handler
+    $this->capture(\&Foswiki::UI::Save::save, $session );
+
+    $text = Foswiki::Func::readTopicText($this->{test_web}, $this->{test_topic});
+    # make sure it hasn't changed
+    $text =~ s/^%META.*?\n//gm;
+    $this->assert_str_equals(<<HERE,
+before
+
+
+This is the comment
+
+-- TemporaryCommentPluginTestsUsersWeb.WikiGuest - 15 Jan 2009
+%COMMENT{type="above" cols="100" target="%INCLUDINGTOPIC%#LatestComment"}%
+after
+HERE
+                             $text);
+}
+
+
+sub test_targetWebTopicBelowAnchor_Missing_Item727 {
+    my $this = shift;
+
+    my $sample = <<HERE;
+before
+%COMMENT{type="below" target="%INCLUDINGTOPIC%#LatestComment"}%
+after
+HERE
+    $this->writeTopic($this->{test_web}, $this->{test_topic}, $sample);
+    my $pidx = 99;
+    my $html =
+      Foswiki::Plugins::CommentPlugin::Comment::_handleInput(
+          'remove="on"',
+          $this->{test_web},
+          $this->{test_topic},
+          \$pidx,
+          "The Message",
+          "",
+          "bottom");
+    $this->assert_matches(qr/<input type="hidden" name="comment_remove" value="99"/, $html);
+
+    # Compose the query
+    my $comm = "This is the comment";
+    my $query = new Unit::Request(
+                        {
+                         'comment_action' => 'save',
+                         'comment_type' => 'below',
+                         'comment' => $comm,
+                         'comment_anchor' => '#LatestComment',
+
+                        });
+    $query->path_info("/$this->{test_web}/$this->{test_topic}");
+
+    my $session = new Foswiki( $Foswiki::cfg{DefaultUserLoginName}, $query);
+    my $text = "Ignore this text";
+
+    # invoke the save handler
+    $this->capture(\&Foswiki::UI::Save::save, $session );
+
+    $text = Foswiki::Func::readTopicText($this->{test_web}, $this->{test_topic});
+    # make sure it hasn't changed
+    $text =~ s/^%META.*?\n//gm;
+    $this->assert_str_equals(<<HERE,
+before
+%COMMENT{type="below" target="%INCLUDINGTOPIC%#LatestComment"}%
+   * This is the comment -- TemporaryCommentPluginTestsUsersWeb.WikiGuest - 15 Jan 2009
+after
+HERE
+                             $text);
+}
+
 1;