helly Fri Nov 1 09:21:36 2002 EDT
Modified files:
/php4/ext/dba/tests dba001.phpt dba002.phpt dba003.phpt dba004.phpt
dba005.phpt dba006.phpt dba007.phpt
Log:
Always show handler used
Index: php4/ext/dba/tests/dba001.phpt
diff -u php4/ext/dba/tests/dba001.phpt:1.1 php4/ext/dba/tests/dba001.phpt:1.2
--- php4/ext/dba/tests/dba001.phpt:1.1 Fri Oct 25 07:09:01 2002
+++ php4/ext/dba/tests/dba001.phpt Fri Nov 1 09:21:35 2002
@@ -7,12 +7,14 @@
--FILE--
<?php
require_once('test.inc');
+ echo "database handler: $handler\n";
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
- echo "database file created with $handler.\n";
+ echo "database file created\n";
+ dba_close($db_file);
} else {
echo "$db_file does not exist\n";
}
- dba_close($db_file);
?>
--EXPECTF--
-database file created with %s.
\ No newline at end of file
+database handler: %s
+database file created
\ No newline at end of file
Index: php4/ext/dba/tests/dba002.phpt
diff -u php4/ext/dba/tests/dba002.phpt:1.1 php4/ext/dba/tests/dba002.phpt:1.2
--- php4/ext/dba/tests/dba002.phpt:1.1 Fri Oct 25 07:09:01 2002
+++ php4/ext/dba/tests/dba002.phpt Fri Nov 1 09:21:36 2002
@@ -7,6 +7,7 @@
--FILE--
<?php
require_once('test.inc');
+ echo "database handler: $handler\n";
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("key1", "This is a test insert", $db_file);
echo dba_fetch("key1", $db_file);
@@ -15,5 +16,6 @@
echo "Error creating database\n";
}
?>
---EXPECT--
+--EXPECTF--
+database handler: %s
This is a test insert
Index: php4/ext/dba/tests/dba003.phpt
diff -u php4/ext/dba/tests/dba003.phpt:1.1 php4/ext/dba/tests/dba003.phpt:1.2
--- php4/ext/dba/tests/dba003.phpt:1.1 Fri Oct 25 07:09:01 2002
+++ php4/ext/dba/tests/dba003.phpt Fri Nov 1 09:21:36 2002
@@ -7,6 +7,7 @@
--FILE--
<?php
require_once('test.inc');
+ echo "database handler: $handler\n";
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("key1", "This is a test insert", $db_file);
dba_replace("key1", "This is the replacement text", $db_file);
@@ -17,5 +18,6 @@
echo "Error creating database\n";
}
?>
---EXPECT--
+--EXPECTF--
+database handler: %s
This is the replacement text
Index: php4/ext/dba/tests/dba004.phpt
diff -u php4/ext/dba/tests/dba004.phpt:1.1 php4/ext/dba/tests/dba004.phpt:1.2
--- php4/ext/dba/tests/dba004.phpt:1.1 Fri Oct 25 07:09:01 2002
+++ php4/ext/dba/tests/dba004.phpt Fri Nov 1 09:21:36 2002
@@ -7,6 +7,7 @@
--FILE--
<?php
require_once('test.inc');
+ echo "database handler: $handler\n";
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("key1", "Content String 1", $db_file);
dba_insert("key2", "Content String 2", $db_file);
@@ -21,5 +22,6 @@
echo "Error creating database\n";
}
?>
---EXPECT--
+--EXPECTF--
+database handler: %s
Another Content String Content String 2
Index: php4/ext/dba/tests/dba005.phpt
diff -u php4/ext/dba/tests/dba005.phpt:1.1 php4/ext/dba/tests/dba005.phpt:1.2
--- php4/ext/dba/tests/dba005.phpt:1.1 Fri Oct 25 07:09:01 2002
+++ php4/ext/dba/tests/dba005.phpt Fri Nov 1 09:21:36 2002
@@ -7,6 +7,7 @@
--FILE--
<?php
require_once('test.inc');
+ echo "database handler: $handler\n";
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("key1", "Content String 1", $db_file);
dba_insert("key2", "Content String 2", $db_file);
@@ -28,5 +29,6 @@
echo "Error creating database\n";
}
?>
---EXPECT--
+--EXPECTF--
+database handler: %s
5YYYYY
Index: php4/ext/dba/tests/dba006.phpt
diff -u php4/ext/dba/tests/dba006.phpt:1.1 php4/ext/dba/tests/dba006.phpt:1.2
--- php4/ext/dba/tests/dba006.phpt:1.1 Fri Oct 25 07:09:01 2002
+++ php4/ext/dba/tests/dba006.phpt Fri Nov 1 09:21:36 2002
@@ -7,6 +7,7 @@
--FILE--
<?php
require_once('test.inc');
+ echo "database handler: $handler\n";
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("key1", "Content String 1", $db_file);
dba_insert("key2", "Content String 2", $db_file);
@@ -30,5 +31,6 @@
echo "Error creating database\n";
}
?>
---EXPECT--
+--EXPECTF--
+database handler: %s
3NYNYY
Index: php4/ext/dba/tests/dba007.phpt
diff -u php4/ext/dba/tests/dba007.phpt:1.1 php4/ext/dba/tests/dba007.phpt:1.2
--- php4/ext/dba/tests/dba007.phpt:1.1 Fri Oct 25 07:09:01 2002
+++ php4/ext/dba/tests/dba007.phpt Fri Nov 1 09:21:36 2002
@@ -8,20 +8,21 @@
--FILE--
<?php
require_once('test.inc');
+ echo "database handler: $handler\n";
$db_file1 = dirname(__FILE__).'/test1.dbm';
$db_file2 = dirname(__FILE__).'/test2.dbm';
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
- echo "database file created with $handler.\n";
+ echo "database file created\n";
} else {
echo "$db_file does not exist\n";
}
if (($db_file1=dba_open($db_file1, "n", $handler))!==FALSE) {
- echo "database file created with $handler.\n";
+ echo "database file created\n";
} else {
echo "$db_file does not exist\n";
}
if (($db_file2=dba_open($db_file2, "n", $handler))!==FALSE) {
- echo "database file created with $handler.\n";
+ echo "database file created\n";
} else {
echo "$db_file does not exist\n";
}
@@ -29,10 +30,13 @@
dba_close($db_file);
?>
--EXPECTF--
-database file created with %s.
+database handler: %s
+database file created
+database file created
+database file created
array(3) {
[%d]=>
- string(%d) "%sext/dba/tests/test.dbm"
+ string(%d) "%sext/dba/tests/test0.dbm"
[%d]=>
string(%d) "%sext/dba/tests/test1.dbm"
[%d]=>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
