use new tests

21 files changed, 27 insertions, 1161 deletions

diff --git a/ext/pdo_firebird/tests/common.phpt b/ext/pdo_firebird/tests/common.phpt
new file mode 100644
index 0000000000..cb1caf3150
--- /dev/null
+++ b/ext/pdo_firebird/tests/common.phpt
@@ -0,0 +1,27 @@
+--TEST--
+FIREBIRD
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo_odbc')) print 'skip'; ?>
+--REDIRECTTEST--
+# magic auto-configuration
+
+$config = array(
+	'TESTS' => 'ext/pdo/tests'
+);
+	
+
+if (false !== getenv('PDO_FIREBIRD_TEST_DSN')) {
+	# user set them from their shell
+	$config['ENV']['PDOTEST_DSN'] = getenv('PDO_FIREBIRD_TEST_DSN');
+	$config['ENV']['PDOTEST_USER'] = getenv('PDO_FIREBIRD_TEST_USER');
+	$config['ENV']['PDOTEST_PASS'] = getenv('PDO_FIREBIRD_TEST_PASS');
+	if (false !== getenv('PDO_FIREBIRD_TEST_ATTR')) {
+		$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_FIREBIRD_TEST_ATTR');
+	}
+} else {
+	$config['ENV']['PDOTEST_DSN'] = 'firebird:dbname=/opt/firebird/test.gdb';
+	$config['ENV']['PDOTEST_USER'] = 'SYSDBA';
+	$config['ENV']['PDOTEST_PASS'] = 'password';
+}
+return $config;
diff --git a/ext/pdo_firebird/tests/connection.inc b/ext/pdo_firebird/tests/connection.inc
deleted file mode 100755
index 84cc61a8ea..0000000000
--- a/ext/pdo_firebird/tests/connection.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$DATABASE = '/opt/firebird/test.gdb';
-$CONNECTION = "firebird:dbname=$DATABASE";
-$USER = 'SYSDBA';
-$PASSWORD = 'password';
-
-$PDO_TESTS = dirname(__FILE__) . '/../../pdo/tests/';
-
-?>
diff --git a/ext/pdo_firebird/tests/pdo_001.phpt b/ext/pdo_firebird/tests/pdo_001.phpt
deleted file mode 100755
index 43580b64b4..0000000000
--- a/ext/pdo_firebird/tests/pdo_001.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_ASSOC
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_001.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_002.phpt b/ext/pdo_firebird/tests/pdo_002.phpt
deleted file mode 100755
index 2480d2295a..0000000000
--- a/ext/pdo_firebird/tests/pdo_002.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_NUM
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_002.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_003.phpt b/ext/pdo_firebird/tests/pdo_003.phpt
deleted file mode 100755
index 1948e34354..0000000000
--- a/ext/pdo_firebird/tests/pdo_003.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_BOTH
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_003.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_004.phpt b/ext/pdo_firebird/tests/pdo_004.phpt
deleted file mode 100755
index ab248c19ea..0000000000
--- a/ext/pdo_firebird/tests/pdo_004.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_OBJ
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_004.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_005.phpt b/ext/pdo_firebird/tests/pdo_005.phpt
deleted file mode 100755
index 58eb95f6f4..0000000000
--- a/ext/pdo_firebird/tests/pdo_005.phpt
+++ /dev/null
@@ -1,120 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_CLASS
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_005.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_006.phpt b/ext/pdo_firebird/tests/pdo_006.phpt
deleted file mode 100755
index bb2be7e045..0000000000
--- a/ext/pdo_firebird/tests/pdo_006.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_GROUP
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_006.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_007.phpt b/ext/pdo_firebird/tests/pdo_007.phpt
deleted file mode 100755
index 6e286fe945..0000000000
--- a/ext/pdo_firebird/tests/pdo_007.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_UNIQUE
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_007.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_008.phpt b/ext/pdo_firebird/tests/pdo_008.phpt
deleted file mode 100755
index 2360d1c160..0000000000
--- a/ext/pdo_firebird/tests/pdo_008.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_UNIQUE conflict
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_008.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(2) {
-  ["A"]=>
-  array(1) {
-    [0]=>
-    string(3) "B  "
-  }
-  ["C"]=>
-  array(1) {
-    [0]=>
-    string(3) "C  "
-  }
-}
-===DONE===
diff --git a/ext/pdo_firebird/tests/pdo_009.phpt b/ext/pdo_firebird/tests/pdo_009.phpt
deleted file mode 100755
index b19c2df29b..0000000000
--- a/ext/pdo_firebird/tests/pdo_009.phpt
+++ /dev/null
@@ -1,89 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_CLASSTYPE
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_009.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_010.phpt b/ext/pdo_firebird/tests/pdo_010.phpt
deleted file mode 100755
index c691bda9ee..0000000000
--- a/ext/pdo_firebird/tests/pdo_010.phpt
+++ /dev/null
@@ -1,76 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_(CLASSTYPE and GROUP/UNIQUE)
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_010.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_011.phpt b/ext/pdo_firebird/tests/pdo_011.phpt
deleted file mode 100755
index 68dd826ccb..0000000000
--- a/ext/pdo_firebird/tests/pdo_011.phpt
+++ /dev/null
@@ -1,181 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_FUNC and statement overloading
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_011.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_012.phpt b/ext/pdo_firebird/tests/pdo_012.phpt
deleted file mode 100755
index 176c219488..0000000000
--- a/ext/pdo_firebird/tests/pdo_012.phpt
+++ /dev/null
@@ -1,70 +0,0 @@
---TEST--
-PDO_Firebird: PDOStatement::setFetchMode
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_012.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_013.phpt b/ext/pdo_firebird/tests/pdo_013.phpt
deleted file mode 100755
index 843fac90aa..0000000000
--- a/ext/pdo_firebird/tests/pdo_013.phpt
+++ /dev/null
@@ -1,58 +0,0 @@
---TEST--
-PDO_Firebird: PDOStatement is Traversable
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_013.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_014.phpt b/ext/pdo_firebird/tests/pdo_014.phpt
deleted file mode 100755
index 4366e00d46..0000000000
--- a/ext/pdo_firebird/tests/pdo_014.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-PDO_Firebird: PDOStatement and SPL Iterators
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-if (!extension_loaded('SPL')) die('skip SPL not available');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_014.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_015.phpt b/ext/pdo_firebird/tests/pdo_015.phpt
deleted file mode 100755
index 85819b6901..0000000000
--- a/ext/pdo_firebird/tests/pdo_015.phpt
+++ /dev/null
@@ -1,77 +0,0 @@
---TEST--
-PDO_Firebird: PDO_FETCH_COLUMN
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once(dirname(__FILE__).'/../../pdo/tests/pdo.inc');
-require_once($PDO_TESTS . 'pdo_015.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_019.phpt b/ext/pdo_firebird/tests/pdo_019.phpt
deleted file mode 100755
index a9a65cf853..0000000000
--- a/ext/pdo_firebird/tests/pdo_019.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-PDO_Firebird: fetch() and while()
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_019.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---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_firebird/tests/pdo_020.phpt b/ext/pdo_firebird/tests/pdo_020.phpt
deleted file mode 100755
index c6546613b1..0000000000
--- a/ext/pdo_firebird/tests/pdo_020.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-PDO_Firebird: PDOStatement::columnCount
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_020.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-Counted 2 columns after select1.
-Counted 3 columns after select2.
-Counted 1 columns after select3.
-===DONE===
diff --git a/ext/pdo_firebird/tests/pdo_021.phpt b/ext/pdo_firebird/tests/pdo_021.phpt
deleted file mode 100755
index c2089f6fae..0000000000
--- a/ext/pdo_firebird/tests/pdo_021.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-PDO_Firebird: PDOStatement::execute with parameter markers.
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_021.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-There are 6 rows in the table.
-There are 12 rows in the table.
-===DONE===
diff --git a/ext/pdo_firebird/tests/prepare.inc b/ext/pdo_firebird/tests/prepare.inc
deleted file mode 100755
index f243e5c38b..0000000000
--- a/ext/pdo_firebird/tests/prepare.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require_once('connection.inc');
-
-$SQL = array();
-
-$DB = new pdo($CONNECTION, $USER, $PASSWORD);
-
-$DB->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);
-
-?>