From: Wez Furlong Date: Thu, 7 Jul 2005 13:58:35 +0000 (+0000) Subject: adopt common tests X-Git-Tag: php-5.1.0b3~136 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=618afbdfc898af4fe57fe00c5344a6316b0ef5ab;p=php adopt common tests --- diff --git a/ext/pdo_oci/tests/common.phpt b/ext/pdo_oci/tests/common.phpt new file mode 100644 index 0000000000..413b57bbf2 --- /dev/null +++ b/ext/pdo_oci/tests/common.phpt @@ -0,0 +1,26 @@ +--TEST-- +OCI +--SKIPIF-- + +--REDIRECTTEST-- +# magic auto-configuration + +$config = array( + 'TESTS' => 'ext/pdo/tests' +); + + +if (false !== getenv('PDO_OCI_TEST_DSN')) { + # user set them from their shell + $config['ENV']['PDOTEST_DSN'] = getenv('PDO_OCI_TEST_DSN'); + $config['ENV']['PDOTEST_USER'] = getenv('PDO_OCI_TEST_USER'); + $config['ENV']['PDOTEST_PASS'] = getenv('PDO_OCI_TEST_PASS'); + $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_OCI_TEST_ATTR'); +} else { + $config['ENV']['PDOTEST_DSN'] = 'oci:dbname=test'; + $config['ENV']['PDOTEST_USER'] = 'SYSTEM'; + $config['ENV']['PDOTEST_PASS'] = 'PASSWORD'; +} + +return $config; diff --git a/ext/pdo_oci/tests/connection.inc b/ext/pdo_oci/tests/connection.inc deleted file mode 100755 index 9b1e49f4a8..0000000000 --- a/ext/pdo_oci/tests/connection.inc +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/ext/pdo_oci/tests/pdo_001.phpt b/ext/pdo_oci/tests/pdo_001.phpt deleted file mode 100755 index a017717924..0000000000 --- a/ext/pdo_oci/tests/pdo_001.phpt +++ /dev/null @@ -1,41 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_ASSOC ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -array(3) { - [0]=> - array(2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - array(2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - array(2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_002.phpt b/ext/pdo_oci/tests/pdo_002.phpt deleted file mode 100755 index 4ce1256213..0000000000 --- a/ext/pdo_oci/tests/pdo_002.phpt +++ /dev/null @@ -1,41 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_NUM ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -array(3) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "A" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(1) "B" - } - [2]=> - array(2) { - [0]=> - string(1) "3" - [1]=> - string(1) "C" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_003.phpt b/ext/pdo_oci/tests/pdo_003.phpt deleted file mode 100755 index 5d2ab9358c..0000000000 --- a/ext/pdo_oci/tests/pdo_003.phpt +++ /dev/null @@ -1,53 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_BOTH ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -array(3) { - [0]=> - array(4) { - ["id"]=> - string(1) "1" - [0]=> - string(1) "1" - ["val"]=> - string(1) "A" - [1]=> - string(1) "A" - } - [1]=> - array(4) { - ["id"]=> - string(1) "2" - [0]=> - string(1) "2" - ["val"]=> - string(1) "B" - [1]=> - string(1) "B" - } - [2]=> - array(4) { - ["id"]=> - string(1) "3" - [0]=> - string(1) "3" - ["val"]=> - string(1) "C" - [1]=> - string(1) "C" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_004.phpt b/ext/pdo_oci/tests/pdo_004.phpt deleted file mode 100755 index 78f01a477c..0000000000 --- a/ext/pdo_oci/tests/pdo_004.phpt +++ /dev/null @@ -1,41 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_OBJ ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(3) { - [0]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_005.phpt b/ext/pdo_oci/tests/pdo_005.phpt deleted file mode 100755 index ceeebb2869..0000000000 --- a/ext/pdo_oci/tests/pdo_005.phpt +++ /dev/null @@ -1,120 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_CLASS ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(3) { - [0]=> - object(stdClass)#%d (3) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - ["val2"]=> - string(2) "AA" - } - [1]=> - object(stdClass)#%d (3) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - ["val2"]=> - string(2) "BB" - } - [2]=> - object(stdClass)#%d (3) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - ["val2"]=> - string(2) "CC" - } -} -array(3) { - [0]=> - object(TestBase)#%d (3) { - ["id"]=> - string(1) "1" - ["val:protected"]=> - string(1) "A" - ["val2:private"]=> - string(2) "AA" - } - [1]=> - object(TestBase)#%d (3) { - ["id"]=> - string(1) "2" - ["val:protected"]=> - string(1) "B" - ["val2:private"]=> - string(2) "BB" - } - [2]=> - object(TestBase)#%d (3) { - ["id"]=> - string(1) "3" - ["val:protected"]=> - string(1) "C" - ["val2:private"]=> - string(2) "CC" - } -} -TestDerived::__construct(0,1) -TestDerived::__construct(1,2) -TestDerived::__construct(2,3) -array(3) { - [0]=> - object(TestDerived)#%d (5) { - ["row:protected"]=> - int(0) - ["id"]=> - string(1) "1" - ["val:protected"]=> - string(1) "A" - ["val2:private"]=> - NULL - ["val2"]=> - string(2) "AA" - } - [1]=> - object(TestDerived)#%d (5) { - ["row:protected"]=> - int(1) - ["id"]=> - string(1) "2" - ["val:protected"]=> - string(1) "B" - ["val2:private"]=> - NULL - ["val2"]=> - string(2) "BB" - } - [2]=> - object(TestDerived)#%d (5) { - ["row:protected"]=> - int(2) - ["id"]=> - string(1) "3" - ["val:protected"]=> - string(1) "C" - ["val2:private"]=> - NULL - ["val2"]=> - string(2) "CC" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_006.phpt b/ext/pdo_oci/tests/pdo_006.phpt deleted file mode 100755 index 081e99896b..0000000000 --- a/ext/pdo_oci/tests/pdo_006.phpt +++ /dev/null @@ -1,64 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_GROUP ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(2) { - ["A"]=> - array(2) { - [0]=> - array(1) { - [0]=> - string(1) "1" - } - [1]=> - array(1) { - [0]=> - string(1) "2" - } - } - ["C"]=> - array(1) { - [0]=> - array(1) { - [0]=> - string(1) "3" - } - } -} -array(2) { - ["A"]=> - array(2) { - [0]=> - array(1) { - ["id"]=> - string(1) "1" - } - [1]=> - array(1) { - ["id"]=> - string(1) "2" - } - } - ["C"]=> - array(1) { - [0]=> - array(1) { - ["id"]=> - string(1) "3" - } - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_007.phpt b/ext/pdo_oci/tests/pdo_007.phpt deleted file mode 100755 index 96902e1c7f..0000000000 --- a/ext/pdo_oci/tests/pdo_007.phpt +++ /dev/null @@ -1,52 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_UNIQUE ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(3) { - ["A"]=> - array(1) { - [0]=> - string(1) "A" - } - ["B"]=> - array(1) { - [0]=> - string(1) "A" - } - ["C"]=> - array(1) { - [0]=> - string(1) "C" - } -} -array(3) { - ["A"]=> - array(1) { - ["val"]=> - string(1) "A" - } - ["B"]=> - array(1) { - ["val"]=> - string(1) "A" - } - ["C"]=> - array(1) { - ["val"]=> - string(1) "C" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_008.phpt b/ext/pdo_oci/tests/pdo_008.phpt deleted file mode 100755 index 292a157b38..0000000000 --- a/ext/pdo_oci/tests/pdo_008.phpt +++ /dev/null @@ -1,30 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_UNIQUE conflict ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(2) { - ["A"]=> - array(1) { - [0]=> - string(1) "B" - } - ["C"]=> - array(1) { - [0]=> - string(1) "C" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_009.phpt b/ext/pdo_oci/tests/pdo_009.phpt deleted file mode 100755 index 714eb177aa..0000000000 --- a/ext/pdo_oci/tests/pdo_009.phpt +++ /dev/null @@ -1,89 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_CLASSTYPE ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(4) { - [0]=> - array(3) { - [0]=> - string(8) "stdClass" - [1]=> - string(1) "1" - [2]=> - string(1) "A" - } - [1]=> - array(3) { - [0]=> - string(5) "Test1" - [1]=> - string(1) "2" - [2]=> - string(1) "B" - } - [2]=> - array(3) { - [0]=> - string(5) "Test2" - [1]=> - string(1) "3" - [2]=> - string(1) "C" - } - [3]=> - array(3) { - [0]=> - NULL - [1]=> - string(1) "4" - [2]=> - string(1) "D" - } -} -Test1::__construct() -Test2::__construct() -Test3::__construct() -array(4) { - [0]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(Test2)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [3]=> - object(Test3)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_010.phpt b/ext/pdo_oci/tests/pdo_010.phpt deleted file mode 100755 index 93d525e4d6..0000000000 --- a/ext/pdo_oci/tests/pdo_010.phpt +++ /dev/null @@ -1,76 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_(CLASSTYPE and GROUP/UNIQUE) ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -Test1::__construct() -Test2::__construct() -Test3::__construct() -array(2) { - ["Group1"]=> - array(2) { - [0]=> - object(stdClass)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - } - ["Group2"]=> - array(2) { - [0]=> - object(Test2)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [1]=> - object(Test3)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } - } -} -Test1::__construct() -Test2::__construct() -Test3::__construct() -array(2) { - ["Group1"]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - ["Group2"]=> - object(Test3)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_011.phpt b/ext/pdo_oci/tests/pdo_011.phpt deleted file mode 100755 index 28f23ea53e..0000000000 --- a/ext/pdo_oci/tests/pdo_011.phpt +++ /dev/null @@ -1,181 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_FUNC and statement overloading ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -Test1::__construct(0,0) -test(1,N/A) -test(2,N/A) -test(3,N/A) -test(4,N/A) -array(2) { - ["Group1"]=> - array(2) { - [0]=> - array(1) { - [1]=> - string(3) "N/A" - } - [1]=> - array(1) { - [2]=> - string(3) "N/A" - } - } - ["Group2"]=> - array(2) { - [0]=> - array(1) { - [3]=> - string(3) "N/A" - } - [1]=> - array(1) { - [4]=> - string(3) "N/A" - } - } -} -test(1,A) -test(2,B) -test(3,C) -test(4,D) -array(4) { - [0]=> - array(1) { - [1]=> - string(1) "A" - } - [1]=> - array(1) { - [2]=> - string(1) "B" - } - [2]=> - array(1) { - [3]=> - string(1) "C" - } - [3]=> - array(1) { - [4]=> - string(1) "D" - } -} -Test1::factory(1,A) -Test1::__construct(1,A) -Test1::factory(2,B) -Test1::__construct(2,B) -Test1::factory(3,C) -Test1::__construct(3,C) -Test1::factory(4,D) -Test1::__construct(4,D) -array(4) { - [0]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [3]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} -Test1::factory(1,A) -Test1::__construct(1,A) -Test1::factory(2,B) -Test1::__construct(2,B) -Test1::factory(3,C) -Test1::__construct(3,C) -Test1::factory(4,D) -Test1::__construct(4,D) -array(4) { - [0]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "1" - ["val"]=> - string(1) "A" - } - [1]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "2" - ["val"]=> - string(1) "B" - } - [2]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "3" - ["val"]=> - string(1) "C" - } - [3]=> - object(Test1)#%d (2) { - ["id"]=> - string(1) "4" - ["val"]=> - string(1) "D" - } -} -DerivedStatement::__construct(Overloaded) -string(16) "DerivedStatement" -DerivedStatement::retrieve(1,A) -DerivedStatement::retrieve(2,B) -DerivedStatement::retrieve(3,C) -DerivedStatement::retrieve(4,D) -array(4) { - [0]=> - array(1) { - [1]=> - string(1) "A" - } - [1]=> - array(1) { - [2]=> - string(1) "B" - } - [2]=> - array(1) { - [3]=> - string(1) "C" - } - [3]=> - array(1) { - [4]=> - string(1) "D" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_012.phpt b/ext/pdo_oci/tests/pdo_012.phpt deleted file mode 100755 index 2dff830811..0000000000 --- a/ext/pdo_oci/tests/pdo_012.phpt +++ /dev/null @@ -1,70 +0,0 @@ ---TEST-- -PDO_OCI: PDOStatement::setFetchMode ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(2) { - [0]=> - array(2) { - [0]=> - string(1) "A" - [1]=> - string(6) "Group1" - } - [1]=> - array(2) { - [0]=> - string(1) "B" - [1]=> - string(6) "Group2" - } -} -Test::__construct(N/A) -Test::__construct(N/A) -array(2) { - [0]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" - } - [1]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" - } -} -Test::__construct(Changed) -Test::__construct(Changed) -array(2) { - [0]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" - } - [1]=> - object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_013.phpt b/ext/pdo_oci/tests/pdo_013.phpt deleted file mode 100755 index acb6b14f57..0000000000 --- a/ext/pdo_oci/tests/pdo_013.phpt +++ /dev/null @@ -1,58 +0,0 @@ ---TEST-- -PDO_OCI: PDOStatement is Traversable ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(2) { - [0]=> - string(1) "A" - [1]=> - string(6) "Group1" -} -array(2) { - [0]=> - string(1) "B" - [1]=> - string(6) "Group2" -} -Test::__construct(N/A) -object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" -} -Test::__construct(N/A) -object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" -} -Test::__construct(WOW) -object(Test)#%d (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" -} -Test::__construct(WOW) -object(Test)#%d (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_014.phpt b/ext/pdo_oci/tests/pdo_014.phpt deleted file mode 100755 index 82b2d74e80..0000000000 --- a/ext/pdo_oci/tests/pdo_014.phpt +++ /dev/null @@ -1,50 +0,0 @@ ---TEST-- -PDO_OCI: PDOStatement and SPL Iterators ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -Test::__construct(WOW) -object(Test)#4 (2) { - ["val"]=> - string(1) "A" - ["grp"]=> - string(6) "Group1" -} -Test::__construct(WOW) -object(Test)#6 (2) { - ["val"]=> - string(1) "B" - ["grp"]=> - string(6) "Group2" -} -NULL -bool(false) -PDOStatementAggregate::__construct -PDOStatementAggregate::getIterator -array(2) { - [0]=> - string(1) "A" - [1]=> - string(6) "Group1" -} -array(2) { - [0]=> - string(1) "B" - [1]=> - string(6) "Group2" -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_015.phpt b/ext/pdo_oci/tests/pdo_015.phpt deleted file mode 100755 index 867c2b12c4..0000000000 --- a/ext/pdo_oci/tests/pdo_015.phpt +++ /dev/null @@ -1,77 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_COLUMN ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" -} -array(2) { - [0]=> - string(2) "A2" - [1]=> - string(2) "B2" -} -array(2) { - [1]=> - array(1) { - [0]=> - string(1) "A" - } - [2]=> - array(1) { - [0]=> - string(1) "A" - } -} -array(2) { - [1]=> - string(1) "A" - [2]=> - string(1) "A" -} -array(2) { - [1]=> - string(1) "1" - [2]=> - string(1) "2" -} -array(2) { - [1]=> - string(1) "A" - [2]=> - string(1) "A" -} -array(2) { - [1]=> - string(2) "A2" - [2]=> - string(2) "B2" -} -array(1) { - ["A"]=> - array(2) { - [0]=> - string(2) "A2" - [1]=> - string(2) "B2" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_016.phpt b/ext/pdo_oci/tests/pdo_016.phpt deleted file mode 100755 index be0ca27d99..0000000000 --- a/ext/pdo_oci/tests/pdo_016.phpt +++ /dev/null @@ -1,117 +0,0 @@ ---TEST-- -PDO_OCI: PDO_FETCH_BOUND ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -===INIT=== -int(1) -int(1) -int(1) -string(1) "3" -array(3) { - [0]=> - string(7) "String0" - [1]=> - string(7) "String1" - [2]=> - string(7) "String2" -} -===WHILE=== -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -===ALONE=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -bool(true) -bool(true) -array(1) { - [2]=> - string(7) "String2" -} -===REBIND/SAME=== -array(1) { - [0]=> - string(7) "String0" -} -bool(true) -bool(true) -string(7) "String0" -bool(true) -bool(true) -string(1) "0" -array(1) { - [1]=> - string(7) "String1" -} -bool(true) -bool(true) -string(7) "String1" -bool(true) -bool(true) -string(1) "1" -array(1) { - [2]=> - string(7) "String2" -} -bool(true) -bool(true) -string(7) "String2" -bool(true) -bool(true) -string(1) "2" -===REBIND/CONFLICT=== -string(7) "String0" -string(7) "String1" -string(7) "String2" -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_017.phpt b/ext/pdo_oci/tests/pdo_017.phpt deleted file mode 100755 index f09dcba77c..0000000000 --- a/ext/pdo_oci/tests/pdo_017.phpt +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -PDO_OCI: PDO::beginTransaction / PDO::rollBack ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -Counted 3 rows after insert. -Counted 0 rows after delete. -Counted 3 rows after rollback. -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_018.phpt b/ext/pdo_oci/tests/pdo_018.phpt deleted file mode 100755 index bc038f20dd..0000000000 --- a/ext/pdo_oci/tests/pdo_018.phpt +++ /dev/null @@ -1,136 +0,0 @@ ---TEST-- -PDO_OCI: PDO Unserializing ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -===INIT=== -int(1) -int(1) -int(1) -string(1) "3" -array(3) { - [0]=> - string(8) "stdClass" - [1]=> - string(8) "TestBase" - [2]=> - string(11) "TestDerived" -} -===TYPES=== -array(4) { - ["stdClass"]=> - string(1) "0" - ["TestBase"]=> - string(1) "1" - ["TestDerived"]=> - string(1) "2" - ["TestLeaf"]=> - NULL -} -===INSERT=== -TestBase::serialize() = 'a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}' -TestDerived::serialize() -TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' -TestDerived::serialize() -TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' -===DATA=== -array(4) { - [0]=> - NULL - [1]=> - string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" - [2]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - [3]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" -} -===FAILURE=== -Exception:Class stdClass cannot be unserialized -===COUNT=== -string(1) "3" -===DATABASE=== -array(3) { - [0]=> - array(2) { - ["name"]=> - string(8) "TestBase" - ["val"]=> - string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" - } - [1]=> - array(2) { - ["name"]=> - string(11) "TestDerived" - ["val"]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - } - [2]=> - array(2) { - ["name"]=> - NULL - ["val"]=> - string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" - } -} -===FETCHCLASS=== -TestBase::unserialize[22](a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}) -TestDerived::unserialize() -TestBase::unserialize[22](a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) -TestDerived::unserialize() -TestBase::unserialize[22](a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) -array(3) { - [0]=> - object(TestBase)#%d (3) { - ["BasePub"]=> - string(7) "#Public" - ["BasePro:protected"]=> - string(10) "#Protected" - ["BasePri:private"]=> - string(8) "#Private" - } - [1]=> - object(TestDerived)#%d (6) { - ["BasePub"]=> - string(14) "#DerivedPublic" - ["BasePro:protected"]=> - string(17) "#DerivdeProtected" - ["DerivedPub"]=> - string(7) "#Public" - ["DerivedPro:protected"]=> - string(10) "#Protected" - ["DerivedPri:private"]=> - string(7) "Private" - ["BasePri:private"]=> - string(7) "Private" - } - [2]=> - object(TestLeaf)#%d (6) { - ["BasePub"]=> - string(14) "#DerivedPublic" - ["BasePro:protected"]=> - string(17) "#DerivdeProtected" - ["DerivedPub"]=> - string(7) "#Public" - ["DerivedPro:protected"]=> - string(10) "#Protected" - ["DerivedPri:private"]=> - string(7) "Private" - ["BasePri:private"]=> - string(7) "Private" - } -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_019.phpt b/ext/pdo_oci/tests/pdo_019.phpt deleted file mode 100755 index 1dcdd92cb9..0000000000 --- a/ext/pdo_oci/tests/pdo_019.phpt +++ /dev/null @@ -1,52 +0,0 @@ ---TEST-- -PDO_OCI: fetch() and while() ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECTF-- -===INIT=== -int(1) -int(1) -int(1) -int(1) -string(1) "4" -array(4) { - [0]=> - string(7) "String0" - [1]=> - string(7) "String1" - [2]=> - string(7) "String2" - [3]=> - string(7) "String3" -} -===WHILE=== -array(1) { - [0]=> - string(7) "String0" -} -array(1) { - [1]=> - string(7) "String1" -} -array(1) { - [2]=> - string(7) "String2" -} -array(1) { - [3]=> - string(7) "String3" -} -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_020.phpt b/ext/pdo_oci/tests/pdo_020.phpt deleted file mode 100755 index 90dba329b2..0000000000 --- a/ext/pdo_oci/tests/pdo_020.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -PDO_OCI: PDOStatement::columnCount ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -Counted 2 columns after select1. -Counted 3 columns after select2. -Counted 1 columns after select3. -===DONE=== diff --git a/ext/pdo_oci/tests/pdo_021.phpt b/ext/pdo_oci/tests/pdo_021.phpt deleted file mode 100755 index ea5cc41fa7..0000000000 --- a/ext/pdo_oci/tests/pdo_021.phpt +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -PDO_OCI: PDOStatement::execute with parameter markers. ---SKIPIF-- - ---FILE-- - -===DONE=== - ---EXPECT-- -There are 6 rows in the table. -There are 12 rows in the table. -===DONE=== diff --git a/ext/pdo_oci/tests/prepare.inc b/ext/pdo_oci/tests/prepare.inc deleted file mode 100755 index 2f7531a5b5..0000000000 --- a/ext/pdo_oci/tests/prepare.inc +++ /dev/null @@ -1,20 +0,0 @@ -query('DROP TABLE test'); -$DB->query('DROP TABLE classtypes'); - -$DB->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING); -$DB->setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER); - -?> diff --git a/ext/pdo_oci/tests/skipif.inc b/ext/pdo_oci/tests/skipif.inc deleted file mode 100755 index 4b860b4cab..0000000000 --- a/ext/pdo_oci/tests/skipif.inc +++ /dev/null @@ -1,5 +0,0 @@ -