From 1a88e45cf29084d89ca1f5b8c6b1712040e7253c Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Tue, 22 Sep 2009 12:35:35 +0000 Subject: [PATCH] MFB: generalize output --- ext/imap/tests/imap_body_basic.phpt | 8 ++++++-- ext/imap/tests/imap_bodystruct_basic.phpt | 2 +- ext/imap/tests/imap_clearflag_full_basic.phpt | 2 +- ext/imap/tests/imap_close_variation2.phpt | 2 +- ext/imap/tests/imap_close_variation4.phpt | 2 +- ext/imap/tests/imap_fetch_overview_basic.phpt | 2 +- ext/imap/tests/imap_fetch_overview_error.phpt | 2 +- ext/imap/tests/imap_fetch_overview_variation2.phpt | 2 +- ext/imap/tests/imap_fetch_overview_variation3.phpt | 2 +- ext/imap/tests/imap_fetch_overview_variation5.phpt | 2 +- ext/imap/tests/imap_fetch_overview_variation6.phpt | 2 +- ext/imap/tests/imap_fetchbody_basic.phpt | 2 +- ext/imap/tests/imap_fetchbody_error.phpt | 2 +- ext/imap/tests/imap_fetchbody_variation2.phpt | 2 +- ext/imap/tests/imap_fetchbody_variation4.phpt | 2 +- ext/imap/tests/imap_fetchbody_variation6.phpt | 2 +- ext/imap/tests/imap_fetchheader_variation2.phpt | 8 ++++---- ext/imap/tests/imap_fetchheader_variation3.phpt | 2 +- ext/imap/tests/imap_fetchheader_variation5.phpt | 6 +++--- 19 files changed, 29 insertions(+), 25 deletions(-) diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt index 7cd5181116..0eb4a2b838 100644 --- a/ext/imap/tests/imap_body_basic.phpt +++ b/ext/imap/tests/imap_body_basic.phpt @@ -27,6 +27,9 @@ echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; // show body for msg 1 var_dump(imap_body($imap_stream, 1)); +//Access via FT_UID +var_dump(imap_body($imap_stream, 1, FT_UID)); + imap_close($imap_stream); ?> ===Done=== @@ -40,5 +43,6 @@ Create a new mailbox for test Create a temporary mailbox and add 1 msgs .. mailbox '%s' created Msg Count in new mailbox: 1 -string(%d) "1: this is a test message, please ignore%a" -===Done=== \ No newline at end of file +%unicode|string%(%d) "1: this is a test message, please ignore%a" +%unicode|string%(%d) "1: this is a test message, please ignore%a" +===Done=== diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt index 4edc753b60..cc643a6b51 100644 --- a/ext/imap/tests/imap_bodystruct_basic.phpt +++ b/ext/imap/tests/imap_bodystruct_basic.phpt @@ -77,7 +77,7 @@ require_once('clean.inc'); *** Testing string imap_bodystruct : basic functionality *** Create a new mailbox for test and add a multipart msgs Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created Get and validate structure of body part 1 ifsubtype is 0 or 1 diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt index fb7465dc4e..4269688e14 100644 --- a/ext/imap/tests/imap_clearflag_full_basic.phpt +++ b/ext/imap/tests/imap_clearflag_full_basic.phpt @@ -56,7 +56,7 @@ require_once('clean.inc'); *** Testing imap_clearflag_full() : basic functionality *** Create a new mailbox for test Create a temporary mailbox and add 10 msgs -.. mailbox '{localhost/norsh}INBOX.%s' created +.. mailbox '{%s}%s' created Initial msg count in new_mailbox : 10 Set some flags bool(true) diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt index 6378e88adf..feadfed5f9 100644 --- a/ext/imap/tests/imap_close_variation2.phpt +++ b/ext/imap/tests/imap_close_variation2.phpt @@ -118,7 +118,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_close() : usage variations *** Create a temporary mailbox and add 3 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- Iteration 1 -- bool(true) diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt index 65b05786f1..ca82619d42 100644 --- a/ext/imap/tests/imap_close_variation4.phpt +++ b/ext/imap/tests/imap_close_variation4.phpt @@ -66,7 +66,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_close() : usage variations *** Create a temporary mailbox and add 3 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- Iteration 1 -- bool(true) diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt index 80d5c69f1d..2b4623febf 100644 --- a/ext/imap/tests/imap_fetch_overview_basic.phpt +++ b/ext/imap/tests/imap_fetch_overview_basic.phpt @@ -77,7 +77,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetch_overview() : basic functionality *** Create a temporary mailbox and add 2 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- All possible arguments -- diff --git a/ext/imap/tests/imap_fetch_overview_error.phpt b/ext/imap/tests/imap_fetch_overview_error.phpt index 2fc0f343c3..e300e62928 100644 --- a/ext/imap/tests/imap_fetch_overview_error.phpt +++ b/ext/imap/tests/imap_fetch_overview_error.phpt @@ -42,7 +42,7 @@ require_once(dirname(__FILE__).'/clean.inc'); -- Testing imap_fetch_overview() function with more than expected no. of arguments -- Create a temporary mailbox and add 2 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created Warning: imap_fetch_overview() expects at most 3 parameters, 4 given in %s on line %d NULL diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt index dfc3783d05..8634cefab7 100644 --- a/ext/imap/tests/imap_fetch_overview_variation2.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt @@ -136,7 +136,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetch_overview() : usage variations *** Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- Testing with second argument value: int(0) Sequence out of range diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt index 5fa56b5f76..7bd78d899e 100644 --- a/ext/imap/tests/imap_fetch_overview_variation3.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt @@ -56,7 +56,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetch_overview() : usage variations *** Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created Testing with option value:%string|unicode%(1) "1" imap_fetch_overview() returns an object diff --git a/ext/imap/tests/imap_fetch_overview_variation5.phpt b/ext/imap/tests/imap_fetch_overview_variation5.phpt index 79861be7a2..d5bc88858a 100644 --- a/ext/imap/tests/imap_fetch_overview_variation5.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation5.phpt @@ -67,7 +67,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetch_overview() : usage variations *** Create a temporary mailbox and add 3 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- $msg_no is 0 -- Sequence out of range diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt index fda937e243..6ee65f68f0 100644 --- a/ext/imap/tests/imap_fetch_overview_variation6.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt @@ -110,7 +110,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetch_overview() : usage variations *** Create a temporary mailbox and add 0 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created --> Object #1 size is %d diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt index 4aa080f46c..0a805fae29 100644 --- a/ext/imap/tests/imap_fetchbody_basic.phpt +++ b/ext/imap/tests/imap_fetchbody_basic.phpt @@ -66,7 +66,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetchbody() : basic functionality *** Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- All possible arguments -- -- Option is FT_UID -- diff --git a/ext/imap/tests/imap_fetchbody_error.phpt b/ext/imap/tests/imap_fetchbody_error.phpt index 77b71644fd..f496fbd769 100644 --- a/ext/imap/tests/imap_fetchbody_error.phpt +++ b/ext/imap/tests/imap_fetchbody_error.phpt @@ -45,7 +45,7 @@ require_once(dirname(__FILE__).'/clean.inc'); -- Testing imap_fetchbody() function with more than expected no. of arguments -- Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created Warning: imap_fetchbody() expects at most 4 parameters, 5 given in %s on line %d NULL diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt index 850770d16b..24ee301829 100644 --- a/ext/imap/tests/imap_fetchbody_variation2.phpt +++ b/ext/imap/tests/imap_fetchbody_variation2.phpt @@ -105,7 +105,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetchbody() : usage variations *** Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- Iteration 1 -- diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt index 6b9579abd4..d8126bce0e 100644 --- a/ext/imap/tests/imap_fetchbody_variation4.phpt +++ b/ext/imap/tests/imap_fetchbody_variation4.phpt @@ -53,7 +53,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetchbody() : usage variations *** Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- Iteration 1 -- FT_UID valid diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt index 35bceb3cad..813baf1a50 100644 --- a/ext/imap/tests/imap_fetchbody_variation6.phpt +++ b/ext/imap/tests/imap_fetchbody_variation6.phpt @@ -46,7 +46,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetchbody() : usage variations *** Create a temporary mailbox and add 3 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- $msg_no is 0 -- diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt index af4a37b817..0bd2af2887 100644 --- a/ext/imap/tests/imap_fetchheader_variation2.phpt +++ b/ext/imap/tests/imap_fetchheader_variation2.phpt @@ -120,7 +120,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetchheader() : usage variations *** Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- Iteration 1 -- @@ -130,7 +130,7 @@ bool(false) -- Iteration 2 -- %unicode|string%(%d) "From: foo@anywhere.com Subject: Test msg 1 -To: webmaster@something.com +To: %s MIME-Version: 1.0 Content-Type: MULTIPART/mixed; BOUNDARY="%s" @@ -184,7 +184,7 @@ bool(false) -- Iteration 12 -- %unicode|string%(%d) "From: foo@anywhere.com Subject: Test msg 1 -To: webmaster@something.com +To: %s MIME-Version: 1.0 Content-Type: MULTIPART/mixed; BOUNDARY="%s" @@ -198,7 +198,7 @@ bool(false) -- Iteration 14 -- %unicode|string%(%d) "From: foo@anywhere.com Subject: Test msg 1 -To: webmaster@something.com +To: %s MIME-Version: 1.0 Content-Type: MULTIPART/mixed; BOUNDARY="%s" diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt index e21c1a966c..feba766e68 100644 --- a/ext/imap/tests/imap_fetchheader_variation3.phpt +++ b/ext/imap/tests/imap_fetchheader_variation3.phpt @@ -51,7 +51,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetchheader() : usage variations *** Create a temporary mailbox and add 1 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- Iteration 1 -- FT_UID valid diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt index 40b770dd88..05d6c6de30 100644 --- a/ext/imap/tests/imap_fetchheader_variation5.phpt +++ b/ext/imap/tests/imap_fetchheader_variation5.phpt @@ -47,7 +47,7 @@ require_once(dirname(__FILE__).'/clean.inc'); --EXPECTF-- *** Testing imap_fetchheader() : usage variations *** Create a temporary mailbox and add 3 msgs -.. mailbox '{localhost/norsh}INBOX.phpttest' created +.. mailbox '{%s}%s' created -- $msg_no is 0 -- @@ -66,7 +66,7 @@ bool(false) Notice: A non well formed numeric value encountered in %s on line %d %unicode|string%(%d) "From: foo@anywhere.com Subject: Test msg 1 -To: webmaster@something.com +To: %s MIME-Version: 1.0 Content-Type: MULTIPART/mixed; BOUNDARY="%s" @@ -77,7 +77,7 @@ Content-Type: MULTIPART/mixed; BOUNDARY="%s" Notice: A non well formed numeric value encountered in %s on line %d %unicode|string%(%d) "From: foo@anywhere.com Subject: Test msg 1 -To: webmaster@something.com +To: %s MIME-Version: 1.0 Content-Type: MULTIPART/mixed; BOUNDARY="%s" -- 2.50.1