diff options
author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-19 05:59:41 -0300 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-20 21:53:48 +0100 |
commit | ded3d984c6133b1f508ed84e96df3316e207c99b (patch) | |
tree | 175c208197d72966fbeb22c1df9dac0a1a33124f /ext/pdo_oci | |
parent | a00286921e8963d284a7a5db0c1fecffa6cb6b54 (diff) | |
download | php-git-ded3d984c6133b1f508ed84e96df3316e207c99b.tar.gz |
Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
Diffstat (limited to 'ext/pdo_oci')
-rw-r--r-- | ext/pdo_oci/tests/bug41996.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug46274.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug54379.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug57702.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/bug60994.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/checkliveness.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_fread_1.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_quote1.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_stream_1.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_stream_2b.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pdo_oci_templob_1.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_oci/tests/pecl_bug_6364.phpt | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/ext/pdo_oci/tests/bug41996.phpt b/ext/pdo_oci/tests/bug41996.phpt index ac8e35fe60..695a678da1 100644 --- a/ext/pdo_oci/tests/bug41996.phpt +++ b/ext/pdo_oci/tests/bug41996.phpt @@ -16,5 +16,5 @@ $stmt = $db->prepare('SELECT rowid FROM dual'); $stmt->execute(); $row = $stmt->fetch(); var_dump(strlen($row[0]) > 0); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/pdo_oci/tests/bug46274.phpt b/ext/pdo_oci/tests/bug46274.phpt index 23ee8ee20f..7b4b3f74f2 100644 --- a/ext/pdo_oci/tests/bug46274.phpt +++ b/ext/pdo_oci/tests/bug46274.phpt @@ -56,7 +56,7 @@ var_dump($res->fetch()); $db->exec("DROP TABLE test_one_blob"); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["blob1"]=> string(3) "foo" diff --git a/ext/pdo_oci/tests/bug54379.phpt b/ext/pdo_oci/tests/bug54379.phpt index abb6bc73e1..b356f7dfc8 100644 --- a/ext/pdo_oci/tests/bug54379.phpt +++ b/ext/pdo_oci/tests/bug54379.phpt @@ -26,7 +26,7 @@ $stmt->execute(); var_dump($stmt->fetchAll(PDO::FETCH_ASSOC)); $db->exec("DROP TABLE test"); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(1) { diff --git a/ext/pdo_oci/tests/bug57702.phpt b/ext/pdo_oci/tests/bug57702.phpt index d0abc6ff8c..4389276195 100644 --- a/ext/pdo_oci/tests/bug57702.phpt +++ b/ext/pdo_oci/tests/bug57702.phpt @@ -146,7 +146,7 @@ $stmt->execute(); print "done\n"; ?> ---EXPECTF-- +--EXPECT-- First Query string(11) "row 1 col 1" string(11) "row 1 col 2" diff --git a/ext/pdo_oci/tests/bug60994.phpt b/ext/pdo_oci/tests/bug60994.phpt index 0f27222de9..5ac2644bee 100644 --- a/ext/pdo_oci/tests/bug60994.phpt +++ b/ext/pdo_oci/tests/bug60994.phpt @@ -96,7 +96,7 @@ echo 'end of stream4 is ', $ending4, PHP_EOL; --XFAIL-- Fails due to Bug 60994 ---EXPECTF-- +--EXPECT-- Test 1: j size of string1 is 1000006 bytes, 1000006 chars. diff --git a/ext/pdo_oci/tests/checkliveness.phpt b/ext/pdo_oci/tests/checkliveness.phpt index 4bb070f40d..a403a3929e 100644 --- a/ext/pdo_oci/tests/checkliveness.phpt +++ b/ext/pdo_oci/tests/checkliveness.phpt @@ -46,7 +46,7 @@ try { } $db = null; ---EXPECTF-- +--EXPECT-- array(2) { ["DUMMY"]=> string(1) "X" diff --git a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt index ab9b99fc6c..4066db6a8f 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt @@ -44,7 +44,7 @@ $dbh2->exec("drop table pdo_ac_tab"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- PDO::ATTR_AUTOCOMMIT: bool(false) Insert data Second connection should be able to see committed data diff --git a/ext/pdo_oci/tests/pdo_oci_fread_1.phpt b/ext/pdo_oci/tests/pdo_oci_fread_1.phpt index 26a92f01b4..dac53dbea7 100644 --- a/ext/pdo_oci/tests/pdo_oci_fread_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_fread_1.phpt @@ -55,6 +55,6 @@ foreach ($stmtarray as $stmt) { } ?> ---EXPECTF-- +--EXPECT-- Test 1 *abcjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjxyz* diff --git a/ext/pdo_oci/tests/pdo_oci_quote1.phpt b/ext/pdo_oci/tests/pdo_oci_quote1.phpt index d92317f8d0..1ee83fde4f 100644 --- a/ext/pdo_oci/tests/pdo_oci_quote1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_quote1.phpt @@ -39,7 +39,7 @@ echo "Done\n"; @$db->exec("drop table poq_tab"); ?> ---EXPECTF-- +--EXPECT-- Unquoted : NULL Quoted : string(2) "''" array(1) { diff --git a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt index 27a28b9bb8..9f17e9f61b 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt @@ -84,7 +84,7 @@ foreach ($stmtarray as $stmt) { } ?> ---EXPECTF-- +--EXPECT-- Test 1 Read b$ Read cd$ diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt index 22ae7c6724..54a5ef840b 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt @@ -66,5 +66,5 @@ echo "Fetch operation done!\n"; $db->exec("drop table pdo_oci_stream_2"); ?> ---EXPECTF-- +--EXPECT-- Fetch operation done! diff --git a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt index 41391058dd..d79b6b72ce 100644 --- a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt @@ -80,6 +80,6 @@ else } ?> ---EXPECTF-- +--EXPECT-- Success! All the temporary LOB in previously closed statements are properly cleaned. diff --git a/ext/pdo_oci/tests/pecl_bug_6364.phpt b/ext/pdo_oci/tests/pecl_bug_6364.phpt index b2981ec0bc..925665e42b 100644 --- a/ext/pdo_oci/tests/pecl_bug_6364.phpt +++ b/ext/pdo_oci/tests/pecl_bug_6364.phpt @@ -43,7 +43,7 @@ $dbh->exec ("drop table bug_6364_t"); ?> ---EXPECTF-- +--EXPECT-- string(4) "val4" string(4) "val5" array(10) { |