[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4b89a2356f89b664718c8921aa95f52029681a2c
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 20 02:41:14 2010 +0000

    2010-09-19  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Martin Robinson.
    
            Add unit tests for diffs that delete or modify a change log entry
            or describe changes that are far apart
            https://bugs.webkit.org/show_bug.cgi?id=46046
    
            Add additional unit tests to test change log diffs that contain
            deletions or changes that are far apart from each other in the
            ChangeLog file.
    
            * Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl:
              - Added the following unit tests:
              "fixChangeLogPatch: [no change] In-place change."
              "fixChangeLogPatch: [no change] Remove first entry."
              "fixChangeLogPatch: [no change] Remove entry in the middle."
              "fixChangeLogPatch: [no change] Far apart changes (i.e. more than one chunk)."
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67832 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cca5a4a..253442b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-19  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Martin Robinson.
+
+        Add unit tests for diffs that delete or modify a change log entry
+        or describe changes that are far apart
+        https://bugs.webkit.org/show_bug.cgi?id=46046
+
+        Add additional unit tests to test change log diffs that contain
+        deletions or changes that are far apart from each other in the
+        ChangeLog file.
+
+        * Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl:
+          - Added the following unit tests:
+          "fixChangeLogPatch: [no change] In-place change."
+          "fixChangeLogPatch: [no change] Remove first entry."
+          "fixChangeLogPatch: [no change] Remove entry in the middle."
+          "fixChangeLogPatch: [no change] Far apart changes (i.e. more than one chunk)."
+
 2010-09-19  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl b/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl
index 2fd187b..ee258da 100644
--- a/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl
+++ b/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl
@@ -30,7 +30,7 @@
 
 # Unit tests of VCSUtils::fixChangeLogPatch().
 
-use Test::Simple tests => 8;
+use Test::Simple tests => 12;
 use VCSUtils;
 
 # The source ChangeLog for these tests is the following:
@@ -58,6 +58,93 @@ my $in;
 my $out;
 
 # New test
+$title = "fixChangeLogPatch: [no change] In-place change.";
+
+$in = <<'END';
+--- ChangeLog
++++ ChangeLog
+@@ -1,5 +1,5 @@
+ 2010-12-22  Bob  <bob at email.address>
+ 
+-        Reviewed by Sue.
++        Reviewed by Ray.
+ 
+         Changed some code on 2010-12-22.
+END
+
+ok(fixChangeLogPatch($in) eq $in, $title);
+
+# New test
+$title = "fixChangeLogPatch: [no change] Remove first entry.";
+
+$in = <<'END';
+--- ChangeLog
++++ ChangeLog
+@@ -1,11 +1,3 @@
+-2010-12-22  Bob  <bob at email.address>
+-
+-        Reviewed by Ray.
+-
+-        Changed some code on 2010-12-22.
+-
+-        * File:
+-
+ 2010-12-22  Alice  <alice at email.address>
+ 
+         Reviewed by Ray.
+END
+
+ok(fixChangeLogPatch($in) eq $in, $title);
+
+# New test
+$title = "fixChangeLogPatch: [no change] Remove entry in the middle.";
+
+$in = <<'END';
+--- ChangeLog
++++ ChangeLog
+@@@ -7,10 +7,6 @@
+ 
+         * File:
+ 
+-2010-12-22  Bob  <bob at email.address>
+-
+-        Changed some code on 2010-12-22.
+-
+ 2010-12-22  Alice  <alice at email.address>
+ 
+         Reviewed by Ray.
+END
+
+ok(fixChangeLogPatch($in) eq $in, $title);
+
+# New test
+$title = "fixChangeLogPatch: [no change] Far apart changes (i.e. more than one chunk).";
+
+$in = <<'END';
+--- ChangeLog
++++ ChangeLog
+@@ -7,7 +7,7 @@
+ 
+         * File:
+ 
+-2010-12-22  Bob  <bob at email.address>
++2010-12-22  Bobby <bob at email.address>
+ 
+         Changed some code on 2010-12-22.
+ 
+@@ -21,7 +21,7 @@
+ 
+         * File2:
+ 
+-2010-12-21  Bob  <bob at email.address>
++2010-12-21  Bobby <bob at email.address>
+ 
+         Changed some code on 2010-12-21.
+END
+
+ok(fixChangeLogPatch($in) eq $in, $title);
+
+# New test
 $title = "fixChangeLogPatch: [no change] First line is new line.";
 
 $in = <<'END';

-- 
WebKit Debian packaging