MFB: generalize output

diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt
index 7cd5181116b35685b936f61d442d86d19841b7e6..0eb4a2b8387b016e4ba09846cf54b9dc86525907 100644 (file)
--- 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 4edc753b60f6476b970c04a9dba9bd5caeedfc51..cc643a6b51965732cdf15a95ebba7e87bd650c88 100644 (file)
--- 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 fb7465dc4e7d657e979d55f6046544ba81834174..4269688e14d9355c00029af9ad6b3144a43f2b88 100644 (file)
--- 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 6378e88adf713e92d74c0e05dd8fe2ae5ab8f3ce..feadfed5f9aa66a90d1b009416b0a202ff4cb96a 100644 (file)
--- 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 65b05786f1d15c08829f17015ca9e2d09825f9d9..ca82619d42c37a2dc5e01aba33286a2b66a21459 100644 (file)
--- 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 80d5c69f1d51575f285893be01d5647a2cdd154e..2b4623febf2b4df65273e49101be44ac3df757d1 100644 (file)
--- 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 2fc0f343c3f1676d4ae50776ea8f2f4914cf5a50..e300e6292809cd14617654b035ca654cebc9435c 100644 (file)
--- 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 dfc3783d053527882ce00fb893cd5901a674eb99..8634cefab7878595422d205ffd8c2fbce7513bb8 100644 (file)
--- 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 5fa56b5f765b78dd75ef544591b86aff8a2d744a..7bd78d899efef93cc16306fcb3cc9b73dc10e12b 100644 (file)
--- 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 79861be7a2cfc9706dc7dda9596f2c6d2511049a..d5bc88858a89ed8cb31970baebcc8f64e7b4df04 100644 (file)
--- 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 fda937e243a263741c1497444d176a98b699c297..6ee65f68f0e73c8d9b5b742e1632e955f182a831 100644 (file)
--- 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 4aa080f46c78c84db97279182e28139c6e1dde9b..0a805fae2952cf0e40a045d1aea86650567fe4b0 100644 (file)
--- 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 77b71644fd49392de209d5f352bf34f52e393a7b..f496fbd7691efa91dfc0248f2d10ed841610e7ef 100644 (file)
--- 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 850770d16bbcf0fc09e16f18a18a598827263703..24ee3018297bcec8cfce229a5a83116f03b815b7 100644 (file)
--- 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 6b9579abd47a927c813e1cba6fc5526a5af47409..d8126bce0e7ed79ceca796eb1db366ecaaed0975 100644 (file)
--- 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 35bceb3cad54ef86102b1113ce8d7138047a4839..813baf1a50803892a344557984900ee5b1863cb8 100644 (file)
--- 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 af4a37b817896eaba9e664a1560d9774c71c4a35..0bd2af2887ec0668652a5e06e97f88ee271ce5bb 100644 (file)
--- 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 e21c1a966c79332a4196a8593bd5757ac34de2c1..feba766e685ad1ff506eb8951ee5e9fabaeab44b 100644 (file)
--- 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 40b770dd88e2699d46a1de2ddfa526f412a1dd1a..05d6c6de30d8d0c6f7181813aef0f1bddd54c125 100644 (file)
--- 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"