From 5be5c7f14f69ebb75129a90215fca6e047920ac0 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Mon, 4 Nov 2002 17:53:04 +0000
Subject: incorporate cdb-0.75 as suggested by D. J. Bernstein #dba now
 supports cdb_make

---
 ext/dba/tests/dba_cdb.phpt      |  2 +-
 ext/dba/tests/dba_cdb_make.phpt | 35 +++++++++++++++++++++++++++++++++++
 ext/dba/tests/dba_cdb_read.phpt |  6 +++---
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 ext/dba/tests/dba_cdb_make.phpt

(limited to 'ext/dba/tests')

diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index c1828f550e..716773c2f6 100644
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -4,7 +4,7 @@ DBA CDB handler test
 <?php 
 	require_once('skipif.inc');
 	if (!in_array('cdb', dba_handlers())) die('skip CDB handler not available');
-	die('skip CDB currently supports only reading');
+	die('skip CDB does not support replace or delete');
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
new file mode 100644
index 0000000000..57166d5674
--- /dev/null
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -0,0 +1,35 @@
+--TEST--
+DBA CDB_MAKE handler test
+--SKIPIF--
+<?php 
+	require_once('skipif.inc');
+	if (!in_array('cdb_make', dba_handlers())) die('skip CDB_MAKE handler not available');
+?>
+--FILE--
+<?php
+	require_once('test.inc');
+	$handler = 'cdb_make';
+	echo "database handler: $handler\n";
+	// print md5 checksum of test.cdb which is generated by cdb_make program
+	var_dump(md5(implode('',file(dirname(__FILE__).'/test.cdb'))));
+	if (($db_make=dba_open($db_file, "n", $handler))!==FALSE) {
+		dba_insert("1", "1", $db_make);
+		dba_insert("2", "2", $db_make);
+		dba_insert("1", "3", $db_make);
+		dba_insert("2", "1", $db_make);
+		dba_insert("3", "3", $db_make);
+		dba_insert("1", "2", $db_make);
+		dba_insert("4", "4", $db_make);
+//		dba_replace cdb_make doesn't know replace
+		dba_close($db_make);
+		// write md5 checksum of generated database file
+		var_dump(md5(implode('',file($db_file))));
+		// no need to test created database: this is done by dba_cdb_read.phpt
+	} else {
+		echo "Error creating database\n";
+	}
+?>
+--EXPECT--
+database handler: cdb_make
+string(32) "723d19f39c1b15b3b455dd64323148d1"
+string(32) "723d19f39c1b15b3b455dd64323148d1"
\ No newline at end of file
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index 045de9574a..573a58cee3 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -33,8 +33,8 @@ DBA CDB handler test (read only)
 		echo "\n#";
 		echo dba_fetch(1, $db_file);
 		echo dba_fetch(1, $db_file);
-		echo dba_fetch(1, $db_file);
-		echo dba_fetch(1, $db_file);
+		echo dba_fetch(2, $db_file);
+		echo dba_fetch(2, $db_file);
 		echo "\n?".$keys;
 		// with skip = 0 dba_fetch must fetch the first result
 		echo "\n#";
@@ -59,7 +59,7 @@ DBA CDB handler test (read only)
 database handler: cdb
 7YYYYNNN
 =1234
-#1111
+#1122
 ?1212314
 #1212314
 =1231324
\ No newline at end of file
-- 
cgit v1.2.1