transactd 1.2.0 → 2.0.0

data/source/bzs/test/tdclphp/transactd_blob_Test.php

@@ -20,6 +20,7 @@
 mb_internal_encoding('UTF-8');
 
 require_once("transactd.php");
+use BizStation\Transactd as Bz;
 
 define("HOSTNAME", "localhost/");
 define("URL", "tdap://" . HOSTNAME . "test_blob?dbfile=test.bdf");
@@ -29,19 +30,8 @@ define("FDI_USER_ID", 1);
 define("FDI_BODY", 2);
 define("FDI_IMAGE", 3);
 
-define("TYPE_SCHEMA_BDF", 0);
-
 class transactdBlobTest extends PHPUnit_Framework_TestCase
 {
-    private function getDbObj()
-    {
-        return database::createObject();
-    }
-    private function deleteDbObj($db)
-    {
-        $db->close();
-        $db = NULL;
-    }
     private function dropDatabase($db, $url)
     {
         $db->open($url);
@@ -52,7 +42,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
     private function createDatabase($db, $url)
     {
         $db->create($url);
-        if ($db->stat() == transactd::STATUS_TABLE_EXISTS_ERROR)
+        if ($db->stat() == Bz\transactd::STATUS_TABLE_EXISTS_ERROR)
         {
             $this->dropDatabase($db, $url);
             $db->create($url);
@@ -61,22 +51,22 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
     }
     private function openDatabase($db, $url)
     {
-        $db->open($url, TYPE_SCHEMA_BDF, transactd::TD_OPEN_NORMAL);
+        $db->open($url, Bz\transactd::TYPE_SCHEMA_BDF, Bz\transactd::TD_OPEN_NORMAL);
         $this->assertEquals($db->stat(), 0);
     }
     private function createTable($db, $tableid, $tablename)
     {
         $dbdef = $db->dbDef();
         $this->assertNotEquals($dbdef, NULL);
-        $td = new tabledef();
+        $td = new Bz\tabledef();
         // Set table schema codepage to UTF-8
         //   - codepage for field NAME and tableNAME
-        $td->schemaCodePage = transactd::CP_UTF8;
+        $td->schemaCodePage = Bz\transactd::CP_UTF8;
         $td->setTableName($tablename);
         $td->setFileName($tablename . '.dat');
         // Set table default charaset index
         //    - default charset for field VALUE
-        $td->charsetIndex = transactd::charsetIndex(transactd::CP_UTF8);
+        $td->charsetIndex = Bz\transactd::charsetIndex(Bz\transactd::CP_UTF8);
         //
         $td->id = $tableid;
         $td->pageSize = 2048;
@@ -85,28 +75,28 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         // id
         $fd = $dbdef->insertField($tableid, FDI_ID);
         $fd->setName('id');
-        $fd->type = transactd::ft_autoinc;
+        $fd->type = Bz\transactd::ft_autoinc;
         $fd->len = 4;
         $dbdef->updateTableDef($tableid);
         $this->assertEquals($dbdef->stat(), 0);
         // user_id
         $fd = $dbdef->insertField($tableid, FDI_USER_ID);
         $fd->setName('user_id');
-        $fd->type = transactd::ft_integer;
+        $fd->type = Bz\transactd::ft_integer;
         $fd->len = 4;
         $dbdef->updateTableDef($tableid);
         $this->assertEquals($dbdef->stat(), 0);
         // body
         $fd = $dbdef->insertField($tableid, FDI_BODY);
         $fd->setName('body');
-        $fd->type = transactd::ft_mytext;
+        $fd->type = Bz\transactd::ft_mytext;
         $fd->len = 10; // 9:TYNYTEXT 10:TEXT 11:MIDIUMTEXT 12:LONGTEXT
         $dbdef->updateTableDef($tableid);
         $this->assertEquals($dbdef->stat(), 0);
         // image
         $fd = $dbdef->insertField($tableid, FDI_IMAGE);
         $fd->setName('image');
-        $fd->type = transactd::ft_myblob;
+        $fd->type = Bz\transactd::ft_myblob;
         $fd->len = 10; // 9:TYNYBLOB 10:BLOB 11:MIDIUMBLOB 12:LONGBLOB
         $dbdef->updateTableDef($tableid);
         $this->assertEquals($dbdef->stat(), 0);
@@ -132,18 +122,16 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
     
     public function testCreate()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->createDatabase($db, URL);
         $this->openDatabase($db, URL);
         $this->createTable($db, 1, TABLENAME);
         $tb = $this->openTable($db, TABLENAME);
-        $tb->close();
-        $this->deleteDbObj($db);
     }
     public function testInsert()
     {
         $image = $this->getTestBinary();
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->openDatabase($db, URL);
         $tb = $this->openTable($db, TABLENAME);
         $this->assertNotEquals($tb, NULL);
@@ -170,13 +158,10 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $tb->setFV(FDI_IMAGE, $str, strlen($str));
         $tb->insert();
         $this->assertEquals($tb->stat(), 0);
-        // close
-        $tb->close();
-        $this->deleteDbObj($db);
     }
     public function testSeek()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->openDatabase($db, URL);
         $tb = $this->openTable($db, TABLENAME);
         $this->assertNotEquals($tb, NULL);
@@ -207,13 +192,10 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->getFVint(FDI_USER_ID), 1);
         $this->assertEquals($tb->getFVstr(FDI_BODY), "2\ntest\nテスト\n\nあいうえおあいうえお");
         $this->assertEquals($tb->getFVbin(FDI_IMAGE), "2\ntest\nテスト\n\nあいうえおあいうえお");
-        // close
-        $tb->close();
-        $this->deleteDbObj($db);
     }
     public function testFind()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->openDatabase($db, URL);
         $tb = $this->openTable($db, TABLENAME);
         $this->assertNotEquals($tb, NULL);
@@ -223,7 +205,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $tb->setFilter('id >= 1 and id < 3', 1, 0);
         $this->assertEquals($tb->stat(), 0);
         $tb->setFV(FDI_ID, 1);
-        $tb->find(table::findForword);
+        $tb->find(Bz\table::findForword);
         $this->assertEquals($tb->stat(), 0);
         $this->assertEquals($tb->getFVint(FDI_ID), 1);
         $this->assertEquals($tb->getFVint(FDI_USER_ID), 1);
@@ -236,17 +218,14 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->getFVstr(FDI_BODY), "2\ntest\nテスト\n\nあいうえおあいうえお");
         // 3... but not found because filtered
         $tb->findNext(true);
-        $this->assertEquals($tb->stat(), transactd::STATUS_EOF);
+        $this->assertEquals($tb->stat(), Bz\transactd::STATUS_EOF);
         // 2... but changing seek-direction is not allowed
         $tb->findPrev(true);
-        $this->assertEquals($tb->stat(), transactd::STATUS_PROGRAM_ERROR);
-        // close
-        $tb->close();
-        $this->deleteDbObj($db);
+        $this->assertEquals($tb->stat(), Bz\transactd::STATUS_PROGRAM_ERROR);
     }
     public function testUpdate()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->openDatabase($db, URL);
         $tb = $this->openTable($db, TABLENAME);
         $this->assertNotEquals($tb, NULL);
@@ -280,13 +259,10 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->getFVint(FDI_ID), 2);
         $this->assertEquals($tb->getFVint(FDI_USER_ID), 1);
         $this->assertEquals($tb->getFVstr(FDI_BODY), "2\nテスト\ntest\n\nABCDEFG");
-        // close
-        $tb->close();
-        $this->deleteDbObj($db);
     }
     public function testDelete()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->openDatabase($db, URL);
         $tb = $this->openTable($db, TABLENAME);
         $this->assertNotEquals($tb, NULL);
@@ -311,15 +287,11 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->getFVstr(FDI_BODY), "3\ntest\nテスト\n\nあいうえおあいうえお");
         // eof
         $tb->seekNext();
-        $this->assertEquals($tb->stat(), transactd::STATUS_EOF);
-        // close
-        $tb->close();
-        $this->deleteDbObj($db);
+        $this->assertEquals($tb->stat(), Bz\transactd::STATUS_EOF);
     }
     public function testDrop()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->dropDatabase($db, URL);
-        $this->deleteDbObj($db);
     }
 }

data/source/bzs/test/tdclphp/transactd_datetime_Test.php

@@ -20,111 +20,77 @@
 mb_internal_encoding('UTF-8');
 
 require_once("transactd.php");
+use BizStation\Transactd as Bz;
 
 class transactdDatetimeTest extends PHPUnit_Framework_TestCase
 {
     public function testGetBtrdate()
     {
-        $i_nowdate = transactd::getNowDate(); // get today as integer
-        $s_i_nowdate  = transactd::btrdtoa($i_nowdate);
-        $s_i_nowdate2 = transactd::btrdtoa($i_nowdate, true);
+        $i_nowdate = Bz\transactd::getNowDate(); // get today as integer
+        $s_i_nowdate  = Bz\transactd::btrdtoa($i_nowdate);
+        $s_i_nowdate2 = Bz\transactd::btrdtoa($i_nowdate, true);
         //print_r($i_nowdate);
         //print_r($s_i_nowdate);
         //print_r($s_i_nowdate2);
-        $nowdate = new btrDate();
+        $nowdate = new Bz\btrDate();
         $nowdate->i = $i_nowdate;              // get today as BtrDate
-        $s_nowdate  = transactd::btrdtoa($nowdate);
-        $s_nowdate2 = transactd::btrdtoa($nowdate, true);
-        $cs_nowdate = transactd::c_str($nowdate);
+        $s_nowdate  = Bz\transactd::btrdtoa($nowdate);
+        $s_nowdate2 = Bz\transactd::btrdtoa($nowdate, true);
         //print_r($nowdate);
         //print_r($s_nowdate);
         //print_r($s_nowdate2);
-        //print_r($cs_nowdate);
         $this->assertEquals($s_i_nowdate, $s_nowdate);
         $this->assertEquals($s_i_nowdate2, $s_nowdate2);
-        $this->assertEquals($cs_nowdate, $s_nowdate);
     }
     public function testGetBtrtime()
     {
-        $i_nowtime = transactd::getNowTime(); // get now time as integer
-        $s_i_nowtime  = transactd::btrttoa($i_nowtime);
-        $s_i_nowtime2 = transactd::btrttoa($i_nowtime, true);
+        $i_nowtime = Bz\transactd::getNowTime(); // get now time as integer
+        $s_i_nowtime  = Bz\transactd::btrttoa($i_nowtime);
+        $s_i_nowtime2 = Bz\transactd::btrttoa($i_nowtime, true);
         //print_r($i_nowtime);
         //print_r($s_i_nowtime);
         //print_r($s_i_nowtime2);
-        $nowtime = new btrTime();
+        $nowtime = new Bz\btrTime();
         $nowtime->i = $i_nowtime;  // get now time as BtrTime
-        $s_nowtime  = transactd::btrttoa($nowtime);
-        $s_nowtime2 = transactd::btrttoa($nowtime, true);
-        $cs_nowtime = transactd::c_str($nowtime);
+        $s_nowtime  = Bz\transactd::btrttoa($nowtime);
+        $s_nowtime2 = Bz\transactd::btrttoa($nowtime, true);
         //print_r($nowtime);
         //print_r($s_nowtime);
         //print_r($s_nowtime2);
-        //print_r($cs_nowtime);
         $this->assertEquals($s_i_nowtime, $s_nowtime);
         $this->assertEquals($s_i_nowtime2, $s_nowtime2);
-        $this->assertEquals($cs_nowtime, $s_nowtime);
     }
     public function testGetBtrdatetime()
     {
-        $d = transactd::atobtrd("2012-08-22");
+        $d = Bz\transactd::atobtrd("2012-08-22");
         //print_r($d);
-        $s_date = transactd::btrdtoa($d);
+        $s_date = Bz\transactd::btrdtoa($d);
         $this->assertEquals($s_date, '2012/08/22');
         //print_r($s_date);
-        $t = transactd::atobtrt("15:37:00");
-        $s_time = transactd::btrttoa($t);
+        $t = Bz\transactd::atobtrt("15:37:00");
+        $s_time = Bz\transactd::btrttoa($t);
         $this->assertEquals($s_time, '15:37:00');
         //print_r($t);
         //print_r($s_time);
-        $dt = transactd::atobtrs('2012-08-22 15:37:00');
-        $s_datetime  = transactd::btrstoa($dt);
-        $s_datetime2 = transactd::btrstoa($dt, true);
+        $dt = Bz\transactd::atobtrs('2012-08-22 15:37:00');
+        $s_datetime  = Bz\transactd::btrstoa($dt);
+        $s_datetime2 = Bz\transactd::btrstoa($dt, true);
         $this->assertEquals($s_datetime, '2012/08/22 15:37:00');
         $this->assertEquals($s_datetime2, '2012-08-22T15:37:00');
         //print_r($dt);
         //print_r($s_datetime);
         //print_r($s_datetime2);
-        $s_datetime_d = transactd::btrdtoa($dt->date);
-        $s_datetime_t = transactd::btrttoa($dt->time);
+        $s_datetime_d = Bz\transactd::btrdtoa($dt->date);
+        $s_datetime_t = Bz\transactd::btrttoa($dt->time);
         $this->assertEquals($s_datetime_d . ' ' . $s_datetime_t, '2012/08/22 15:37:00');
         //print_r($s_datetime_d . ' ' . $s_datetime_t);
     }
-    public function testGetBdate()
-    {
-        $bd = transactd::atobtrd('2012-08-22');
-        $bdate  = new bdate($bd->i);
-        $bdate2 = new bdate(transactd::btrdtoa($bd));
-        //print_r($bdate);
-        //print_r($bdate2);
-        $btrdate  = $bdate->btr_date();
-        $btrdate2 = $bdate2->btr_date();
-        //print_r($btrdate);
-        //print_r($btrdate2);
-        $s_bdate  = $bdate->c_str();
-        $s_bdate2 = $bdate2->c_str();
-        $this->assertEquals($s_bdate, $s_bdate2);
-        //print_r($s_bdate);
-        //print_r($s_bdate2);
-        $this->assertEquals($bdate->year(), 2012);
-        $this->assertEquals($bdate->month(), 8);
-        $this->assertEquals($bdate->date(), 22);
-        $this->assertEquals($bdate->year_str(), '2012');
-        $this->assertEquals($bdate->month_str(), '8');
-        $this->assertEquals($bdate->date_str(), '22');
-        //print_r($bdate->year());
-        //print_r($bdate->month());
-        //print_r($bdate->date());
-        //print_r($bdate->year_str());
-        //print_r($bdate->month_str());
-        //print_r($bdate->date_str());
-    }
     public function testGetBtrtimestampFromString()
     {
-        $d = transactd::atobtrd('2012-08-22');
-        $t = transactd::atobtrt('15:37:00');
-        $btrts  = new btrTimeStamp('2012-08-22 15:37:00');
-        $btrts2 = new btrTimeStamp($d, $t);
+        $d = Bz\transactd::atobtrd('2012-08-22');
+        $t = Bz\transactd::atobtrt('15:37:00');
+        $btrts  = new Bz\btrTimeStamp('2012-08-22 15:37:00');
+        $btrts2 = new Bz\btrTimeStamp($d, $t);
         $s_btrts  = $btrts->toString();
         $s_btrts2 = $btrts2->toString();
         //print_r($btrts);
@@ -136,15 +102,15 @@ class transactdDatetimeTest extends PHPUnit_Framework_TestCase
     }
     public function testGetBtrtimestampFromBtrdateAndBtrtime()
     {
-        $i_nowdate = transactd::getNowDate();
-        $nowdate = new btrDate();
+        $i_nowdate = Bz\transactd::getNowDate();
+        $nowdate = new Bz\btrDate();
         $nowdate->i = $i_nowdate;
-        $i_nowtime = transactd::getNowTime();
-        $nowtime = new btrTime();
+        $i_nowtime = Bz\transactd::getNowTime();
+        $nowtime = new Bz\btrTime();
         $nowtime->i = $i_nowtime;
-        $nowdatetime = new btrTimeStamp($nowdate, $nowtime);
-        $s_nowdate  = transactd::btrdtoa($nowdate);
-        $s_nowtime  = transactd::btrttoa($nowtime);
+        $nowdatetime = new Bz\btrTimeStamp($nowdate, $nowtime);
+        $s_nowdate  = Bz\transactd::btrdtoa($nowdate);
+        $s_nowtime  = Bz\transactd::btrttoa($nowtime);
         $s_nowdatetime = $nowdatetime->toString();
         $this->assertEquals($s_nowdatetime, $s_nowdate . ' ' . $s_nowtime);
         //print_r($nowdatetime);
@@ -153,20 +119,20 @@ class transactdDatetimeTest extends PHPUnit_Framework_TestCase
     }
     public function testLastYear()
     {
-        $i_nowdate = transactd::getNowDate();
-        $nowdate = new btrDate();
+        $i_nowdate = Bz\transactd::getNowDate();
+        $nowdate = new Bz\btrDate();
         $nowdate->i = $i_nowdate;
         $nowyear_yy = $nowdate->yy;
-        $i_nowtime = transactd::getNowTime();
-        $nowtime = new btrTime();
+        $i_nowtime = Bz\transactd::getNowTime();
+        $nowtime = new Bz\btrTime();
         $nowtime->i = $i_nowtime;
-        $nowdatetime = new btrTimeStamp($nowdate, $nowtime);
+        $nowdatetime = new Bz\btrTimeStamp($nowdate, $nowtime);
         $s_nowdatetime = $nowdatetime->toString();
         $lastyear = $nowdate;
         $lastyear->yy = $lastyear->yy - 1;
         $lastyear_yy = $lastyear->yy;
-        $s_lastyear = transactd::btrdtoa($lastyear);
-        $lastyeardatetime = new btrTimeStamp($lastyear, $nowtime);
+        $s_lastyear = Bz\transactd::btrdtoa($lastyear);
+        $lastyeardatetime = new Bz\btrTimeStamp($lastyear, $nowtime);
         $s_lastyeardatetime = $lastyeardatetime->toString();
         $this->assertEquals($nowyear_yy - 1, $lastyear_yy);
         $this->assertEquals($s_lastyeardatetime, str_replace($nowyear_yy, $lastyear_yy, $s_nowdatetime));
@@ -176,7 +142,7 @@ class transactdDatetimeTest extends PHPUnit_Framework_TestCase
     }
     public function testTypename()
     {
-        $typename = transactd::getTypeName(transactd::ft_integer);
+        $typename = Bz\transactd::getTypeName(Bz\transactd::ft_integer);
         //print_r($typename);
         $this->assertEquals($typename, 'Integer');
     }

data/source/bzs/test/tdclphp/transactd_kanjischema_Test.php

@@ -20,6 +20,7 @@
 mb_internal_encoding('UTF-8');
 
 require_once("transactd.php");
+use BizStation\Transactd as Bz;
 
 define("HOSTNAME", "localhost/");
 define("URL", "tdap://" . HOSTNAME . "test?dbfile=test.bdf");
@@ -29,19 +30,8 @@ define("FDN_ID", "番号");
 define("FDI_NAME", 1);
 define("FDN_NAME", "名前");
 
-define("TYPE_SCHEMA_BDF", 0);
-
 class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
 {
-    private function getDbObj()
-    {
-        return database::createObject();
-    }
-    private function deleteDbObj($db)
-    {
-        $db->close();
-        $db = NULL;
-    }
     private function dropDatabase($db, $url)
     {
         $db->open($url);
@@ -52,7 +42,7 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
     private function createDatabase($db, $url)
     {
         $db->create($url);
-        if ($db->stat() == transactd::STATUS_TABLE_EXISTS_ERROR)
+        if ($db->stat() == Bz\transactd::STATUS_TABLE_EXISTS_ERROR)
         {
             $this->dropDatabase($db, $url);
             $db->create($url);
@@ -61,22 +51,22 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
     }
     private function openDatabase($db, $url)
     {
-        $db->open($url, TYPE_SCHEMA_BDF, transactd::TD_OPEN_NORMAL);
+        $db->open($url, Bz\transactd::TYPE_SCHEMA_BDF, Bz\transactd::TD_OPEN_NORMAL);
         $this->assertEquals($db->stat(), 0);
     }
     private function createTable($db, $tableid, $tablename)
     {
         $dbdef = $db->dbDef();
         $this->assertNotEquals($dbdef, NULL);
-        $td = new tabledef();
+        $td = new Bz\tabledef();
         /* Set table schema codepage to UTF-8
              - codepage for field NAME and tableNAME */
-        $td->schemaCodePage = transactd::CP_UTF8;
+        $td->schemaCodePage = Bz\transactd::CP_UTF8;
         $td->setTableName($tablename);
         $td->setFileName($tablename . '.dat');
         /* Set table default charaset index
               - default charset for field VALUE */
-        $td->charsetIndex = transactd::charsetIndex(transactd::CP_UTF8);
+        $td->charsetIndex = Bz\transactd::charsetIndex(Bz\transactd::CP_UTF8);
         //
         $td->id = $tableid;
         $td->pageSize = 2048;
@@ -84,19 +74,19 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($dbdef->stat(), 0);
         $fd = $dbdef->insertField($tableid, FDI_ID);
         $fd->setName(FDN_ID);
-        $fd->type = transactd::ft_integer;
+        $fd->type = Bz\transactd::ft_integer;
         $fd->len = 4;
         $dbdef->updateTableDef($tableid);
         $this->assertEquals($dbdef->stat(), 0);
         $fd = $dbdef->insertField($tableid, FDI_NAME);
         $fd->setName(FDN_NAME);
-        $fd->type = transactd::ft_zstring;
+        $fd->type = Bz\transactd::ft_zstring;
         $fd->len = 33;
         $dbdef->updateTableDef($tableid);
         $this->assertEquals($dbdef->stat(), 0);
         /* Set field charset index
               - charset for each field VALUE
-          $fd->setCharsetIndex(Transactd::charsetIndex(Transactd::CP_UTF8)) */
+          $fd->setCharsetIndex(Bz\transactd::charsetIndex(Bz\transactd::CP_UTF8)) */
         $kd = $dbdef->insertKey($tableid, 0);
         $kd->segment(0)->fieldNum = 0;
         $kd->segment(0)->flags->bit8 = 1;
@@ -130,7 +120,6 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
         $tb->setFV(FDN_NAME, 'ビズステーション');
         $tb->insert();
         $this->assertEquals($tb->stat(), 0);
-        $tb->close();
     }
     private function getEqual($db, $tablename)
     {
@@ -140,7 +129,6 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
         $tb->setFV(FDN_ID, 1);
         $tb->seek();
         $this->assertEquals($tb->getFVstr(FDN_NAME), '小坂');
-        $tb->close();
     }
     private function find($db, $tablename)
     {
@@ -150,7 +138,7 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
         $tb->clearBuffer();
         $tb->setFilter('番号 >= 1 and 番号 < 3', 1, 0);
         $tb->setFV(FDN_ID, 1);
-        $tb->find(table::findForword);
+        $tb->find(Bz\table::findForword);
         $this->assertEquals($tb->stat(), 0);
         $this->assertEquals($tb->getFVint(FDN_ID), 1);
         $this->assertEquals($tb->getFVstr(FDN_NAME), '小坂');
@@ -159,15 +147,14 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->getFVint(FDN_ID), 2);
         $this->assertEquals($tb->getFVstr(FDN_NAME), '矢口');
         $tb->findNext(true);
-        $this->assertEquals($tb->stat(), transactd::STATUS_EOF);
-        $tb->close();
+        $this->assertEquals($tb->stat(), Bz\transactd::STATUS_EOF);
     }
     private function doWhole($db, $tableid, $tablename, $url)
     {
         $this->openDatabase($db, $url);
         $this->createTable($db, $tableid, $tablename);
         $tb = $this->openTable($db, $tablename);
-        $tb->close();
+        $tb->release();
         $this->insert($db, $tablename);
         $this->getEqual($db, $tablename);
         $this->find($db, $tablename);
@@ -175,38 +162,37 @@ class transactdKanjiSchemaTest extends PHPUnit_Framework_TestCase
     
     public function testCreateDatabase()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->createDatabase($db, URL);
-        $this->deleteDbObj($db);
     }
     public function testTableWhichHasKanjiNamedField()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->doWhole($db, 1, 'kanji-field', URL);
-        $this->deleteDbObj($db);
     }
     public function testKanjiNamedTable()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->doWhole($db, 2, '漢字テーブル', URL);
-        $this->deleteDbObj($db);
     }
     public function testCreateKanjiNamedDatabase()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->createDatabase($db, URL_KANJI); // URL must be UTF-8
-        $this->deleteDbObj($db);
     }
     public function testTableWhichHasKanjiNamedFieldInKanjiNamedDatabase()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->doWhole($db, 1, 'kanji-field', URL_KANJI);
-        $this->deleteDbObj($db);
     }
     public function testKanjiNamedTableInKanjiNamedDatabase()
     {
-        $db = $this->getDbObj();
+        $db = new Bz\database();
         $this->doWhole($db, 2, '漢字テーブル', URL_KANJI);
-        $this->deleteDbObj($db);
+    }
+    public function testDropDatabase()
+    {
+        $db = new Bz\database();
+        $this->dropDatabase($db, URL_KANJI);
     }
 }