[Quilt-dev] [PATCH] Add a test case for remove-trailing-ws script

[Jean Delvare]

As a bug was recently found in this script, add a test case covering
both unified and context patch formats, so that hopefully no other
bug creeps in in the future.
---
 test/remove-trailing-ws.test |  150 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)

--- /dev/null
+++ b/test/remove-trailing-ws.test
@@ -0,0 +1,150 @@
+# Unit test for the remove-trailing-ws script.
+
+$ cat > unified.diff
+< diff -ruN files.orig/add files/add
+< --- files.orig/add   2012-12-14 10:37:50.000000000 +0100
+< +++ files/add        2012-12-14 10:41:06.000000000 +0100
+< @@ -1,6 +1,8 @@
+<  Line 1
+<  Line 2
+< +
+<  Line 3
+< +Line 4 
+< 
+<  Line 5
+<  Line 6
+< diff -ruN files.orig/remove-at-end files/remove-at-end
+< --- files.orig/remove-at-end 2012-12-14 11:15:42.000000000 +0100
+< +++ files/remove-at-end      2012-12-14 11:15:58.000000000 +0100
+< @@ -7,8 +7,3 @@
+<  Line 5
+<  Line 6
+<  
+< -Line 7
+< -Line 8
+< -
+< -Line 9
+< -Line 10
+< diff -ruN files.orig/create files/create
+< --- files.orig/create        1970-01-01 01:00:00.000000000 +0100
+< +++ files/create     2012-12-14 10:41:16.000000000 +0100
+< @@ -0,0 +1,3 @@
+< +create 
+< +a new 
+< +file 
+< diff -ruN files.orig/delete files/delete
+< --- files.orig/delete        2012-12-14 10:40:33.000000000 +0100
+< +++ files/delete     1970-01-01 01:00:00.000000000 +0100
+< @@ -1,3 +0,0 @@
+< -delete
+< -an old
+< -file
+< diff -ruN files.orig/remove files/remove
+< --- files.orig/remove        2012-12-14 10:37:38.000000000 +0100
+< +++ files/remove     2012-12-14 10:38:19.000000000 +0100
+< @@ -1,8 +1,6 @@
+<  Line 1
+<  Line 2
+< -
+<  Line 3
+< -Line 4
+< 
+<  Line 5
+<  Line 6
+< diff -u files.orig/change files/change
+< --- files.orig/change        2012-12-14 11:24:55.000000000 +0100
+< +++ files/change     2012-12-14 11:25:06.000000000 +0100
+< @@ -1,3 +1,3 @@
+<  change
+< -from 
+< -this 
+< +to 
+< +that 
+
+$ cat > context.diff
+< diff -rcN files.orig/add files/add
+< *** files.orig/add   2012-12-14 10:37:50.000000000 +0100
+< --- files/add        2012-12-14 10:41:06.000000000 +0100
+< ***************
+< *** 1,6 ****
+< --- 1,8 ----
+<   Line 1
+<   Line 2
+< + 
+<   Line 3
+< + Line 4 
+< 
+<   Line 5
+<   Line 6
+< diff -C 10 files.orig/remove-at-end files/remove-at-end
+< *** files.orig/remove-at-end 2012-12-14 11:15:42.000000000 +0100
+< --- files/remove-at-end      2012-12-14 11:15:58.000000000 +0100
+< ***************
+< *** 1,14 ****
+<   Line 1
+<   Line 2
+<   
+<   Line 3
+<   Line 4
+<   
+<   Line 5
+<   Line 6
+<   
+< - Line 7
+< - Line 8
+< - 
+< - Line 9
+< - Line 10
+< --- 1,9 ----
+< *** files.orig/create        1970-01-01 01:00:00.000000000 +0100
+< --- files/create     2012-12-14 10:41:16.000000000 +0100
+< ***************
+< *** 0 ****
+< --- 1,3 ----
+< + create 
+< + a new 
+< + file 
+< diff -rcN files.orig/delete files/delete
+< *** files.orig/delete        2012-12-14 10:40:33.000000000 +0100
+< --- files/delete     1970-01-01 01:00:00.000000000 +0100
+< ***************
+< *** 1,3 ****
+< - delete
+< - an old
+< - file
+< --- 0 ----
+< diff -rcN files.orig/remove files/remove
+< *** files.orig/remove        2012-12-14 10:37:38.000000000 +0100
+< --- files/remove     2012-12-14 10:38:19.000000000 +0100
+< ***************
+< *** 1,8 ****
+<   Line 1
+<   Line 2
+< - 
+<   Line 3
+< - Line 4
+< 
+<   Line 5
+<   Line 6
+< --- 1,6 ----
+< *** files.orig/change        2012-12-14 11:24:55.000000000 +0100
+< --- files/change     2012-12-14 11:25:06.000000000 +0100
+< ***************
+< *** 1,3 ****
+<   change
+< ! from 
+< ! this 
+< --- 1,3 ----
+<   change
+< ! to 
+< ! that 
+
+$ %{QUILT_DIR}/scripts/remove-trailing-ws -n < unified.diff
+> Warning: trailing whitespace in line 5 of files/add
+> Warning: trailing whitespace in lines 2,3 of files/change
+> Warning: trailing whitespace in lines 1,2,3 of files/create
+
+$ %{QUILT_DIR}/scripts/remove-trailing-ws -n < context.diff
+> Warning: trailing whitespace in line 5 of files/add
+> Warning: trailing whitespace in lines 2,3 of files/change
+> Warning: trailing whitespace in lines 1,2,3 of files/create

-- 
Jean Delvare
Suse L3