From 2c5e51fb1f3e43ea31b6ba4fb297cc760ccae186 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 8 Mar 2012 15:58:36 +0100 Subject: [PATCH] fix tests for new file size handling --- tests/Maildir1/Maildir1.txt | 4 ++-- tests/chm/chm.txt | 8 ++++---- tests/cjk/cjk.txt | 4 ++-- tests/compressed/compressed.txt | 4 ++-- tests/embed/embed.txt | 4 ++-- tests/gnumeric/gnumeric.txt | 3 ++- tests/ics/ics.txt | 2 +- tests/info/info.txt | 2 +- tests/mail/mail.txt | 10 +++++----- tests/man/man.txt | 2 +- tests/msword/msword.txt | 2 +- tests/rar/rar.txt | 2 +- tests/rfc2231/rfc2231.txt | 4 ++-- tests/txt/txt.txt | 2 +- tests/zip/zip.txt | 8 ++++---- 15 files changed, 31 insertions(+), 30 deletions(-) diff --git a/tests/Maildir1/Maildir1.txt b/tests/Maildir1/Maildir1.txt index afbcb367..17655052 100644 --- a/tests/Maildir1/Maildir1.txt +++ b/tests/Maildir1/Maildir1.txt @@ -1,2 +1,2 @@ -1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/Maildir/a.tager/cur/1134632779.000001.mbox:2,S] [00/05/05 - Mix&Match Meeting in the Zydeco room] 10825 bytes +1 results +text/html [file:///home/dockes/projets/fulltext/testrecoll/Maildir/a.tager/cur/1134632779.000001.mbox:2,S] [00/05/05 - Mix&Match Meeting in the Zydeco room] 9091 bytes diff --git a/tests/chm/chm.txt b/tests/chm/chm.txt index 57d5d882..0266dc93 100644 --- a/tests/chm/chm.txt +++ b/tests/chm/chm.txt @@ -1,8 +1,8 @@ 1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/Nokia_Nseries_Help_jpn.chm] [デジタル著作権管理(DRM)] 321365 bytes +text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/Nokia_Nseries_Help_jpn.chm] [デジタル著作権管理(DRM)] 2912 bytes 1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/soundrec.chm] [Superposer (mixer) des fichiers son] 35269 bytes +text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/soundrec.chm] [Superposer (mixer) des fichiers son] 2243 bytes 1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/Django-1.1a1-r9905.chm] [User authentication in Django] 1731089 bytes +text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/Django-1.1a1-r9905.chm] [User authentication in Django] 115143 bytes 1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/PMGlossary.chm] [Project Management Glossary: P09] 782892 bytes +text/html [file:///home/dockes/projets/fulltext/testrecoll/chm/PMGlossary.chm] [Project Management Glossary: P09] 64667 bytes diff --git a/tests/cjk/cjk.txt b/tests/cjk/cjk.txt index 2fd2bb09..7701f11a 100644 --- a/tests/cjk/cjk.txt +++ b/tests/cjk/cjk.txt @@ -1,9 +1,9 @@ 3 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/cjk/mbox] [Re: recoll sidux and -ja] 68397 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/cjk/mbox] [Re: recoll sidux and -ja] 6773 bytes text/html [file:///home/dockes/projets/fulltext/testrecoll/cjk/japanese.html] [japanese.html] 1403 bytes text/html [file:///home/dockes/projets/fulltext/testrecoll/cjk/mazu.html] [mazu.html] 260 bytes 4 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/cjk/mbox] [Re: recoll sidux and -ja] 68397 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/cjk/mbox] [Re: recoll sidux and -ja] 6773 bytes text/html [file:///home/dockes/projets/fulltext/testrecoll/cjk/japanese.html] [japanese.html] 1403 bytes text/html [file:///home/dockes/projets/fulltext/testrecoll/cjk/masu.html] [masu.html] 215 bytes text/html [file:///home/dockes/projets/fulltext/testrecoll/cjk/term-konsole-ja.htm] [sidux Manuals - The Terminal or Konsole] 34269 bytes diff --git a/tests/compressed/compressed.txt b/tests/compressed/compressed.txt index c481a020..5478b47b 100644 --- a/tests/compressed/compressed.txt +++ b/tests/compressed/compressed.txt @@ -1,4 +1,4 @@ 1 results -text/plain [file:///home/dockes/projets/fulltext/testrecoll/compressed/a b.txt.gz] [a b.txt.gz] 43 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/compressed/a b.txt.gz] [a b.txt.gz] 15 bytes 1 results -text/plain [file:///home/dockes/projets/fulltext/testrecoll/compressed/b b.txt.bz2] [b b.txt.bz2] 51 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/compressed/b b.txt.bz2] [b b.txt.bz2] 15 bytes diff --git a/tests/embed/embed.txt b/tests/embed/embed.txt index afa577c7..cfe488ea 100644 --- a/tests/embed/embed.txt +++ b/tests/embed/embed.txt @@ -1,5 +1,5 @@ xing 3 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/outmail] [video+recdat] 2248254 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/outmail] [video+recdat] 1027 bytes application/msword [file:///home/dockes/projets/fulltext/testrecoll/msword/xingfx1.doc] [xingfx1.doc] 24576 bytes -application/msword [file:///home/dockes/projets/fulltext/testrecoll/embed/thunderbirdlocalfolders.zip] [xingfx1.doc] 2080329 bytes +application/msword [file:///home/dockes/projets/fulltext/testrecoll/embed/thunderbirdlocalfolders.zip] [xingfx1.doc] 24576 bytes diff --git a/tests/gnumeric/gnumeric.txt b/tests/gnumeric/gnumeric.txt index 9ae0c5d6..6224570f 100644 --- a/tests/gnumeric/gnumeric.txt +++ b/tests/gnumeric/gnumeric.txt @@ -1,4 +1,5 @@ -0 results +1 results +application/x-gnumeric [file:///home/dockes/projets/fulltext/testrecoll/gnumeric/trygnumeric.gnumeric] [The gnumericTitle] 2111 bytes 1 results application/x-gnumeric [file:///home/dockes/projets/fulltext/testrecoll/gnumeric/trygnumeric.gnumeric] [The gnumericTitle] 2111 bytes 1 results diff --git a/tests/ics/ics.txt b/tests/ics/ics.txt index 52f98193..e432aa3c 100644 --- a/tests/ics/ics.txt +++ b/tests/ics/ics.txt @@ -1,2 +1,2 @@ 1 results -text/plain [file:///home/dockes/projets/fulltext/testrecoll/ics/icsfile1.ics] [icsfile1.ics] 557 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/ics/icsfile1.ics] [icsfile1.ics] 446 bytes diff --git a/tests/info/info.txt b/tests/info/info.txt index 58bab771..494d97d5 100644 --- a/tests/info/info.txt +++ b/tests/info/info.txt @@ -1,2 +1,2 @@ 1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/info/gpgme.info] [gpgme.info / Preparation / Largefile Support (LFS)] 5076 bytes +text/html [file:///home/dockes/projets/fulltext/testrecoll/info/gpgme.info] [gpgme.info / Preparation / Largefile Support (LFS)] 4145 bytes diff --git a/tests/mail/mail.txt b/tests/mail/mail.txt index 8dda24aa..66b474c8 100644 --- a/tests/mail/mail.txt +++ b/tests/mail/mail.txt @@ -1,13 +1,13 @@ 2 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/outmail] [Re: CDNow, mkfichcom.tcl and "] 2248254 bytes -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/outmail] [Home Ip] 2248254 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/outmail] [Re: CDNow, mkfichcom.tcl and "] 1337 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/outmail] [Home Ip] 166 bytes 1 results message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/BadHtmlInMail] [Prochaine rando] 3637 bytes 1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/mail/attach] [RECOLL: a personal text search system for Unix/Linux] 4814 bytes +text/html [file:///home/dockes/projets/fulltext/testrecoll/mail/attach] [RECOLL: a personal text search system for Unix/Linux] 3390 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/thunderbird/Sent] [Pronote: salut les genies.] 2565 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/thunderbird/Sent] [Pronote: salut les genies.] 568 bytes 1 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/thunderbird/Sent] [De mieux en mieux] 2565 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/mail/thunderbird/Sent] [De mieux en mieux] 557 bytes diff --git a/tests/man/man.txt b/tests/man/man.txt index 147ff9bf..1deb9806 100644 --- a/tests/man/man.txt +++ b/tests/man/man.txt @@ -1,2 +1,2 @@ 1 results -text/x-man [file:///home/dockes/projets/fulltext/testrecoll/man/ifconfig.8.gz] [ifconfig.8.gz] 18576 bytes +text/x-man [file:///home/dockes/projets/fulltext/testrecoll/man/ifconfig.8.gz] [ifconfig.8.gz] 60689 bytes diff --git a/tests/msword/msword.txt b/tests/msword/msword.txt index 03b44a61..a7e19251 100644 --- a/tests/msword/msword.txt +++ b/tests/msword/msword.txt @@ -1,5 +1,5 @@ 2 results application/msword [file:///home/dockes/projets/fulltext/testrecoll/msword/programme.doc] [programme.doc] 58880 bytes -application/msword [file:///home/dockes/projets/fulltext/testrecoll/zip/misc.zip] [misc.zip] 168155 bytes +application/msword [file:///home/dockes/projets/fulltext/testrecoll/zip/misc.zip] [misc.zip] 58880 bytes 1 results application/msword [file:///home/dockes/projets/fulltext/testrecoll/msword/IAmActuallyAnRTF.DOC] [DOC PROGRAMMEUR PCX9] 85381 bytes diff --git a/tests/rar/rar.txt b/tests/rar/rar.txt index 0b215db3..48f764a3 100644 --- a/tests/rar/rar.txt +++ b/tests/rar/rar.txt @@ -1,2 +1,2 @@ 1 results -text/html [file:///home/dockes/projets/fulltext/testrecoll/rar/sheetgen-2.1.2.rar] [sheetgen-2.1.2.rar] 146495 bytes +text/html [file:///home/dockes/projets/fulltext/testrecoll/rar/sheetgen-2.1.2.rar] [sheetgen-2.1.2.rar] 93 bytes diff --git a/tests/rfc2231/rfc2231.txt b/tests/rfc2231/rfc2231.txt index c89fea32..f1d98a3f 100644 --- a/tests/rfc2231/rfc2231.txt +++ b/tests/rfc2231/rfc2231.txt @@ -2,5 +2,5 @@ 0 results 0 results 2 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder] [vrai attach] 42579 bytes -application/octet-stream [file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder] [épatantuniquefilenameterm.bin] 42579 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder] [vrai attach] 11208 bytes +application/octet-stream [file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder] [épatantuniquefilenameterm.bin] 5785 bytes diff --git a/tests/txt/txt.txt b/tests/txt/txt.txt index 31cd9b51..0b2e4886 100644 --- a/tests/txt/txt.txt +++ b/tests/txt/txt.txt @@ -1,4 +1,4 @@ 3 results text/plain [file:///home/dockes/projets/fulltext/testrecoll/txt/liste.txt] [liste.txt] 1182 bytes text/plain [file:///home/dockes/projets/fulltext/testrecoll/txt/liste1.txt] [liste1.txt] 893 bytes -text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/misc.zip] [misc.zip] 168155 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/misc.zip] [misc.zip] 1181 bytes diff --git a/tests/zip/zip.txt b/tests/zip/zip.txt index e4e95774..91e34348 100644 --- a/tests/zip/zip.txt +++ b/tests/zip/zip.txt @@ -1,6 +1,6 @@ 3 results -text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/with blanks.zip] [with blanks.zip] 248 bytes -text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/manysmall.zip] [manysmall.zip] 15222 bytes -text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/misc.zip] [misc.zip] 168155 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/with blanks.zip] [with blanks.zip] 84 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/manysmall.zip] [manysmall.zip] 12 bytes +text/plain [file:///home/dockes/projets/fulltext/testrecoll/zip/misc.zip] [misc.zip] 12 bytes 1 results -message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/zip/maildir.zip] [[FreeBSD-Announce] ZIPPEDMAILDIR_UNIQUEXXX FreeBSD Security Advisory FreeBSD-SA-04:17.procfs] 59171 bytes +message/rfc822 [file:///home/dockes/projets/fulltext/testrecoll/zip/maildir.zip] [[FreeBSD-Announce] ZIPPEDMAILDIR_UNIQUEXXX FreeBSD Security Advisory FreeBSD-SA-04:17.procfs] 10765 bytes