From 49b3ae00843c8eeeb514ff2b28a3e1dad1796ef0 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 22 Nov 2010 15:46:33 +0100 Subject: [PATCH] fix utfInPath test + add test for thunderbird bad mboxes --- tests/mail/mail.sh | 16 ++++++++-------- tests/mail/mail.txt | 4 ++++ tests/utfInPath/utfInPath.sh | 9 +++++---- tests/utfInPath/utfInPath.txt | 6 ++++-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/tests/mail/mail.sh b/tests/mail/mail.sh index 6783bd88..71058ce3 100755 --- a/tests/mail/mail.sh +++ b/tests/mail/mail.sh @@ -5,14 +5,14 @@ topdir=`dirname $0`/.. initvariables $0 -recollq Outmail_uniqueTerm 2> $mystderr | - egrep -v '^Recoll query: ' > $mystdout -recollq '"St Pierre en Chartreuse"' 2>> $mystderr | - egrep -v '^Recoll query: ' >> $mystdout -recollq HtmlAttachment_uniqueTerm 2>> $mystderr | - egrep -v '^Recoll query: ' >> $mystdout -recollq '"Dear Corporate Administrator"' 2>> $mystderr | - egrep -v '^Recoll query: ' >> $mystdout +( + recollq Outmail_uniqueTerm + recollq '"St Pierre en Chartreuse"' + recollq HtmlAttachment_uniqueTerm + recollq '"Dear Corporate Administrator"' + recollq TestTbirdWithoutEmptyLine + recollq TestTbirdWithEmptyLine +) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/mail/mail.txt b/tests/mail/mail.txt index 7f56f126..3d1d0923 100644 --- a/tests/mail/mail.txt +++ b/tests/mail/mail.txt @@ -7,3 +7,7 @@ message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/BadHtmlInMa text/html [file:///home/dockes/projets/fulltext/testrecoll/mail/attach] [RECOLL: a personal text search system for Unix/Linux] 4814 bytes 1 results message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/badMail.edit] [none - In payments / Out payments] 855 bytes +1 results +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/tbird/Sent] [Pronote: salut les genies.] 2565 bytes +1 results +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/tbird/Sent] [De mieux en mieux] 2565 bytes diff --git a/tests/utfInPath/utfInPath.sh b/tests/utfInPath/utfInPath.sh index 456094d1..fcc66e72 100755 --- a/tests/utfInPath/utfInPath.sh +++ b/tests/utfInPath/utfInPath.sh @@ -5,11 +5,12 @@ topdir=`dirname $0`/.. initvariables $0 -recollq -q '"simulating shock turbulence interactions"' 2> $mystderr | - egrep -v '^Recoll query: ' > $mystdout +( -recollq Utf8pathunique 2> $mystderr | - egrep -v '^Recoll query: ' >> $mystdout +recollq -q '"simulating shock turbulence interactions"' +recollq Utf8pathunique + +) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff -w ${myname}.txt $mystdout > $mydiffs 2>&1 diff --git a/tests/utfInPath/utfInPath.txt b/tests/utfInPath/utfInPath.txt index a3cff560..d9fddcbf 100644 --- a/tests/utfInPath/utfInPath.txt +++ b/tests/utfInPath/utfInPath.txt @@ -1,4 +1,6 @@ -1 results +2 results image/vnd.djvu [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/1999_Hu_Shu.OCR.djvu] [1999_Hu_Shu.OCR.djvu] 753409 bytes -1 results +image/vnd.djvu [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/1999_Hu_Shu.OCR.djvu] [1999_Hu_Shu.OCR.djvu] 753409 bytes +2 results text/plain [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/utf8path.txt] [utf8path.txt] 49 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/utfInPath/accentué/utf8path.txt] [utf8path.txt] 49 bytes