Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteBestProductsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteBestProductsTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteBestProductsTest.php (revision 22719) @@ -0,0 +1,74 @@ +setUpBestProducts(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + + // データが削除されていることを確認 + public function testDeleteBestProducts_データが削除される(){ + + SC_Helper_BestProducts_Ex::deleteBestProducts("1001"); + + $this->expected = null; + + $this->actual = SC_Helper_BestProducts_Ex::getBestProducts('1001'); + + $this->verify(); + } + + // データが削除後、ランクが繰り上がることを確認 + public function testDeleteBestProducts_データ削除後_ランクが繰り上がることを確認(){ + + SC_Helper_BestProducts_Ex::deleteBestProducts("1001"); + + $this->expected = "1"; + + $arrRet = SC_Helper_BestProducts_Ex::getBestProducts('1002',true); + + $this->actual = $arrRet['rank']; + + $this->verify(); + } + + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php (revision 22719) @@ -0,0 +1,123 @@ +setUpBestProducts(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + /**　rankが存在しない場合、空を返す。 + */ + public function testGetByRank_ランクが存在しない場合_空を返す() + { + $rank = '9999'; + + $this->expected = null; + $this->actual = SC_Helper_BestProducts_Ex::getByRank($rank); + + $this->verify(); + } + + // $rankが存在する場合、対応した結果を取得できる。 + public function testGetByRank_ランクが存在する場合_対応した結果を取得できる(){ + + $rank = '1'; + + $this->expected = array( + 'best_id' => '1001', + 'category_id' => '0', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'del_flg' => '0' + ); + + $result = SC_Helper_BestProducts_Ex::getByRank($rank); + $this->actual = Test_Utils::mapArray($result, + array( + 'best_id', + 'category_id', + 'title', + 'comment', + 'del_flg' + )); + + $this->verify(); + + } + + + // rankが存在するが、del_flg=1の場合、空が帰る。 + public function testGetByRank_ランクが存在かつ_削除の場合_空が返る(){ + + $rank = '2'; + + $this->expected = null; + $this->actual = SC_Helper_BestProducts_Ex::getByRank($rank); + + $this->verify(); + + } + + // rankが存在するが、del_flg=1の場合、かつ。$has_deleted=trueを指定 + public function testGetByRank_ランクが存在かつ_has_deletedの場合_対応した結果が返る(){ + + $rank = '2'; + + $this->expected = array( + 'best_id' => '1002', + 'category_id' => '0', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'del_flg' => '1' + ); + + $result = SC_Helper_BestProducts_Ex::getByRank($rank,true); + $this->actual = Test_Utils::mapArray($result, + array( + 'best_id', + 'category_id', + 'title', + 'comment', + 'del_flg' + )); + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php (revision 22656) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php (revision 22656) @@ -0,0 +1,102 @@ + '1001', + 'product_id'=>'2', + 'category_id' => '0', + 'rank' => '1', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ), + array( + 'best_id' => '1002', + 'product_id'=>'1', + 'category_id' => '0', + 'rank' => '2', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '1' + ), + array( + 'best_id' => '1003', + 'product_id'=>'3', + 'category_id' => '1', + 'rank' => '3', + 'title' => 'タイトルですよ3', + 'comment' => 'コメントですよ3', + 'creator_id' => '3', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ) + ); + + $this->objQuery->delete('dtb_best_products'); + foreach ($products as $item) { + $this->objQuery->insert('dtb_best_products', $item); + } + } + + //dtb_best_productsを全て削除する + protected function deleteAllBestProducts(){ + $this->objQuery->delete('dtb_best_products'); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php (revision 22719) @@ -0,0 +1,202 @@ +deleteAllBestProducts(); + + $this->expected = array(); + $this->actual = SC_Helper_BestProducts_Ex::getList(); + + $this->verify(); + } + + public function testGetList_データがある場合_想定した結果が返る(){ + + $this->setUpBestProducts(); + + + $this->expected = array( + 0=>array( + 'best_id' => '1001', + 'product_id'=>'2', + 'category_id' => '0', + 'rank' => '1', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ), + 1=>array( + 'best_id' => '1003', + 'product_id'=>'3', + 'category_id' => '1', + 'rank' => '3', + 'title' => 'タイトルですよ3', + 'comment' => 'コメントですよ3', + 'creator_id' => '3', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + + ) + ); + + + $this->actual = SC_Helper_BestProducts_Ex::getList(); + $this->verify(); + + } + + public function testGetList_一覧取得has_deleteをtrueにした場合削除済みデータも取得(){ + + $this->setUpBestProducts(); + + + $this->expected = array( + 0=>array( + 'best_id' => '1001', + 'product_id'=>'2', + 'category_id' => '0', + 'rank' => '1', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ), + 1=>array( + 'best_id' => '1002', + 'product_id'=>'1', + 'category_id' => '0', + 'rank' => '2', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '1' + ), + 2=>array( + 'best_id' => '1003', + 'product_id'=>'3', + 'category_id' => '1', + 'rank' => '3', + 'title' => 'タイトルですよ3', + 'comment' => 'コメントですよ3', + 'creator_id' => '3', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + + ) + ); + + + $this->actual = SC_Helper_BestProducts_Ex::getList(0,0,true); + $this->verify(); + + } + + + + public function testGetList_ページングが想定した結果が返る_表示件数1_ページ番号2(){ + + $this->setUpBestProducts(); + + $this->expected = array( + 0=>array( + 'best_id' => '1003', + 'product_id'=>'3', + 'category_id' => '1', + 'rank' => '3', + 'title' => 'タイトルですよ3', + 'comment' => 'コメントですよ3', + 'creator_id' => '3', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ) + ); + + + $this->actual = SC_Helper_BestProducts_Ex::getList(1,2); + $this->verify(); + + } + + + public function testGetList_ページングが想定した結果が返る_表示件数1_ページ番号0(){ + + $this->setUpBestProducts(); + + + $this->expected = array( + 0=>array( + 'best_id' => '1001', + 'product_id'=>'2', + 'category_id' => '0', + 'rank' => '1', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ) + ); + + $this->actual = SC_Helper_BestProducts_Ex::getList(1,0); + $this->verify(); + + } + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteByProductIDsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteByProductIDsTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteByProductIDsTest.php (revision 22719) @@ -0,0 +1,78 @@ +setUpBestProducts(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + + public function testDeleteByProductIDs_データが削除される(){ + + $objHelperBestProducts = new SC_Helper_BestProducts_Ex(); + + $objHelperBestProducts->deleteByProductIDs(array("2")); + + $this->expected = null; + + $this->actual = $objHelperBestProducts->getBestProducts('1001'); + + $this->verify(); + } + + // データが削除されていることを確認 + public function testDeleteByProductIDs_複数データが削除される(){ + + $objHelperBestProducts = new SC_Helper_BestProducts_Ex(); + $objHelperBestProducts->deleteByProductIDs(array("2","3")); + + $this->expected = null; + + $this->actual = $objHelperBestProducts->getBestProducts('1001'); + + $this->verify(); + + $this->actual = $objHelperBestProducts->getBestProducts('1003'); + + $this->verify(); + + } + + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_rankUpTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_rankUpTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_rankUpTest.php (revision 22719) @@ -0,0 +1,58 @@ +setUpBestProducts(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + public function testRankUp_指定されたデータがランクアップされる(){ + + SC_Helper_BestProducts_Ex::rankUp("1003"); + + $this->expected = "2"; + + $arrRet = SC_Helper_BestProducts_Ex::getBestProducts('1003'); + + $this->actual = $arrRet['rank']; + + $this->verify(); + } + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php (revision 22719) @@ -0,0 +1,170 @@ +setUpBestProducts(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + + // best_idを指定して更新される。 + public function testSaveBestProducts_ベストIDがある場合_更新される(){ + + $sqlVal = array( + 'best_id' => '1001', + 'product_id'=>'3', + 'category_id' => '1', + 'rank' => '2', + 'title' => 'タイトルですよ1001', + 'comment' => 'コメントですよ1001', + 'creator_id' => '2', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ); + + $result = SC_Helper_BestProducts_Ex::saveBestProducts($sqlVal); + + $this->expected = array( + 'product_id'=>'3', + 'category_id' => '1', + 'rank' => '2', + 'title' => 'タイトルですよ1001', + 'comment' => 'コメントですよ1001', + 'creator_id' => '1', //変わらない + 'create_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ); + + $this->actual = SC_Helper_BestProducts_Ex::getBestProducts('1001'); + + $arrRet = SC_Helper_BestProducts_Ex::getBestProducts('1001'); + + + $this->actual = Test_Utils::mapArray($arrRet, + array('product_id', + 'category_id', + 'rank', + 'title', + 'comment', + 'creator_id', + 'create_date', + 'del_flg' + ) + ); + + $this->verify(); + } + + + // best_idがnullでデータインサートされる。 + public function testSaveBestProducts_ベストIDがない場合_インサートされる(){ + + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $sqlVal = array( + 'product_id'=>'4', + 'category_id' => '2', + 'rank' => '4', + 'title' => 'タイトルですよ1004', + 'comment' => 'コメントですよ1004', + 'creator_id' => '3', + 'del_flg' => '0' + ); + + $best_id = SC_Helper_BestProducts_Ex::saveBestProducts($sqlVal); + + $this->expected = array( + 'product_id'=>'4', + 'category_id' => '2', + 'rank' => '4', + 'title' => 'タイトルですよ1004', + 'comment' => 'コメントですよ1004', + 'creator_id' => '3', + 'del_flg' => '0' + ); + + $arrRet = SC_Helper_BestProducts_Ex::getBestProducts($best_id); + + + $this->actual = Test_Utils::mapArray($arrRet, + array('product_id', + 'category_id', + 'rank', + 'title', + 'comment', + 'creator_id', + 'del_flg' + ) + ); + + $this->verify(); + } + + + } + + + // best_idがnull、かつrankがnullの場合、想定されたランクが登録される + public function testSaveBestProducts_インサート処理でrankがsetされてない場合_採番された値がセットされる(){ + + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $sqlVal = array( + 'product_id'=>'5', + 'category_id' => '2', + 'title' => 'タイトルですよ5', + 'comment' => 'コメントですよ5', + 'creator_id' => '3', + 'del_flg' => '0' + ); + + $best_id = SC_Helper_BestProducts_Ex::saveBestProducts($sqlVal); + + $this->expected = "4"; //ランク + + $arrRet = SC_Helper_BestProducts_Ex::getBestProducts($best_id); + + + $this->actual = $arrRet['rank']; + + $this->verify(); + } + } + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php (revision 22719) @@ -0,0 +1,123 @@ +setUpBestProducts(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + /**　best_idが存在しない場合、空を返す。 + */ + public function testGetBestProducts_おすすめidが存在しない場合_空を返す() + { + $best_id = '9999'; + + $this->expected = null; + $this->actual = SC_Helper_BestProducts_Ex::getBestProducts($best_id); + + $this->verify(); + } + + // best_idが存在する場合、対応した結果を取得できる。 + public function testGetBestProducts_おすすめIDが存在する場合_対応した結果を取得できる(){ + + $best_id = '1001'; + + + $this->expected = array( + 'category_id' => '0', + 'rank' => '1', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'del_flg' => '0' + ); + + $result = SC_Helper_BestProducts_Ex::getBestProducts($best_id); + $this->actual = Test_Utils::mapArray($result, + array('category_id', + 'rank', + 'title', + 'comment', + 'del_flg' + )); + + $this->verify(); + + } + + + // best_idが存在するが、del_flg=1の場合、空が帰る。 + public function testGetBestProducts_おすすめIDがあり_かつ削除済みの場合_空が返る(){ + + $best_id = '1002'; + + $this->expected = null; + $this->actual = SC_Helper_BestProducts_Ex::getBestProducts($best_id); + + $this->verify(); + + } + + // best_idが存在するが、del_flg=1の場合、かつ。$has_deleted=trueを指定 + public function testGetBestProducts_削除済みでかつhas_deletedがtrueの場合_対応した結果が返る(){ + + $best_id = '1002'; + + + $this->expected = array( + 'category_id' => '0', + 'rank' => '2', + 'title' => 'タイトルですよ', + 'comment' => 'コメントですよ', + 'del_flg' => '1' + ); + + $result = SC_Helper_BestProducts_Ex::getBestProducts($best_id,true); + $this->actual = Test_Utils::mapArray($result, + array('category_id', + 'rank', + 'title', + 'comment', + 'del_flg' + )); + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_rankDownTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_rankDownTest.php (revision 22719) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_rankDownTest.php (revision 22719) @@ -0,0 +1,58 @@ +setUpBestProducts(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + public function testRankDown_指定されたデータがランクダウンされる(){ + + SC_Helper_BestProducts_Ex::rankDown("1001"); + + $this->expected = "2"; + + $arrRet = SC_Helper_BestProducts_Ex::getBestProducts('1001'); + + $this->actual = $arrRet['rank']; + + $this->verify(); + } + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php (revision 22723) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php (revision 22723) @@ -0,0 +1,114 @@ +objAddress = new SC_Helper_Address_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + +//顧客idがない場合は直にExitしてしまうので未実行 +/* + public function testregistAddressTest_顧客idが無い場合_システムエラーを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpAddress(); + //$this->expected = "1"; + $this->objAddress->registAddress(null); + $this->actual = ''; + $this->verify('アドレス追加'); + } +*/ + + + public function testregistAddressTest_会員の登録配送先を追加する() + { + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $this->setUpAddress(); + $arrSql = + array( + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => 'よん', + 'kana01' => 'テスト', + 'kana02' => 'ヨン', + 'zip01' => '333', + 'zip02'=> '3333', + 'pref' => '4', + 'addr01' => 'テスト4', + 'addr02' => 'テスト4', + 'tel01' => '001', + 'tel02' => '0002', + 'tel03' => '0003', + 'fax01' => '112', + 'fax02' => '1113', + 'fax03' => '1114' + ); + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->expected = '1002'; + $this->objAddress->registAddress($arrSql); + $col = 'other_deliv_id'; + $from = 'dtb_other_deliv'; + $where = 'other_deliv_id = ?'; + $arrWhere = array($this->expected); + $ret = $objQuery->select($col, $from, $where, $arrWhere); + $this->actual = $ret['other_deliv_id']; + $this->verify('アドレス追加'); + } + } + + + public function testregistAddressTest_会員の登録配送先を更新する() + { + $this->setUpAddress(); + $arrSql = + array( + 'other_deliv_id' => '1000', + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => '更新', + 'kana01' => 'テスト', + 'kana02' => 'コウシン', + 'zip01' => '222', + 'zip02'=> '2222', + 'pref' => '4', + 'addr01' => 'テスト1', + 'addr02' => 'テスト1', + 'tel01' => '001', + 'tel02' => '0002', + 'tel03' => '0003', + 'fax01' => '112', + 'fax02' => '1113', + 'fax03' => '1114' + ); + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->objAddress->registAddress($arrSql); + + $this->expected = $arrSql; + $col = '*'; + $from = 'dtb_other_deliv'; + $where = 'other_deliv_id = ?'; + $arrWhere = array($arrSql['other_deliv_id']); + $this->actual = $objQuery->getRow($col, $from, $where, $arrWhere); + + $this->verify('登録配送先更新'); + } + + + + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php (revision 22723) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php (revision 22723) @@ -0,0 +1,64 @@ +objAddress = new SC_Helper_Address_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + + + public function testgetAddressTest_会員の登録配送先が該当テーブルに存在しない場合_FALSEを返す() + { + $this->setUpAddress(); + $other_deliv_id = '999'; + $this->expected = FALSE; + $this->actual = $this->objAddress->getAddress($other_deliv_id); + + $this->verify('登録配送先取得'); + } + + public function testgetAddressTest_会員の登録配送先が該当テーブルに存在する場合_2を返す() + { + $this->setUpAddress(); + $other_deliv_id = '1001'; + $this->expected = array( + 'other_deliv_id' => '1001', + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => 'に', + 'kana01' => 'テスト', + 'kana02' => 'ニ', + 'zip01' => '222', + 'zip02'=> '2222', + 'pref' => '2', + 'addr01' => 'テスト1', + 'addr02' => 'テスト2', + 'tel01' => '000', + 'tel02' => '0000', + 'tel03' => '0000', + 'fax01' => '111', + 'fax02' => '1111', + 'fax03' => '1111' + ); + $this->actual = $this->objAddress->getAddress($other_deliv_id); + + $this->verify('登録配送先取得'); + } + + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php (revision 22723) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php (revision 22723) @@ -0,0 +1,40 @@ +objAddress = new SC_Helper_Address_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + + public function testdeleteAddressTest_会員の登録配送先を削除する() + { + $this->setUpAddress(); + $other_deliv_id = '1000'; + $this->expected = NULL; + $this->objAddress->deleteAddress($other_deliv_id); + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $select = '*'; + $from = 'dtb_other_deliv'; + $where = 'other_deliv_id = ?'; + $whereVal = array($other_deliv_id); + $this->actual = $objQuery->getRow($select, $from, $where, $whereVal); + + $this->verify('登録配送先削除'); + } + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php (revision 22723) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php (revision 22723) @@ -0,0 +1,74 @@ + '1000', + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => 'いち', + 'kana01' => 'テスト', + 'kana02' => 'イチ', + 'zip01' => '000', + 'zip02'=> '0000', + 'pref' => '1', + 'addr01' => 'テスト', + 'addr02' => 'テスト２', + 'tel01' => '000', + 'tel02' => '0000', + 'tel03' => '0000', + 'fax01' => '111', + 'fax02' => '1111', + 'fax03' => '1111' + ), + array( + 'other_deliv_id' => '1001', + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => 'に', + 'kana01' => 'テスト', + 'kana02' => 'ニ', + 'zip01' => '222', + 'zip02'=> '2222', + 'pref' => '2', + 'addr01' => 'テスト1', + 'addr02' => 'テスト2', + 'tel01' => '000', + 'tel02' => '0000', + 'tel03' => '0000', + 'fax01' => '111', + 'fax02' => '1111', + 'fax03' => '1111' + ) + ); + + $this->objQuery->delete('dtb_other_deliv'); + foreach ($kiyaku as $key => $item) { + $ret = $objQuery->insert('dtb_other_deliv', $item); + } + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php (revision 22723) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php (revision 22723) @@ -0,0 +1,106 @@ +objAddress = new SC_Helper_Address_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + public function testgetListTest_会員が該当テーブルに存在するかつstart_idが指定されている場合_配送先のarrayを返す() + { + $this->setUpAddress(); + $customer_id = '1'; + $startno = '1'; + $this->expected = array( + array( + 'other_deliv_id' => '1000', + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => 'いち', + 'kana01' => 'テスト', + 'kana02' => 'イチ', + 'zip01' => '000', + 'zip02'=> '0000', + 'pref' => '1', + 'addr01' => 'テスト', + 'addr02' => 'テスト２', + 'tel01' => '000', + 'tel02' => '0000', + 'tel03' => '0000', + 'fax01' => '111', + 'fax02' => '1111', + 'fax03' => '1111' + ) + + ); + $this->actual = $this->objAddress->getList($customer_id, $startno); + + $this->verify('配送先一覧取得'); + } + + public function testgetListTest_会員が該当テーブルに存在する場合_配送先のarrayを返す() + { + $this->setUpAddress(); + $customer_id = '1'; + $this->expected = array( + array( + 'other_deliv_id' => '1001', + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => 'に', + 'kana01' => 'テスト', + 'kana02' => 'ニ', + 'zip01' => '222', + 'zip02'=> '2222', + 'pref' => '2', + 'addr01' => 'テスト1', + 'addr02' => 'テスト2', + 'tel01' => '000', + 'tel02' => '0000', + 'tel03' => '0000', + 'fax01' => '111', + 'fax02' => '1111', + 'fax03' => '1111' + ), + array( + 'other_deliv_id' => '1000', + 'customer_id' => '1', + 'name01' => 'テスト', + 'name02' => 'いち', + 'kana01' => 'テスト', + 'kana02' => 'イチ', + 'zip01' => '000', + 'zip02'=> '0000', + 'pref' => '1', + 'addr01' => 'テスト', + 'addr02' => 'テスト２', + 'tel01' => '000', + 'tel02' => '0000', + 'tel03' => '0000', + 'fax01' => '111', + 'fax02' => '1111', + 'fax03' => '1111' + ) + + ); + $this->actual = $this->objAddress->getList($customer_id); + + $this->verify('配送先一覧取得'); + } + + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php (revision 22726) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php (revision 22726) @@ -0,0 +1,307 @@ +helper = new SC_Helper_DB_sfGetBasisDataCacheMock(); + $this->cashFilePath = MASTER_DATA_REALDIR . 'dtb_baseinfo.serial'; + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testSfGetBasisDataCache_キャッシュがなく生成もしない場合_空を返す() + { + $this->setUpBasisData(); + unlink($this->cashFilePath); + $this->expected = array(); + $this->actual = $this->helper->sfGetBasisDataCache(); + $this->verify(); + } + + public function testSfGetBasisDataCache_キャッシュがなく生成する場合_キャッシュの値を返す() + { + $this->setUpBasisData(); + unlink($this->cashFilePath); + $this->expected = array( + 'id' => '1', + 'company_name' => 'testshop', + 'company_kana' => 'テストショップ', + 'zip01' => '530', + 'zip02' => '0001', + 'pref' => '1', + 'addr01' => 'testaddr01', + 'addr02' => 'testaddr02', + 'tel01' => '11', + 'tel02' => '2222', + 'tel03' => '3333', + 'fax01' => '11', + 'fax02' => '2222', + 'fax03' => '3333', + 'business_hour' => '09-18', + 'law_company' => 'lawcampanyname', + 'law_manager' => 'lawmanager', + 'law_zip01' => '530', + 'law_zip02' => '0001', + 'law_pref' => '1', + 'law_addr01' => 'lawaddr01', + 'law_addr02' => 'lawaddr02', + 'law_tel01' => '11', + 'law_tel02' => '2222', + 'law_tel03' => '3333', + 'law_fax01' => '11', + 'law_fax02' => '2222', + 'law_fax03' => '3333', + 'law_email' => 'test@test.com', + 'law_url' => 'http://test.test', + 'law_term01' => 'lawterm01', + 'law_term02' => 'lawterm02', + 'law_term03' => 'lawterm03', + 'law_term04' => 'lawterm04', + 'law_term05' => 'lawterm05', + 'law_term06' => 'lawterm06', + 'law_term07' => 'lawterm07', + 'law_term08' => 'lawterm08', + 'law_term09' => 'lawterm09', + 'law_term10' => 'lawterm10', + 'tax' => '5', + 'tax_rule' => '1', + 'email01' => 'test1@test.com', + 'email02' => 'test2@test.com', + 'email03' => 'test3@test.com', + 'email04' => 'test4@test.com', + 'email05' => 'test5@test.com', + 'free_rule' => '1000', + 'shop_name' => 'shopname', + 'shop_kana' => 'ショップネーム', + 'shop_name_eng' => 'shopnameeng', + 'point_rate' => '10', + 'welcome_point' => '100', + 'update_date' => '2012-02-14 11:22:33', + 'top_tpl' => 'top.tpl', + 'product_tpl' => 'product.tpl', + 'detail_tpl' => 'detail.tpl', + 'mypage_tpl' => 'mypage.tpl', + 'good_traded' => 'goodtraded', + 'message' => 'message', + 'regular_holiday_ids' => '0|6', + 'latitude' => '30.0001', + 'longitude' => '45.0001', + 'downloadable_days' => '10', + 'downloadable_days_unlimited' => '0' + ); + $this->actual = $this->helper->sfGetBasisDataCache(true); + $this->verify(); + } + + public function testSfGetBasisDataCache_キャッシュがある場合_キャッシュの値を返す() + { + $this->setUpBasisData(); + unlink($this->cashFilePath); + $this->helper->sfCreateBasisDataCache(); + $this->expected = array( + 'id' => '1', + 'company_name' => 'testshop', + 'company_kana' => 'テストショップ', + 'zip01' => '530', + 'zip02' => '0001', + 'pref' => '1', + 'addr01' => 'testaddr01', + 'addr02' => 'testaddr02', + 'tel01' => '11', + 'tel02' => '2222', + 'tel03' => '3333', + 'fax01' => '11', + 'fax02' => '2222', + 'fax03' => '3333', + 'business_hour' => '09-18', + 'law_company' => 'lawcampanyname', + 'law_manager' => 'lawmanager', + 'law_zip01' => '530', + 'law_zip02' => '0001', + 'law_pref' => '1', + 'law_addr01' => 'lawaddr01', + 'law_addr02' => 'lawaddr02', + 'law_tel01' => '11', + 'law_tel02' => '2222', + 'law_tel03' => '3333', + 'law_fax01' => '11', + 'law_fax02' => '2222', + 'law_fax03' => '3333', + 'law_email' => 'test@test.com', + 'law_url' => 'http://test.test', + 'law_term01' => 'lawterm01', + 'law_term02' => 'lawterm02', + 'law_term03' => 'lawterm03', + 'law_term04' => 'lawterm04', + 'law_term05' => 'lawterm05', + 'law_term06' => 'lawterm06', + 'law_term07' => 'lawterm07', + 'law_term08' => 'lawterm08', + 'law_term09' => 'lawterm09', + 'law_term10' => 'lawterm10', + 'tax' => '5', + 'tax_rule' => '1', + 'email01' => 'test1@test.com', + 'email02' => 'test2@test.com', + 'email03' => 'test3@test.com', + 'email04' => 'test4@test.com', + 'email05' => 'test5@test.com', + 'free_rule' => '1000', + 'shop_name' => 'shopname', + 'shop_kana' => 'ショップネーム', + 'shop_name_eng' => 'shopnameeng', + 'point_rate' => '10', + 'welcome_point' => '100', + 'update_date' => '2012-02-14 11:22:33', + 'top_tpl' => 'top.tpl', + 'product_tpl' => 'product.tpl', + 'detail_tpl' => 'detail.tpl', + 'mypage_tpl' => 'mypage.tpl', + 'good_traded' => 'goodtraded', + 'message' => 'message', + 'regular_holiday_ids' => '0|6', + 'latitude' => '30.0001', + 'longitude' => '45.0001', + 'downloadable_days' => '10', + 'downloadable_days_unlimited' => '0' + ); + $this->actual = $this->helper->sfGetBasisDataCache(); + unlink($this->cashFilePath); + $this->verify(); + } + +} + +class SC_Helper_DB_sfGetBasisDataCacheMock extends SC_Helper_DB_Ex +{ + function sfCreateBasisDataCache() + { + // テーブル名 + $name = 'dtb_baseinfo'; + // キャッシュファイルパス + $filepath = MASTER_DATA_REALDIR . $name . '.serial'; + // データ取得 + $arrData = array( + 'id' => '1', + 'company_name' => 'testshop', + 'company_kana' => 'テストショップ', + 'zip01' => '530', + 'zip02' => '0001', + 'pref' => '1', + 'addr01' => 'testaddr01', + 'addr02' => 'testaddr02', + 'tel01' => '11', + 'tel02' => '2222', + 'tel03' => '3333', + 'fax01' => '11', + 'fax02' => '2222', + 'fax03' => '3333', + 'business_hour' => '09-18', + 'law_company' => 'lawcampanyname', + 'law_manager' => 'lawmanager', + 'law_zip01' => '530', + 'law_zip02' => '0001', + 'law_pref' => '1', + 'law_addr01' => 'lawaddr01', + 'law_addr02' => 'lawaddr02', + 'law_tel01' => '11', + 'law_tel02' => '2222', + 'law_tel03' => '3333', + 'law_fax01' => '11', + 'law_fax02' => '2222', + 'law_fax03' => '3333', + 'law_email' => 'test@test.com', + 'law_url' => 'http://test.test', + 'law_term01' => 'lawterm01', + 'law_term02' => 'lawterm02', + 'law_term03' => 'lawterm03', + 'law_term04' => 'lawterm04', + 'law_term05' => 'lawterm05', + 'law_term06' => 'lawterm06', + 'law_term07' => 'lawterm07', + 'law_term08' => 'lawterm08', + 'law_term09' => 'lawterm09', + 'law_term10' => 'lawterm10', + 'tax' => '5', + 'tax_rule' => '1', + 'email01' => 'test1@test.com', + 'email02' => 'test2@test.com', + 'email03' => 'test3@test.com', + 'email04' => 'test4@test.com', + 'email05' => 'test5@test.com', + 'free_rule' => '1000', + 'shop_name' => 'shopname', + 'shop_kana' => 'ショップネーム', + 'shop_name_eng' => 'shopnameeng', + 'point_rate' => '10', + 'welcome_point' => '100', + 'update_date' => '2012-02-14 11:22:33', + 'top_tpl' => 'top.tpl', + 'product_tpl' => 'product.tpl', + 'detail_tpl' => 'detail.tpl', + 'mypage_tpl' => 'mypage.tpl', + 'good_traded' => 'goodtraded', + 'message' => 'message', + 'regular_holiday_ids' => '0|6', + 'latitude' => '30.0001', + 'longitude' => '45.0001', + 'downloadable_days' => '10', + 'downloadable_days_unlimited' => '0' + ); + // シリアライズ + $data = serialize($arrData); + // ファイルを書き出しモードで開く + $handle = fopen($filepath, 'w'); + if (!$handle) { + // ファイル生成失敗 + return false; + } + // ファイルの内容を書き出す. + $res = fwrite($handle, $data); + // ファイルを閉じる + fclose($handle); + if ( $res === false) { + // ファイル生成失敗 + return false; + } + // ファイル生成成功 + return true; + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_TestBase.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_TestBase.php (revision 22678) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_TestBase.php (revision 22678) @@ -0,0 +1,162 @@ + '2000-01-01 00:00:00', + 'news_id' => '1', + 'news_title' => 'ニュース情報01', + 'rank' => '1', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '2', + 'news_title' => 'ニュース情報02', + 'rank' => '2', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '3', + 'news_title' => 'ニュース情報03', + 'rank' => '3', + 'creator_id' => '1', + 'del_flg' => '0' + ) + ); + + $this->objQuery->delete('dtb_news'); + foreach ($news as $key => $item) { + $this->objQuery->insert('dtb_news', $item); + } + } + + /** + * DBに基本情報を設定します。 + */ + protected function setUpBasisData() + { + $baseInfo = array( + 'id' => '1', + 'company_name' => 'testshop', + 'company_kana' => 'テストショップ', + 'zip01' => '530', + 'zip02' => '0001', + 'pref' => '1', + 'addr01' => 'testaddr01', + 'addr02' => 'testaddr02', + 'tel01' => '11', + 'tel02' => '2222', + 'tel03' => '3333', + 'fax01' => '11', + 'fax02' => '2222', + 'fax03' => '3333', + 'business_hour' => '09-18', + 'law_company' => 'lawcampanyname', + 'law_manager' => 'lawmanager', + 'law_zip01' => '530', + 'law_zip02' => '0001', + 'law_pref' => '1', + 'law_addr01' => 'lawaddr01', + 'law_addr02' => 'lawaddr02', + 'law_tel01' => '11', + 'law_tel02' => '2222', + 'law_tel03' => '3333', + 'law_fax01' => '11', + 'law_fax02' => '2222', + 'law_fax03' => '3333', + 'law_email' => 'test@test.com', + 'law_url' => 'http://test.test', + 'law_term01' => 'lawterm01', + 'law_term02' => 'lawterm02', + 'law_term03' => 'lawterm03', + 'law_term04' => 'lawterm04', + 'law_term05' => 'lawterm05', + 'law_term06' => 'lawterm06', + 'law_term07' => 'lawterm07', + 'law_term08' => 'lawterm08', + 'law_term09' => 'lawterm09', + 'law_term10' => 'lawterm10', + 'tax' => '5', + 'tax_rule' => '1', + 'email01' => 'test1@test.com', + 'email02' => 'test2@test.com', + 'email03' => 'test3@test.com', + 'email04' => 'test4@test.com', + 'email05' => 'test5@test.com', + 'free_rule' => '1000', + 'shop_name' => 'shopname', + 'shop_kana' => 'ショップネーム', + 'shop_name_eng' => 'shopnameeng', + 'point_rate' => '10', + 'welcome_point' => '100', + 'update_date' => '2012-02-14 11:22:33', + 'top_tpl' => 'top.tpl', + 'product_tpl' => 'product.tpl', + 'detail_tpl' => 'detail.tpl', + 'mypage_tpl' => 'mypage.tpl', + 'good_traded' => 'goodtraded', + 'message' => 'message', + 'regular_holiday_ids' => '0|6', + 'latitude' => '30.0001', + 'longitude' => '45.0001', + 'downloadable_days' => '10', + 'downloadable_days_unlimited' => '0' + ); + + $this->objQuery->delete('dtb_baseinfo'); + $this->objQuery->insert('dtb_baseinfo', $baseInfo); + } + + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisExistsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisExistsTest.php (revision 22726) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisExistsTest.php (revision 22726) @@ -0,0 +1,63 @@ +helper = new SC_Helper_DB_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testSfGetBasisExists_baseinfoにデータがある場合_trueを返す() + { + $this->setUpBasisData(); + $this->expected = true; + $this->actual = $this->helper->sfGetBasisExists(); + $this->verify(); + } + + public function testSfGetBasisExists_baseinfoにデータがない場合_falseを返す() + { + $this->objQuery->delete('dtb_baseinfo'); + $this->expected = false; + $this->actual = $this->helper->sfGetBasisExists(); + $this->verify(); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php (revision 22678) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php (revision 22678) @@ -0,0 +1,135 @@ +helper = new SC_Helper_DB_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testSfMoveRank_一番下に移動する場合_RANK1を返す() + { + $this->setUpNews(); + $table = 'dtb_news'; + $keyIdColum = 'news_id'; + $keyId = '3'; + $pos = '3'; + $where = null; + $this->expected = 1; + $this->helper->sfMoveRank($table, $keyIdColum, $keyId, $pos, $where); + $col = 'rank'; + $getWhere = 'news_id = ?'; + $arrWhereVal = array($keyId); + $this->actual = $this->objQuery->get($col, $table, $getWhere, $arrWhereVal); + $this->verify(); + } + + public function testSfMoveRank_一番上に移動する場合_RANKはMAXを返す() + { + $this->setUpNews(); + $table = 'dtb_news'; + $keyIdColum = 'news_id'; + $keyId = '2'; + $pos = '1'; + $where = null; + $this->expected = $this->objQuery->max('rank', $table); + $this->helper->sfMoveRank($table, $keyIdColum, $keyId, $pos, $where); + $col = 'rank'; + $getWhere = 'news_id = ?'; + $arrWhereVal = array($keyId); + $this->actual = $this->objQuery->get($col, $table, $getWhere, $arrWhereVal); + $this->verify(); + } + + public function testSfMoveRank_同じ位置に移動する場合_RANKは変わらない() + { + $this->setUpNews(); + $table = 'dtb_news'; + $keyIdColum = 'news_id'; + $keyId = '3'; + $pos = '1'; + $where = null; + $this->expected = 3; + $this->helper->sfMoveRank($table, $keyIdColum, $keyId, $pos, $where); + $col = 'rank'; + $getWhere = 'news_id = ?'; + $arrWhereVal = array($keyId); + $this->actual = $this->objQuery->get($col, $table, $getWhere, $arrWhereVal); + $this->verify(); + } + + public function testSfMoveRank_マイナスの位置に移動する場合_RANKはMAX() + { + $this->setUpNews(); + $table = 'dtb_news'; + $keyIdColum = 'news_id'; + $keyId = '2'; + $pos = '-1'; + $where = null; + $this->expected = $this->objQuery->max('rank', $table); + $this->helper->sfMoveRank($table, $keyIdColum, $keyId, $pos, $where); + $col = 'rank'; + $getWhere = 'news_id = ?'; + $arrWhereVal = array($keyId); + $this->actual = $this->objQuery->get($col, $table, $getWhere, $arrWhereVal); + $this->verify(); + } + + public function testSfMoveRank_最大値以上の位置を与える場合_RANKは1となる() + { + $this->setUpNews(); + $table = 'dtb_news'; + $keyIdColum = 'news_id'; + $keyId = '2'; + $pos = '4'; + $where = null; + $this->expected = 1; + $this->helper->sfMoveRank($table, $keyIdColum, $keyId, $pos, $where); + $col = 'rank'; + $getWhere = 'news_id = ?'; + $arrWhereVal = array($keyId); + $this->actual = $this->objQuery->get($col, $table, $getWhere, $arrWhereVal); + $this->verify(); + } + +} + + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php (revision 22726) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php (revision 22726) @@ -0,0 +1,73 @@ +helper = new SC_Helper_DB_sfCreateBasisDataCacheMock(); + $this->cashFilePath = MASTER_DATA_REALDIR . 'dtb_baseinfo.serial'; + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testsfCreateBasisDataCache_ファイル操作に成功した場合_TRUEを返す() + { + unlink($this->cashFilePath); + $arrData = array( + 'id' => '1', + 'company_name' => 'testshop' + ); + $this->expected = true; + $this->actual = $this->helper->sfCreateBasisDataCache(); + unlink($this->cashFilePath); + $this->verify(); + } +} + +class SC_Helper_DB_sfCreateBasisDataCacheMock extends SC_Helper_DB_Ex +{ + function sfGetBasisData() + { + $arrData = array( + 'id' => '1', + 'company_name' => 'testshop' + ); + return $arrData; + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnAddTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnAddTest.php (revision 22678) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnAddTest.php (revision 22678) @@ -0,0 +1,62 @@ +helper = new SC_Helper_DB_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testSfColumnAdd_指定のカラムが追加できたら_TRUEを返す() + { + $tableName = 'dtb_news'; + $colName = 'news_id2'; + $colType = 'int'; + $this->expected = true; + $this->helper->sfColumnAdd($tableName, $colName, $colType); + $columns = $this->objQuery->listTableFields($tableName); + $this->actual = in_array($colName, $columns); + // rolbackできないのでカラムを削除する + $this->objQuery->query("ALTER TABLE $tableName DROP $colName"); + $this->verify(); + } + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfDataExistsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfDataExistsTest.php (revision 22678) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfDataExistsTest.php (revision 22678) @@ -0,0 +1,72 @@ +helper = new SC_Helper_DB_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testSfDataExists_データが存在する場合_TRUEを返す() + { + $this->setUpNews(); + $tableName = 'dtb_news'; + $where = 'news_id = ?'; + $arrWhereVal = array(3); + $this->expected = true; + $this->actual = $this->helper->sfDataExists($tableName, $where, $arrWhereVal); + $this->verify(); + } + + public function testSfDataExists_データが存在しない場合_FALSEを返す() + { + $this->setUpNews(); + $tableName = 'dtb_news'; + $where = 'news_id = ?'; + $arrWhereVal = array(4); + $this->expected = false; + $this->actual = $this->helper->sfDataExists($tableName, $where, $arrWhereVal); + $this->verify(); + } + +} + + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisCountTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisCountTest.php (revision 22726) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisCountTest.php (revision 22726) @@ -0,0 +1,69 @@ +helper = new SC_Helper_DB_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testSfGetBasisCount_baseinfoのデータが1行の場合_1を返す() + { + $this->setUpBasisData(); + $this->expected = 1; + $this->actual = $this->helper->sfGetBasisCount(); + $this->verify(); + } + + public function testSfGetBasisCount_baseinfoのデータが2行の場合_2を返す() + { + $this->setUpBasisData(); + $baseinfo = array( + 'id' => 2, + 'update_date' => 'CURRENT_TIMESTAMP' + ); + $this->objQuery->insert('dtb_baseinfo', $baseinfo); + $this->expected = 2; + $this->actual = $this->helper->sfGetBasisCount(); + $this->verify(); + } + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataTest.php (revision 22678) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataTest.php (revision 22678) @@ -0,0 +1,161 @@ +helper = new SC_Helper_DB_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testsfGetBasisData_条件を指定しない場合_baseinfoをすべて返す() + { + $this->setUpBasisData(); + $this->expected = array( + 'id' => '1', + 'company_name' => 'testshop', + 'company_kana' => 'テストショップ', + 'zip01' => '530', + 'zip02' => '0001', + 'pref' => '1', + 'addr01' => 'testaddr01', + 'addr02' => 'testaddr02', + 'tel01' => '11', + 'tel02' => '2222', + 'tel03' => '3333', + 'fax01' => '11', + 'fax02' => '2222', + 'fax03' => '3333', + 'business_hour' => '09-18', + 'law_company' => 'lawcampanyname', + 'law_manager' => 'lawmanager', + 'law_zip01' => '530', + 'law_zip02' => '0001', + 'law_pref' => '1', + 'law_addr01' => 'lawaddr01', + 'law_addr02' => 'lawaddr02', + 'law_tel01' => '11', + 'law_tel02' => '2222', + 'law_tel03' => '3333', + 'law_fax01' => '11', + 'law_fax02' => '2222', + 'law_fax03' => '3333', + 'law_email' => 'test@test.com', + 'law_url' => 'http://test.test', + 'law_term01' => 'lawterm01', + 'law_term02' => 'lawterm02', + 'law_term03' => 'lawterm03', + 'law_term04' => 'lawterm04', + 'law_term05' => 'lawterm05', + 'law_term06' => 'lawterm06', + 'law_term07' => 'lawterm07', + 'law_term08' => 'lawterm08', + 'law_term09' => 'lawterm09', + 'law_term10' => 'lawterm10', + 'tax' => '5', + 'tax_rule' => '1', + 'email01' => 'test1@test.com', + 'email02' => 'test2@test.com', + 'email03' => 'test3@test.com', + 'email04' => 'test4@test.com', + 'email05' => 'test5@test.com', + 'free_rule' => '1000', + 'shop_name' => 'shopname', + 'shop_kana' => 'ショップネーム', + 'shop_name_eng' => 'shopnameeng', + 'point_rate' => '10', + 'welcome_point' => '100', + 'update_date' => '2012-02-14 11:22:33', + 'top_tpl' => 'top.tpl', + 'product_tpl' => 'product.tpl', + 'detail_tpl' => 'detail.tpl', + 'mypage_tpl' => 'mypage.tpl', + 'good_traded' => 'goodtraded', + 'message' => 'message', + 'regular_holiday_ids' => '0|6', + 'latitude' => '30.0001', + 'longitude' => '45.0001', + 'downloadable_days' => '10', + 'downloadable_days_unlimited' => '0' + ); + $this->actual = $this->helper->sfGetBasisData(true); + $this->verify(); + } + + + public function testsfGetBasisData_カラムを指定する場合_指定のカラムだけを返す() + { + $this->setUpBasisData(); + $this->expected = array( + 'id' => '1', + 'company_name' => 'testshop' + ); + $force = true; + $col = 'id, company_name'; + $this->actual = $this->helper->sfGetBasisData($force, $col); + $this->verify(); + } + + public function testsfGetBasisData_baseinfoが空の場合_空を返す() + { + $this->objQuery->delete('dtb_baseinfo'); + $this->expected = array(); + $this->actual = $this->helper->sfGetBasisData(true); + $this->verify(); + } + + public function testsfGetBasisData_forceがfalseの場合_キャッシュを返す() + { + $this->setUpBasisData(); + $force = true; + $col = 'id, company_name'; + //事前にキャッシュを生成 + $this->actual = $this->helper->sfGetBasisData($force, $col); + //baseinfoを空にしてしまう + $this->objQuery->delete('dtb_baseinfo'); + $force = false; + $this->expected = array( + 'id' => '1', + 'company_name' => 'testshop' + ); + $this->actual = $this->helper->sfGetBasisData(false); + $this->verify(); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnExistsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnExistsTest.php (revision 22725) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnExistsTest.php (revision 22725) @@ -0,0 +1,87 @@ +helper = new SC_Helper_DB_sfColumnExistsMock(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testSfColumnExists_指定のカラムが存在する場合_TRUEを返す() + { + $tableName = 'dtb_news'; + $colName = 'news_id'; + $this->expected = true; + $this->actual = $this->helper->sfColumnExists($tableName, $colName); + $this->verify(); + } + + public function testSfColumnExists_指定のカラムが存在しない場合_FALSEを返す() + { + $tableName = 'dtb_news'; + $colName = 'news_id2'; + $this->expected = false; + $this->actual = $this->helper->sfColumnExists($tableName, $colName); + $this->verify(); + } + + public function testSfColumnExists_指定のカラムが存在しない場合追加して_TRUEを返す() + { + $tableName = 'dtb_news'; + $colName = 'news_id2'; + $colType = 'int'; + $dsn = ''; + $add = true; + $this->expected = true; + $this->actual = $this->helper->sfColumnExists($tableName, $colName, $colType, $dsn, $add); + $this->verify(); + } + +} + +class SC_Helper_DB_sfColumnExistsMock extends SC_Helper_DB_Ex +{ + function sfColumnAdd($tableName, $colName, $colType) { + return true; + } +} + + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php (revision 22567) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php (revision 22735) @@ -48,71 +48,74 @@ public function testRegisterOrderDetail_該当の受注が存在する場合_削除後に新しい情報が登録される() { - $params = array( - array( - 'order_id' => '1001', - 'hoge' => '999', // DBに存在しないカラム - 'product_id' => '9001', - 'product_class_id' => '9001', - 'product_name' => '製品名9001' - ) - ); - SC_Helper_Purchase::registerOrderDetail('1001', $params); + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $params = array( + array( + 'order_id' => '1001', + 'hoge' => '999', // DBに存在しないカラム + 'product_id' => '9001', + 'product_class_id' => '9001', + 'product_name' => '製品名9001' + ) + ); + SC_Helper_Purchase::registerOrderDetail('1001', $params); - $this->expected['count'] = '2'; // 同じorder_idのものが消されるので1行減る - $this->expected['content'] = array( - 'order_id' => '1001', - 'product_id' => '9001', - 'product_class_id' => '9001', - 'product_name' => '製品名9001', - 'product_code' => null // 古いデータにはあるが、deleteされたので消えている - ); + $this->expected['count'] = '2'; // 同じorder_idのものが消されるので1行減る + $this->expected['content'] = array( + 'order_id' => '1001', + 'product_id' => '9001', + 'product_class_id' => '9001', + 'product_name' => '製品名9001', + 'product_code' => null // 古いデータにはあるが、deleteされたので消えている + ); - $this->actual['count'] = $this->objQuery->count('dtb_order_detail'); - $result = $this->objQuery->select( - 'order_id, product_id, product_class_id, product_name, product_code', - 'dtb_order_detail', - 'order_id = ?', - array('1001') - ); - $this->actual['content'] = $result[0]; + $this->actual['count'] = $this->objQuery->count('dtb_order_detail'); + $result = $this->objQuery->select( + 'order_id, product_id, product_class_id, product_name, product_code', + 'dtb_order_detail', + 'order_id = ?', + array('1001') + ); + $this->actual['content'] = $result[0]; - $this->verify(); + $this->verify(); + } } - public function testRegisterOrderDetail_該当の受注が存在しない場合_新しい情報が追加登録される() - { - $params = array( - array( - 'order_id' => '1003', - 'hoge' => '999', // DBに存在しないカラム - 'product_id' => '9003', - 'product_class_id' => '9003', - 'product_name' => '製品名9003' - ) - ); - SC_Helper_Purchase::registerOrderDetail('1003', $params); + public function testRegisterOrderDetail_該当の受注が存在しない場合_新しい情報が追加登録される() + { + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $params = array( + array( + 'order_id' => '1003', + 'hoge' => '999', // DBに存在しないカラム + 'product_id' => '9003', + 'product_class_id' => '9003', + 'product_name' => '製品名9003' + ) + ); + SC_Helper_Purchase::registerOrderDetail('1003', $params); - $this->expected['count'] = '4'; - $this->expected['content'] = array( - 'order_id' => '1003', - 'product_id' => '9003', - 'product_class_id' => '9003', - 'product_name' => '製品名9003', - 'product_code' => null - ); + $this->expected['count'] = '4'; + $this->expected['content'] = array( + 'order_id' => '1003', + 'product_id' => '9003', + 'product_class_id' => '9003', + 'product_name' => '製品名9003', + 'product_code' => null + ); - $this->actual['count'] = $this->objQuery->count('dtb_order_detail'); - $result = $this->objQuery->select( - 'order_id, product_id, product_class_id, product_name, product_code', - 'dtb_order_detail', - 'order_id = ?', - array('1003') - ); - $this->actual['content'] = $result[0]; + $this->actual['count'] = $this->objQuery->count('dtb_order_detail'); + $result = $this->objQuery->select( + 'order_id, product_id, product_class_id, product_name, product_code', + 'dtb_order_detail', + 'order_id = ?', + array('1003') + ); + $this->actual['content'] = $result[0]; - $this->verify(); - } + $this->verify(); + } + } ////////////////////////////////////////// } - Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php (revision 22567) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php (revision 22735) @@ -35,152 +35,154 @@ { - private $helper; - - protected function setUp() - { - parent::setUp(); - $this->setUpOrder(); - $this->helper = new SC_Helper_Purchase_registerOrderMock(); - } - - protected function tearDown() - { - parent::tearDown(); - } - - ///////////////////////////////////////// - public function testRegisterOrder_既に受注IDが存在する場合_情報が更新される() - { - $order_id = '1001'; - $arrParams = array( - 'status' => '1', - 'add_point' => 10, - 'use_point' => 20, - 'order_name01' => '受注情報01_更新' - ); - - $this->helper->registerOrder($order_id, $arrParams); - - $this->expected = array( - 'sfUpdateOrderStatus' => array( - 'order_id' => '1001', - 'status' => '1', - 'add_point' => 10, - 'use_point' => 20 - ), - 'sfUpdateOrderNameCol' => '1001', - 'count' => '2', - 'content' => array( - 'order_id' => '1001', - 'customer_id' => '1001', - 'status' => '1', - 'add_point' => '10', - 'use_point' => '20', - 'order_name01' => '受注情報01_更新' - ) - ); - $this->actual = $_SESSION['testResult']; - $this->actual['count'] = $this->objQuery->count('dtb_order'); - $result = $this->objQuery->select( - 'order_id, customer_id, status, order_name01, add_point, use_point', - 'dtb_order', - 'order_id = ?', - array($order_id) - ); - $this->actual['content'] = $result[0]; - - $this->verify(); - } - - public function testRegisterOrder_存在しない受注IDを指定した場合_新規に登録される() - { - $order_id = '1003'; - $arrParams = array( - 'customer_id' => '1003', - 'status' => '2', - 'add_point' => 100, - 'use_point' => 200, - 'order_name01' => '受注情報03' - ); - - $this->helper->registerOrder($order_id, $arrParams); - - $this->expected = array( - 'sfUpdateOrderStatus' => array( - 'order_id' => '1003', - 'status' => '2', - 'add_point' => 100, - 'use_point' => 200 - ), - 'sfUpdateOrderNameCol' => '1003', - 'count' => '3', - 'content' => array( - 'order_id' => '1003', - 'customer_id' => '1003', - 'status' => null, // ここではsfUpdateOrderStatusをモックにしているので更新されない - 'add_point' => '100', - 'use_point' => '200', - 'order_name01' => '受注情報03' - ) - ); - $this->actual = $_SESSION['testResult']; - $this->actual['count'] = $this->objQuery->count('dtb_order'); - $result = $this->objQuery->select( - 'order_id, customer_id, status, order_name01, add_point, use_point', - 'dtb_order', - 'order_id = ?', - array($order_id) - ); - $this->actual['content'] = $result[0]; - - $this->verify(); - } - - public function testRegisterOrder_受注IDが未指定の場合_新たにIDが発行される() - { - $order_id = ''; - $arrParams = array( // 顧客IDも未指定 - 'status' => '2', - 'add_point' => 100, - 'use_point' => 200, - 'order_name01' => '受注情報03' - ); - - // SEQの値を取得 - $new_order_id = $this->helper->getNextOrderID() + 1; - - $this->helper->registerOrder($order_id, $arrParams); - - $this->expected = array( - 'sfUpdateOrderStatus' => array( - 'order_id' => $new_order_id, - 'status' => '2', - 'add_point' => 100, - 'use_point' => 200 - ), - 'sfUpdateOrderNameCol' => $new_order_id, - 'count' => '3', - 'content' => array( - 'order_id' => $new_order_id, - 'customer_id' => '0', - 'status' => null, // ここではsfUpdateOrderStatusをモックにしているので更新されない - 'add_point' => '100', - 'use_point' => '200', - 'order_name01' => '受注情報03' - ) - ); - $this->actual = $_SESSION['testResult']; - $this->actual['count'] = $this->objQuery->count('dtb_order'); - $result = $this->objQuery->select( - 'order_id, customer_id, status, order_name01, add_point, use_point', - 'dtb_order', - 'order_id = ?', - array($new_order_id) - ); - $this->actual['content'] = $result[0]; - - $this->verify(); - - } + private $helper; + + protected function setUp() + { + parent::setUp(); + $this->setUpOrder(); + $this->helper = new SC_Helper_Purchase_registerOrderMock(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + public function testRegisterOrder_既に受注IDが存在する場合_情報が更新される() + { + $order_id = '1001'; + $arrParams = array( + 'status' => '1', + 'add_point' => 10, + 'use_point' => 20, + 'order_name01' => '受注情報01_更新' + ); + + $this->helper->registerOrder($order_id, $arrParams); + + $this->expected = array( + 'sfUpdateOrderStatus' => array( + 'order_id' => '1001', + 'status' => '1', + 'add_point' => 10, + 'use_point' => 20 + ), + 'sfUpdateOrderNameCol' => '1001', + 'count' => '2', + 'content' => array( + 'order_id' => '1001', + 'customer_id' => '1001', + 'status' => '1', + 'add_point' => '10', + 'use_point' => '20', + 'order_name01' => '受注情報01_更新' + ) + ); + $this->actual = $_SESSION['testResult']; + $this->actual['count'] = $this->objQuery->count('dtb_order'); + $result = $this->objQuery->select( + 'order_id, customer_id, status, order_name01, add_point, use_point', + 'dtb_order', + 'order_id = ?', + array($order_id) + ); + $this->actual['content'] = $result[0]; + + $this->verify(); + } + + public function testRegisterOrder_存在しない受注IDを指定した場合_新規に登録される() + { + $order_id = '1003'; + $arrParams = array( + 'customer_id' => '1003', + 'status' => '2', + 'add_point' => 100, + 'use_point' => 200, + 'order_name01' => '受注情報03' + ); + + $this->helper->registerOrder($order_id, $arrParams); + + $this->expected = array( + 'sfUpdateOrderStatus' => array( + 'order_id' => '1003', + 'status' => '2', + 'add_point' => 100, + 'use_point' => 200 + ), + 'sfUpdateOrderNameCol' => '1003', + 'count' => '3', + 'content' => array( + 'order_id' => '1003', + 'customer_id' => '1003', + 'status' => null, // ここではsfUpdateOrderStatusをモックにしているので更新されない + 'add_point' => '100', + 'use_point' => '200', + 'order_name01' => '受注情報03' + ) + ); + $this->actual = $_SESSION['testResult']; + $this->actual['count'] = $this->objQuery->count('dtb_order'); + $result = $this->objQuery->select( + 'order_id, customer_id, status, order_name01, add_point, use_point', + 'dtb_order', + 'order_id = ?', + array($order_id) + ); + $this->actual['content'] = $result[0]; + + $this->verify(); + } + + public function testRegisterOrder_受注IDが未指定の場合_新たにIDが発行される() + { + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $order_id = ''; + $arrParams = array( // 顧客IDも未指定 + 'status' => '2', + 'add_point' => 100, + 'use_point' => 200, + 'order_name01' => '受注情報03' + ); + + // SEQの値を取得 + $new_order_id = $this->helper->getNextOrderID() + 1; + + $this->helper->registerOrder($order_id, $arrParams); + + $this->expected = array( + 'sfUpdateOrderStatus' => array( + 'order_id' => $new_order_id, + 'status' => '2', + 'add_point' => 100, + 'use_point' => 200 + ), + 'sfUpdateOrderNameCol' => $new_order_id, + 'count' => '3', + 'content' => array( + 'order_id' => $new_order_id, + 'customer_id' => '0', + 'status' => null, // ここではsfUpdateOrderStatusをモックにしているので更新されない + 'add_point' => '100', + 'use_point' => '200', + 'order_name01' => '受注情報03' + ) + ); + $this->actual = $_SESSION['testResult']; + $this->actual['count'] = $this->objQuery->count('dtb_order'); + $result = $this->objQuery->select( + 'order_id, customer_id, status, order_name01, add_point, use_point', + 'dtb_order', + 'order_id = ?', + array($new_order_id) + ); + $this->actual['content'] = $result[0]; + + $this->verify(); + } + + } ////////////////////////////////////////// @@ -190,18 +192,18 @@ class SC_Helper_Purchase_registerOrderMock extends SC_Helper_Purchase { - function sfUpdateOrderStatus($order_id, $status, $add_point, $use_point, $values) - { - $_SESSION['testResult']['sfUpdateOrderStatus'] = array( - 'order_id' => $order_id, - 'status' => $status, - 'add_point' => $add_point, - 'use_point' => $use_point, - ); - } - - function sfUpdateOrderNameCol($order_id) - { - $_SESSION['testResult']['sfUpdateOrderNameCol'] = $order_id; - } + function sfUpdateOrderStatus($order_id, $status, $add_point, $use_point, $values) + { + $_SESSION['testResult']['sfUpdateOrderStatus'] = array( + 'order_id' => $order_id, + 'status' => $status, + 'add_point' => $add_point, + 'use_point' => $use_point, + ); + } + + function sfUpdateOrderNameCol($order_id) + { + $_SESSION['testResult']['sfUpdateOrderNameCol'] = $order_id; + } } Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_deleteNewsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_deleteNewsTest.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_deleteNewsTest.php (revision 22722) @@ -0,0 +1,44 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testDeleteNewsTest_ニュースIDを指定した場合_対象のニュース情報が削除される() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $news_id = 1002; + + $this->expected = '1'; + + $this->objNews->deleteNews($news_id); + + $col = 'del_flg'; + $from = 'dtb_news'; + $where = 'news_id = ?'; + $whereVal = array($news_id); + $res = $objQuery->getCol($col, $from, $where, $whereVal); + $this->actual = $res[0]; + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_rankUpTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_rankUpTest.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_rankUpTest.php (revision 22722) @@ -0,0 +1,44 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testRankUpTest_ニュースIDを指定した場合_対象のランクが1増加する() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $news_id = 1002; + + $this->expected = '3'; + + $this->objNews->rankUp($news_id); + + $col = 'rank'; + $from = 'dtb_news'; + $where = 'news_id = ?'; + $whereVal = array($news_id); + $res = $objQuery->getCol($col, $from, $where, $whereVal); + $this->actual = $res[0]; + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_moveRankTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_moveRankTest.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_moveRankTest.php (revision 22722) @@ -0,0 +1,45 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testMoveRankTest_ニュースIDと移動先ランクを指定した場合_対象のランクが移動する() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $news_id = 1001; + $rank = 1; + + $this->expected = '4'; + + $this->objNews->moveRank($news_id, $rank); + + $col = 'rank'; + $from = 'dtb_news'; + $where = 'news_id = ?'; + $whereVal = array($news_id); + $res = $objQuery->get($col, $from, $where, $whereVal); + $this->actual = $res; + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_rankDownTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_rankDownTest.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_rankDownTest.php (revision 22722) @@ -0,0 +1,44 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testRankDownTest_ニュースIDを指定した場合_対象のランクが1減少する() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $news_id = 1003; + + $this->expected = '2'; + + $this->objNews->rankDown($news_id); + + $col = 'rank'; + $from = 'dtb_news'; + $where = 'news_id = ?'; + $whereVal = array($news_id); + $res = $objQuery->getCol($col, $from, $where, $whereVal); + $this->actual = $res[0]; + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getCountTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getCountTest.php (revision 22677) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getCountTest.php (revision 22677) @@ -0,0 +1,47 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testGetCount_削除されたニュースも含む場合_すべてのニュース件数を取得() + { + $this->setUpNews(); + $has_deleted = true; + + $this->expected = 4; + + $this->actual = $this->objNews->getCount($has_deleted); + + $this->verify(); + } + + public function testGetCount_削除されたニュースは含まない場合_削除されていないニュース件数を取得() + { + $this->setUpNews(); + $has_deleted = false; + + $this->expected = 3; + + $this->actual = $this->objNews->getCount($has_deleted); + + $this->verify(); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php (revision 22722) @@ -0,0 +1,92 @@ + '2000-01-01 00:00:00', + 'news_id' => '1001', + 'news_title' => 'ニュース情報01', + 'rank' => '1', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1002', + 'news_title' => 'ニュース情報02', + 'rank' => '2', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1003', + 'news_title' => 'ニュース情報03', + 'rank' => '3', + 'creator_id' => '1', + 'del_flg' => '1' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1004', + 'news_title' => 'ニュース情報04', + 'rank' => '4', + 'creator_id' => '1', + 'del_flg' => '0' + ) + ); + + $this->objQuery->delete('dtb_news'); + foreach ($news as $key => $item) { + $this->objQuery->insert('dtb_news', $item); + } + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php (revision 22722) @@ -0,0 +1,153 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testGetList_削除されたニュースも含む場合_すべてのニュース一覧が取得できる() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $dispNumber = 0; + $pageNumber = 0; + $has_deleted = true; + + $this->expected = array( + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1004', + 'news_title' => 'ニュース情報04', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1003', + 'news_title' => 'ニュース情報03', + 'creator_id' => '1', + 'del_flg' => '1' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1002', + 'news_title' => 'ニュース情報02', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1001', + 'news_title' => 'ニュース情報01', + 'creator_id' => '1', + 'del_flg' => '0' + ) + ); + $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); + foreach($result as $value) { + $this->actual[] = Test_Utils::mapArray($value, array('update_date', 'news_id', 'news_title', 'creator_id', 'del_flg')); + } + + $this->verify(); + } + + public function testGetList_削除されたニュースは含まない場合_削除されていないニュース一覧が取得できる() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $dispNumber = 0; + $pageNumber = 0; + $has_deleted = false; + + $this->expected = array( + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1004', + 'news_title' => 'ニュース情報04', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1002', + 'news_title' => 'ニュース情報02', + 'creator_id' => '1', + 'del_flg' => '0' + ), + array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1001', + 'news_title' => 'ニュース情報01', + 'creator_id' => '1', + 'del_flg' => '0' + ) + ); + + $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); + foreach($result as $value) { + $this->actual[] = Test_Utils::mapArray($value, array('update_date', 'news_id', 'news_title', 'creator_id', 'del_flg')); + } + + $this->verify(); + } + + public function testGetList_表示件数1かつページ番号3の場合_対象のニュースが取得できる() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $dispNumber = 1; + $pageNumber = 3; + $has_deleted = false; + + $this->expected = array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1001', + 'news_title' => 'ニュース情報01', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); + $this->actual = Test_Utils::mapArray($result[0], array('update_date', 'news_id', 'news_title', 'creator_id', 'del_flg')); + + $this->verify(); + } + + public function testGetList_表示件数1かつページ番号0の場合_対象のニュースが取得できる() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + $dispNumber = 1; + $pageNumber = 0; + $has_deleted = false; + + $this->expected = array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1004', + 'news_title' => 'ニュース情報04', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); + $this->actual = Test_Utils::mapArray($result[0], array('update_date', 'news_id', 'news_title', 'creator_id', 'del_flg')); + + $this->verify(); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php (revision 22722) @@ -0,0 +1,91 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testSaveNewsTest_news_idが空の場合_新規登録される() + { + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + + $sqlval = array( + 'news_title' => 'ニュース情報05', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $this->expected['count'] = '5'; + $this->expected['content'] = array( + 'news_title' => 'ニュース情報05', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + //$sqlval['news_id'] = $objQuery->setVal('dtb_news_news_id', 5); + $ret_id = $this->objNews->saveNews($sqlval); + + $this->actual['count'] = $objQuery->count('dtb_news'); + $result = $objQuery->select( + 'news_title, creator_id, del_flg', + 'dtb_news', + 'news_id = ?', + array($ret_id)); + $this->actual['content'] = $result[0]; + + $this->verify(); + } + } + + public function testSaveNewsTest_news_idが存在する場合_対象のニュースが更新される() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpNews(); + + $sqlval = array( + 'news_id' => '1002', + 'news_title' => 'ニュース情報05更新', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $this->expected['count'] = '4'; + $this->expected['content'] = array( + 'news_id' => '1002', + 'news_title' => 'ニュース情報05更新', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $ret_id = $this->objNews->saveNews($sqlval); + + $this->actual['count'] = $objQuery->count('dtb_news'); + $result = $objQuery->select( + 'news_id, news_title, creator_id, del_flg', + 'dtb_news', + 'news_id = ?', + array($ret_id)); + $this->actual['content'] = $result[0]; + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getNewsTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getNewsTest.php (revision 22722) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_News/SC_Helper_News_getNewsTest.php (revision 22722) @@ -0,0 +1,54 @@ +objNews = new SC_Helper_News_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testGet_存在しないニュースIDを指定した場合_結果が空になる() + { + $this->setUpNews(); + $news_id = '9999'; + + $this->expected = null; + + $this->actual = $this->objNews->getNews($news_id); + + $this->verify(); + } + + public function testGet_存在するニュースIDを指定した場合_対応する結果が取得できる() + { + $this->setUpNews(); + $news_id = '1001'; + + $this->expected = array( + 'update_date' => '2000-01-01 00:00:00', + 'news_id' => '1001', + 'news_title' => 'ニュース情報01', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $result = $this->objNews->getNews($news_id); + $this->actual = Test_Utils::mapArray($result, array('update_date', 'news_id', 'news_title', 'creator_id', 'del_flg')); + + $this->verify(); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php (revision 22721) @@ -0,0 +1,65 @@ + '1000', + 'kiyaku_title' => 'test1', + 'kiyaku_text' => 'test_text', + 'rank' => '12', + 'creator_id' => '0', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ), + array( + 'kiyaku_id' => '1001', + 'kiyaku_title' => 'test2', + 'kiyaku_text' => 'test_text2', + 'rank' => '11', + 'creator_id' => '0', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ), + array( + 'kiyaku_id' => '1002', + 'kiyaku_title' => 'test3', + 'kiyaku_text' => 'test_text', + 'rank' => '10', + 'creator_id' => '0', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '1' + ) + ); + + $this->objQuery->delete('dtb_kiyaku'); + foreach ($kiyaku as $key => $item) { + $ret = $objQuery->insert('dtb_kiyaku', $item); + } + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_isTitleExistTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_isTitleExistTest.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_isTitleExistTest.php (revision 22721) @@ -0,0 +1,74 @@ +objKiyaku = new SC_Helper_Kiyaku_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testisTitleExistTest_タイトルが重複しているものがある場合_trueを返す() + { + $this->setUpKiyaku(); + $title = 'test1'; + $kiyaku_id = 1001; + + $this->expected = true; + + $this->actual = $this->objKiyaku->isTitleExist($title, $kiyaku_id); + + $this->verify('規約タイトル重複'); + } + + public function testisTitleExistTest_新規登録でタイトルが重複しているものがある場合_trueを返す() + { + $this->setUpKiyaku(); + $title = 'test1'; + + $this->expected = true; + + $this->actual = $this->objKiyaku->isTitleExist($title); + + $this->verify('規約タイトル重複'); + } + + public function testisTitleExistTest_タイトルが重複していない場合_falseを返す() + { + $this->setUpKiyaku(); + $title = 'xxxx'; + $kiyaku_id = 1001; + + $this->expected = false; + + $this->actual = $this->objKiyaku->isTitleExist($title, $kiyaku_id); + + $this->verify('規約タイトル重複'); + } + + public function testisTitleExistTest_新規登録でタイトルが重複していない場合_falseを返す() + { + $this->setUpKiyaku(); + $title = 'xxx'; + + $this->expected = false; + + $this->actual = $this->objKiyaku->isTitleExist($title); + + $this->verify('規約タイトル重複'); + } + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php (revision 22721) @@ -0,0 +1,75 @@ +objKiyaku = new SC_Helper_Kiyaku_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + + public function testgetListTest_削除した商品も含んだ一覧を取得できた場合_一覧のarrayを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $has_deleted = TRUE; + //期待値 + $this->expected = array( + array( + 'kiyaku_id' => '1000', + 'kiyaku_title' => 'test1', + 'kiyaku_text' => 'test_text' + ), + array( + 'kiyaku_id' => '1001', + 'kiyaku_title' => 'test2', + 'kiyaku_text' => 'test_text2' + ), + array( + 'kiyaku_id' => '1002', + 'kiyaku_title' => 'test3', + 'kiyaku_text' => 'test_text' + ) + ); + + $this->actual = $this->objKiyaku->getList($has_deleted); + $this->verify('規約一覧取得'); + } + + public function testgetListTest_一覧を取得できた場合削除した商品は取得しない_一覧のarrayを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $has_deleted = FALSE; + //期待値 + $this->expected = array( + array( + 'kiyaku_id' => '1000', + 'kiyaku_title' => 'test1', + 'kiyaku_text' => 'test_text' + ), + array( + 'kiyaku_id' => '1001', + 'kiyaku_title' => 'test2', + 'kiyaku_text' => 'test_text2' + ), + ); + + $this->actual = $this->objKiyaku->getList($has_deleted); + $this->verify('規約一覧取得'); + } + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php (revision 22721) @@ -0,0 +1,77 @@ +objKiyaku = new SC_Helper_Kiyaku_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testsaveKiyakuTest_新規で規約を登録する場合_1003を返す() + { + + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $this->expected = '1003'; + + $sqlval = array( + 'kiyaku_title' => '第3条 (TEST)', + 'kiyaku_text' => 'testKiyaku', + 'rank' => '', + 'creator_id' => '0', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ); + + $this->objKiyaku->saveKiyaku($sqlval); + + $col = 'kiyaku_id'; + $from = 'dtb_kiyaku'; + $where = 'kiyaku_id = ?'; + $arrWhere = array($this->expected); + $ret = $objQuery->getCol($col, $from, $where, $arrWhere); + $this->actual = $ret[0]; + $this->verify('新規規約登録'); + } + } + + public function testsaveKiyakuTest_規約を更新する場合_1001を返す() + { + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $sqlval = array( + 'kiyaku_id' => '1001', + 'kiyaku_title' => '第2条 (登録)', + 'kiyaku_text' => 'test kiyaku2', + 'rank' => '11', + 'creator_id' => '0', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ); + $this->expected = 1001; + $this->actual = $this->objKiyaku->saveKiyaku($sqlval); + + $this->verify('新規規約登録'); + } + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php (revision 22721) @@ -0,0 +1,86 @@ +objKiyaku = new SC_Helper_Kiyaku_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + + public function testgetKiyakuTest_規約情報を取得できた場合_規約のarrayを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $has_deleted = FALSE; + $kiyaku_id = 1000; + //期待値 + $this->expected = array( + 'kiyaku_id' => '1000', + 'kiyaku_title' => 'test1', + 'kiyaku_text' => 'test_text', + 'rank' => '12', + 'creator_id' => '0', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ); + + $this->actual = $this->objKiyaku->getKiyaku($kiyaku_id, $has_deleted); + $this->verify('規約詳細取得'); + } + + public function testgetKiyakuTest_規約情報を規約idから取得する際削除された規約を指定した場合_nullを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $has_deleted = FALSE; + $kiyaku_id = 1002; + //期待値 + $this->expected = null; + + $this->actual = $this->objKiyaku->getKiyaku($kiyaku_id, $has_deleted); + $this->verify('規約詳細取得'); + } + + public function testgetKiyakuTest_削除された情報を含む規約情報を規約idから取得する際削除された規約を指定した場合_nullを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $has_deleted = TRUE; + $kiyaku_id = 1002; + //期待値 + $this->expected = array( + 'kiyaku_id' => '1002', + 'kiyaku_title' => 'test3', + 'kiyaku_text' => 'test_text', + 'rank' => '10', + 'creator_id' => '0', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '1' + ); + + $this->actual = $this->objKiyaku->getKiyaku($kiyaku_id, $has_deleted); + $this->verify('規約詳細取得'); + } + + + + + + +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_deleteKiyakuTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_deleteKiyakuTest.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_deleteKiyakuTest.php (revision 22721) @@ -0,0 +1,43 @@ +objKiyaku = new SC_Helper_Kiyaku_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + + public function testdeleteKiyakuTest_削除ができた場合_del_flgの1を返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $kiyaku_id = 1001; + + //期待値 + $this->expected = "1"; + + $this->objKiyaku->deleteKiyaku($kiyaku_id); + + $col = 'del_flg'; + $from = 'dtb_kiyaku'; + $where = 'kiyaku_id = ?'; + $whereVal = array($kiyaku_id); + $res = $objQuery->getCol($col, $from, $where, $whereVal); + $this->actual = $res[0]; + $this->verify('ランク削除'); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankUpTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankUpTest.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankUpTest.php (revision 22721) @@ -0,0 +1,43 @@ +objKiyaku = new SC_Helper_Kiyaku_Ex(); + } + + protected function tearUp() + { + parent::tearUp(); + } + + ///////////////////////////////////////// + + public function testrankUpTest_ランクアップができた場合_ランクを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $kiyaku_id = 1001; + + //期待値 + $this->expected = '12'; + + $this->objKiyaku->rankUp($kiyaku_id); + + $col = 'rank'; + $from = 'dtb_kiyaku'; + $where = 'kiyaku_id = ?'; + $whereVal = array($kiyaku_id); + $res = $objQuery->getCol($col, $from, $where, $whereVal); + $this->actual = $res[0]; + $this->verify('ランクアップ'); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankDownTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankDownTest.php (revision 22721) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankDownTest.php (revision 22721) @@ -0,0 +1,43 @@ +objKiyaku = new SC_Helper_Kiyaku_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testrankDownTest_ランクダウンができた場合_ランクを返す() + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $this->setUpKiyaku(); + $kiyaku_id = 1000; + + //期待値 + $this->expected = '11'; + + $this->objKiyaku->rankDown($kiyaku_id); + + $col = 'rank'; + $from = 'dtb_kiyaku'; + $where = 'kiyaku_id = ?'; + $whereVal = array($kiyaku_id); + $res = $objQuery->getCol($col, $from, $where, $whereVal); + $this->actual = $res[0]; + $this->verify('ランクダウン'); + } +} Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php (revision 22727) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php (revision 22727) @@ -0,0 +1,101 @@ + '1001', + 'name' => 'ソニン', + 'rank' => '1', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ), + array( + 'maker_id' => '1002', + 'name' => 'パソナニック', + 'rank' => '2', + 'creator_id' => '2', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '1' + ), + array( + 'maker_id' => '1003', + 'name' => 'シャンプー', + 'rank' => '3', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ), + array( + 'maker_id' => '1004', + 'name' => 'MEC', + 'rank' => '4', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ) + ); + + $this->objQuery->delete('dtb_maker'); + foreach ($makers as $item) { + $this->objQuery->insert('dtb_maker', $item); + } + } + + protected function deleteAllMaker(){ + $this->objQuery->delete('dtb_maker'); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php (revision 22727) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php (revision 22727) @@ -0,0 +1,130 @@ +setUpMaker(); + $this->objHelperMaker = new SC_Helper_Maker_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + public function testGetByName_メーカー名が存在しない場合_空を返す() + { + $this->expected = null; + + $this->actual = $this->objHelperMaker->getByName("ソニ"); + + $this->verify(); + } + + // maker_idが存在する場合、対応した結果を取得できる。 + public function testGetByName_メーカー名が存在する場合_対応した結果を取得できる(){ + + + $this->expected = array( + 'maker_id' => '1001', + 'name' => 'ソニン', + 'rank' => '1', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ); + + $result = $this->objHelperMaker->getByName("ソニン"); + + $this->actual = Test_Utils::mapArray($result, + array('maker_id', + 'name', + 'rank', + 'creator_id', + 'create_date', + 'update_date', + 'del_flg' + )); + + $this->verify(); + + } + + + public function testGetByName_おすすめIDがあり_かつ削除済みの場合_空が返る(){ + + $this->expected = null; + + $result = $this->objHelperMaker->getMaker("1002"); + + $this->verify(); + + } + + // best_idが存在するが、del_flg=1の場合、かつ。$has_deleted=trueを指定 + public function testGetByName_削除済みでかつhas_deletedがtrueの場合_対応した結果が返る(){ + + $best_id = '1002'; + + + $this->expected = array( + 'maker_id' => '1002', + 'name' => 'パソナニック', + 'rank' => '2', + 'creator_id' => '2', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '1' + ); + + $result = $this->objHelperMaker->getMaker("1002",true); + + $this->actual = Test_Utils::mapArray($result, + array('maker_id', + 'name', + 'rank', + 'creator_id', + 'create_date', + 'update_date', + 'del_flg' + )); + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getListTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getListTest.php (revision 22727) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getListTest.php (revision 22727) @@ -0,0 +1,113 @@ +objHelperMaker = new SC_Helper_Maker_Ex(); + $this->setUpMaker(); + + + } + + protected function tearDown() + { + parent::tearDown(); + } + + /**　rankが存在しない場合、空を返す。 + */ + public function testGetList_存在しない場合空を返す() + { + + $this->deleteAllMaker(); + + $this->expected = array(); + $this->actual = $this->objHelperMaker->getList(); + + $this->verify(); + } + + public function testGetList_データがある場合_想定した結果が返る(){ + + $this->expected = array( + array( + 'maker_id' => '1004', + 'name' => 'MEC' + ), + array( + 'maker_id' => '1003', + 'name' => 'シャンプー' + ), + array( + 'maker_id' => '1001', + 'name' => 'ソニン' + ) + ); + + $this->actual = $this->objHelperMaker->getList(); + $this->verify(); + + } + + public function testGetList_一覧取得has_deleteをtrueにした場合削除済みデータも取得(){ + + $this->expected = array( + array( + 'maker_id' => '1004', + 'name' => 'MEC' + ), + array( + 'maker_id' => '1003', + 'name' => 'シャンプー' + ), + array( + 'maker_id' => '1002', + 'name' => 'パソナニック' + ), + array( + 'maker_id' => '1001', + 'name' => 'ソニン' + ) + ); + + $this->actual = $this->objHelperMaker->getList(true); + $this->verify(); + + } + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php (revision 22727) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php (revision 22727) @@ -0,0 +1,111 @@ +setUpMaker(); + $this->objHelperMaker = new SC_Helper_Maker_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + + + public function testSaveMaker_メーカーIDを指定すると更新される(){ + //public function testSaveMaker_update(){ + $sqlVal = array( + 'maker_id' => '1001', + 'name' => 'ソニンー', + ); + + $this->objHelperMaker->saveMaker($sqlVal); + + $this->expected = array( + 'name' => 'ソニンー', + ); + + $arrRet = $this->objHelperMaker->getMaker('1001'); + + $this->actual = Test_Utils::mapArray($arrRet, + array('name') + ); + + $this->verify(); + } + + + + public function testSaveMaker_メーカーIDがない場合_インサートされる(){ + //public function testSaveMaker_insert(){ + + if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避 + $sqlVal = array( + 'name' => 'フジスリー', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $maker_id = $this->objHelperMaker->saveMaker($sqlVal); + + + $this->expected = array( + 'name' => 'フジスリー', + 'rank' => '5', + 'creator_id' => '1', + 'del_flg' => '0' + ); + + $arrRet = $this->objHelperMaker->getMaker($maker_id); + + $this->actual = Test_Utils::mapArray($arrRet, + array( + 'name', + 'rank', + 'creator_id', + 'del_flg' + ) + ); + + $this->verify(); + } + + } + +} + Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php (revision 22727) +++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php (revision 22727) @@ -0,0 +1,132 @@ +setUpMaker(); + $this->objHelperMaker = new SC_Helper_Maker_Ex(); + } + + protected function tearDown() + { + parent::tearDown(); + } + + /** maker_idが存在しない場合、空を返す。 + */ + public function testGetMaker_おすすめidが存在しない場合_空を返す() + { + $this->expected = null; + + $this->actual = $this->objHelperMaker->getMaker("9999"); + + $this->verify(); + } + + // maker_idが存在する場合、対応した結果を取得できる。 + public function testGetMaker_メーカーIDが存在する場合_対応した結果を取得できる(){ + + + $this->expected = array( + 'maker_id' => '1001', + 'name' => 'ソニン', + 'rank' => '1', + 'creator_id' => '1', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '0' + ); + + $result = $this->objHelperMaker->getMaker("1001"); + + $this->actual = Test_Utils::mapArray($result, + array('maker_id', + 'name', + 'rank', + 'creator_id', + 'create_date', + 'update_date', + 'del_flg' + )); + + $this->verify(); + + } + + + public function testGetMaker_おすすめIDがあり_かつ削除済みの場合_空が返る(){ + + $this->expected = null; + + $result = $this->objHelperMaker->getMaker("1002"); + + $this->verify(); + + } + + // best_idが存在するが、del_flg=1の場合、かつ。$has_deleted=trueを指定 + public function testGetMaker_削除済みでかつhas_deletedがtrueの場合_対応した結果が返る(){ + + $best_id = '1002'; + + + $this->expected = array( + 'maker_id' => '1002', + 'name' => 'パソナニック', + 'rank' => '2', + 'creator_id' => '2', + 'create_date' => '2000-01-01 00:00:00', + 'update_date' => '2000-01-01 00:00:00', + 'del_flg' => '1' + ); + + $result = $this->objHelperMaker->getMaker("1002",true); + + $this->actual = Test_Utils::mapArray($result, + array('maker_id', + 'name', + 'rank', + 'creator_id', + 'create_date', + 'update_date', + 'del_flg' + )); + + $this->verify(); + } +} + Index: /branches/version-2_13-dev/tests/class/SC_Date/SC_Date_isHolidayTest.php =================================================================== --- /branches/version-2_13-dev/tests/class/SC_Date/SC_Date_isHolidayTest.php (revision 22735) +++ /branches/version-2_13-dev/tests/class/SC_Date/SC_Date_isHolidayTest.php (revision 22735) @@ -0,0 +1,131 @@ +objDate = new SC_Date_Ex(); + $objQuery = SC_Query_Ex::getSingletonInstance(); + //休日を登録 + $holiday = array( + array( + 'holiday_id' => '1', + 'title' => 'TEST HOLIDAY1', + 'month' => '2', + 'day' => '14', + 'rank' => '1', + 'creator_id' => '1', + 'create_date' => '2013-02-14 11:22:33', + 'update_date' => '2013-02-14 22:11:33', + 'del_flg' => '0' + ), + array( + 'holiday_id' => '2', + 'title' => 'TEST HOLIDAY2', + 'month' => '3', + 'day' => '26', + 'rank' => '2', + 'creator_id' => '1', + 'create_date' => '2013-02-15 11:22:33', + 'update_date' => '2013-02-16 22:11:33', + 'del_flg' => '0' + ) + ); + //休みの曜日を登録 + $baseInfo = array( + 'id' => '1', + 'regular_holiday_ids' => '0|6', // 土日を休みに登録 + 'update_date' => '2013-02-14 22:11:33' + ); + + $objQuery->delete('dtb_holiday'); + $objQuery->delete('dtb_baseinfo'); + foreach ($holiday as $key => $item) { + $objQuery->insert('dtb_holiday', $item); + } + $objQuery->insert('dtb_baseinfo', $baseInfo); + } + + protected function tearDown() + { + parent::tearDown(); + } + + ///////////////////////////////////////// + + public function testIsHoliday_日付が登録されている休日の場合_TRUEを返す() + { + + $this->expected = true; + $year = 2013; + $month = 2; + $day = 14; + $this->actual = $this->objDate->isHoliday($year, $month, $day); + + $this->verify("登録された休日"); + } + + public function testIsHoliday_日付が休日ではない場合_FALSEを返す() + { + + $this->expected = false; + $year = 2013; + $month = 1; + $day = 23; + $this->actual = $this->objDate->isHoliday($year, $month, $day); + + $this->verify("休日ではない"); + } + + public function testIsHoliday_休みの曜日の場合_trueを返す() + { + + $this->expected = true; + $year = 2013; + $month = 3; + $day = 10; + $this->actual = $this->objDate->isHoliday($year, $month, $day); + + $this->verify("休みの曜日"); + } + + public function testIsHoliday_休みの曜日でない場合_falseを返す() + { + + $this->expected = false; + $year = 2013; + $month = 3; + $day = 11; + $this->actual = $this->objDate->isHoliday($year, $month, $day); + + $this->verify("休みの曜日"); + } + +} + Index: /branches/version-2_13-dev/data/class_extends/helper_extends/SC_Helper_BestProducts_Ex.php =================================================================== --- /branches/version-2_13-dev/data/class_extends/helper_extends/SC_Helper_BestProducts_Ex.php (revision 22735) +++ /branches/version-2_13-dev/data/class_extends/helper_extends/SC_Helper_BestProducts_Ex.php (revision 22735) @@ -0,0 +1,39 @@ +get($sqlval['bloc_id']); + $arrExists = $this->getBloc($sqlval['bloc_id']); // 既存のファイルが存在する場合は削除しておく Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_BestProducts.php =================================================================== --- /branches/version-2_13-dev/data/class/helper/SC_Helper_BestProducts.php (revision 22735) +++ /branches/version-2_13-dev/data/class/helper/SC_Helper_BestProducts.php (revision 22735) @@ -0,0 +1,186 @@ +select($col, 'dtb_best_products', $where, array($best_id)); + return $arrRet[0]; + } + + /** + * おすすめ商品の情報をランクから取得. + * + * @param integer $rank ランク + * @param boolean $has_deleted 削除されたおすすめ商品も含む場合 true; 初期値 false + * @return array + */ + public function getByRank($rank, $has_deleted = false) + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $col = '*'; + $where = 'rank = ?'; + if (!$has_deleted) { + $where .= ' AND del_flg = 0'; + } + $arrRet = $objQuery->select($col, 'dtb_best_products', $where, array($rank)); + return $arrRet[0]; + } + + /** + * おすすめ商品一覧の取得. + * + * @param integer $dispNumber 表示件数 + * @param integer $pageNumber ページ番号 + * @param boolean $has_deleted 削除されたおすすめ商品も含む場合 true; 初期値 false + * @return array + */ + public function getList($dispNumber = 0, $pageNumber = 0, $has_deleted = false) + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + $col = '*'; + $where = ''; + if (!$has_deleted) { + $where .= 'del_flg = 0'; + } + $table = 'dtb_best_products'; + $objQuery->setOrder('rank'); + if ($dispNumber > 0) { + if ($pageNumber > 0) { + $objQuery->setLimitOffset($dispNumber, (($pageNumber - 1) * $dispNumber)); + } else { + $objQuery->setLimit($dispNumber); + } + } + $arrRet = $objQuery->select($col, $table, $where); + return $arrRet; + } + + /** + * おすすめ商品の登録. + * + * @param array $sqlval + * @return multiple 登録成功:おすすめ商品ID, 失敗:FALSE + */ + public function saveBestProducts($sqlval) + { + $objQuery =& SC_Query_Ex::getSingletonInstance(); + + $best_id = $sqlval['best_id']; + $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; + // 新規登録 + if ($best_id == '') { + // INSERTの実行 + if (!$sqlval['rank']) { + $sqlval['rank'] = $objQuery->max('rank', 'dtb_best_products') + 1; + } + $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; + $sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id'); + $ret = $objQuery->insert('dtb_best_products', $sqlval); + // 既存編集 + } else { + unset($sqlval['creator_id']); + unset($sqlval['create_date']); + $where = 'best_id = ?'; + $ret = $objQuery->update('dtb_best_products', $sqlval, $where, array($best_id)); + } + return ($ret) ? $sqlval['best_id'] : FALSE; + } + + /** + * おすすめ商品の削除. + * + * @param integer $best_id おすすめ商品ID + * @return void + */ + public function deleteBestProducts($best_id) + { + $objDb = new SC_Helper_DB_Ex(); + // ランク付きレコードの削除 + $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $best_id,'', TRUE); + } + + /** + * 商品IDの配列からおすすめ商品を削除. + * + * @param array $productIDs 商品ID + * @return void + */ + public function deleteByProductIDs($productIDs) + { + $objDb = new SC_Helper_DB_Ex(); + $arrList = $this->getList(); + foreach ($arrList as $recommend) { + if (in_array($recommend['product_id'], $productIDs)) { + $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $recommend['best_id'],'', TRUE); + } + } + } + + /** + * おすすめ商品の表示順をひとつ上げる. + * + * @param integer $best_id おすすめ商品ID + * @return void + */ + public function rankUp($best_id) + { + $objDb = new SC_Helper_DB_Ex(); + //おすすめはデータベースの登録が昇順なので、Modeを逆にする。 + $objDb->sfRankDown('dtb_best_products', 'best_id', $best_id); + } + + /** + * おすすめ商品の表示順をひとつ下げる. + * + * @param integer $best_id おすすめ商品ID + * @return void + */ + public function rankDown($best_id) + { + $objDb = new SC_Helper_DB_Ex(); + //おすすめはデータベースの登録が昇順なので、Modeを逆にする。 + $objDb->sfRankUp('dtb_best_products', 'best_id', $best_id); + } +} Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php =================================================================== --- /branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php (revision 22595) +++ /branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php (revision 22735) @@ -56,5 +56,5 @@ * カラムの生成も行う場合は, $col_type も必須となる. * - * @param string $table_name テーブル名 + * @param string $$tableName テーブル名 * @param string $column_name カラム名 * @param string $col_type カラムのデータ型 @@ -65,5 +65,5 @@ * 引数 $add == false でカラムが存在しない場合 false */ - function sfColumnExists($table_name, $col_name, $col_type = '', $dsn = '', $add = false) + function sfColumnExists($tableName, $colName, $colType = '', $dsn = '', $add = false) { $dbFactory = SC_DB_DBFactory_Ex::getInstance(); @@ -73,12 +73,12 @@ // テーブルが無ければエラー - if (!in_array($table_name, $objQuery->listTables())) return false; + if (!in_array($tableName, $objQuery->listTables())) return false; // 正常に接続されている場合 if (!$objQuery->isError()) { // カラムリストを取得 - $columns = $objQuery->listTableFields($table_name); - - if (in_array($col_name, $columns)) { + $columns = $objQuery->listTableFields($tableName); + + if (in_array($colName, $columns)) { return true; } @@ -87,22 +87,24 @@ // カラムを追加する if ($add) { - $objQuery->query("ALTER TABLE $table_name ADD $col_name $col_type "); - return true; + return $this->sfColumnAdd($tableName, $colName, $colType); } return false; } + + function sfColumnAdd($tableName, $colName, $colType) { + $objQuery =& SC_Query_Ex::getSingletonInstance($dsn); + return $objQuery->query("ALTER TABLE $tableName ADD $colName $colType "); + } /** * データの存在チェックを行う. * - * @param string $table_name テーブル名 + * @param string $tableName テーブル名 * @param string $where データを検索する WHERE 句 - * @param string $dsn データソース名 - * @param string $sql @deprecated データの追加を行う場合の SQL文 - * @param bool $add @deprecated データの追加も行う場合 true + * @param array $arrWhereVal WHERE句のプレースホルダ値 * @return bool データが存在する場合 true, データの追加に成功した場合 true, * $add == false で, データが存在しない場合 false */ - function sfDataExists($table_name, $where, $arrWhereVal, $dsn = '', $sql = '', $add = false) + function sfDataExists($tableName, $where, $arrWhereVal) { $dbFactory = SC_DB_DBFactory_Ex::getInstance(); @@ -110,13 +112,9 @@ $objQuery =& SC_Query_Ex::getSingletonInstance(); - $exists = $objQuery->exists($table_name, $where, $arrWhereVal); + $exists = $objQuery->exists($tableName, $where, $arrWhereVal); // データが存在する場合 TRUE if ($exists) { return TRUE; - // $add が TRUE の場合はデータを追加する - } elseif ($add) { - return $objQuery->exec($sql); - // $add が FALSE で、データが存在しない場合 FALSE } else { return FALSE; @@ -1160,48 +1158,20 @@ $getWhere = "$keyIdColumn = ?"; } - $rank = $objQuery->get('rank', $tableName, $getWhere, array($keyId)); + $oldRank = $objQuery->get('rank', $tableName, $getWhere, array($keyId)); $max = $objQuery->max('rank', $tableName, $where); - - // 値の調整（逆順） - if ($pos > $max) { - $position = 1; - } else if ($pos < 1) { - $position = $max; - } else { - $position = $max - $pos + 1; - } - - //入れ替え先の順位が入れ換え元の順位より大きい場合 - if ($position > $rank) $term = 'rank - 1'; - - //入れ替え先の順位が入れ換え元の順位より小さい場合 - if ($position < $rank) $term = 'rank + 1'; - - // XXX 入れ替え先の順位が入れ替え元の順位と同じ場合 - if (!isset($term)) $term = 'rank'; - - // 指定した順位の商品から移動させる商品までのrankを１つずらす - $sqlval = array(); - $arrRawSql = array( - 'rank' => $term, - ); - $str_where = 'rank BETWEEN ? AND ?'; - if ($where != '') { - $str_where .= " AND $where"; - } - - if ($position > $rank) { - $arrWhereVal = array($rank + 1, $position); - $objQuery->update($tableName, $sqlval, $str_where, $arrWhereVal, $arrRawSql); - } - if ($position < $rank) { - $arrWhereVal = array($position, $rank - 1); - $objQuery->update($tableName, $sqlval, $str_where, $arrWhereVal, $arrRawSql); + + // 更新するランク値を取得 + $newRank = $this->getNewRank($pos, $max); + // 他のItemのランクを調整する + $ret = $this->moveOtherItemRank($newRank, $oldRank, $objQuery, $tableName, $where); + if (!$ret) { + // 他のランク変更がなければ処理を行わない + return; } // 指定した順位へrankを書き換える。 $sqlval = array( - 'rank' => $position, + 'rank' => $newRank, ); $str_where = "$keyIdColumn = ?"; @@ -1214,4 +1184,60 @@ $objQuery->commit(); } + + /** + * 指定された位置の値をDB用のRANK値に変換する + * 指定位置が1番目に移動なら、newRankは最大値 + * 指定位置が1番下へ移動なら、newRankは1 + * + * @param int $position 指定された位置 + * @param int $maxRank 現在のランク最大値 + * @return int $newRank DBに登録するRANK値 + */ + function getNewRank($position, $maxRank) { + + if ($position > $maxRank) { + $newRank = 1; + } else if ($position < 1) { + $newRank = $maxRank; + } else { + $newRank = $maxRank - $position + 1; + } + return $newRank; + } + + /** + * 指定した順位の商品から移動させる商品までのrankを１つずらす + * + * @param int $newRank + * @param int $oldRank + * @param object $objQuery + * @param string $where + * @return boolean + */ + function moveOtherItemRank($newRank, $oldRank, &$objQuery, $tableName, $addWhere) { + + $sqlval = array(); + $arrRawSql = array(); + $where = 'rank BETWEEN ? AND ?'; + if ($addWhere != '') { + $where .= " AND $Where"; + } + if ($newRank > $oldRank) { + //位置を上げる場合、他の商品の位置を1つ下げる（ランクを1下げる） + $arrRawSql['rank'] = 'rank - 1'; + $arrWhereVal = array($oldRank + 1, $newRank); + } else if ($newRank < $oldRank) { + //位置を下げる場合、他の商品の位置を1つ上げる（ランクを1上げる） + $arrRawSql['rank'] = 'rank + 1'; + $arrWhereVal = array($newRank, $oldRank - 1); + } else { + //入れ替え先の順位が入れ替え元の順位と同じ場合なにもしない + return false; + } + + return $objQuery->update($tableName, $sqlval, $where, $arrWhereVal, $arrRawSql); + + } + /** Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_Kiyaku.php =================================================================== --- /branches/version-2_13-dev/data/class/helper/SC_Helper_Kiyaku.php (revision 22570) +++ /branches/version-2_13-dev/data/class/helper/SC_Helper_Kiyaku.php (revision 22735) @@ -38,5 +38,5 @@ * @return array */ - public function get($kiyaku_id, $has_deleted = false) + public function getKiyaku($kiyaku_id, $has_deleted = false) { $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -75,5 +75,5 @@ * @return multiple 登録成功:会員規約ID, 失敗:FALSE */ - public function save($sqlval) + public function saveKiyaku($sqlval) { $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -104,5 +104,5 @@ * @return void */ - public function delete($kiyaku_id) + public function deleteKiyaku($kiyaku_id) { $objDb = new SC_Helper_DB_Ex(); Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_Maker.php =================================================================== --- /branches/version-2_13-dev/data/class/helper/SC_Helper_Maker.php (revision 22578) +++ /branches/version-2_13-dev/data/class/helper/SC_Helper_Maker.php (revision 22735) @@ -38,5 +38,5 @@ * @return array */ - public function get($maker_id, $has_deleted = false) + public function getMaker($maker_id, $has_deleted = false) { $objQuery =& SC_Query_Ex::getSingletonInstance(); @@ -93,5 +93,5 @@ * @return multiple 登録成功:メーカーID, 失敗:FALSE */ - public function save($sqlval) + public function saveMaker($sqlval) { $objQuery =& SC_Query_Ex::getSingletonInstance(); Index: anches/version-2_13-dev/data/class/helper/SC_Helper_Recommend.php =================================================================== --- /branches/version-2_13-dev/data/class/helper/SC_Helper_Recommend.php (revision 22582) +++ (revision ) @@ -1,186 +1,0 @@ -select($col, 'dtb_best_products', $where, array($best_id)); - return $arrRet[0]; - } - - /** - * おすすめ商品の情報をランクから取得. - * - * @param integer $rank ランク - * @param boolean $has_deleted 削除されたおすすめ商品も含む場合 true; 初期値 false - * @return array - */ - public function getByRank($rank, $has_deleted = false) - { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = '*'; - $where = 'rank = ?'; - if (!$has_deleted) { - $where .= ' AND del_flg = 0'; - } - $arrRet = $objQuery->select($col, 'dtb_best_products', $where, array($rank)); - return $arrRet[0]; - } - - /** - * おすすめ商品一覧の取得. - * - * @param integer $dispNumber 表示件数 - * @param integer $pageNumber ページ番号 - * @param boolean $has_deleted 削除されたおすすめ商品も含む場合 true; 初期値 false - * @return array - */ - public function getList($dispNumber = 0, $pageNumber = 0, $has_deleted = false) - { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - $col = '*'; - $where = ''; - if (!$has_deleted) { - $where .= 'del_flg = 0'; - } - $table = 'dtb_best_products'; - $objQuery->setOrder('rank'); - if ($dispNumber > 0) { - if ($pageNumber > 0) { - $objQuery->setLimitOffset($dispNumber, (($pageNumber - 1) * $dispNumber)); - } else { - $objQuery->setLimit($dispNumber); - } - } - $arrRet = $objQuery->select($col, $table, $where); - return $arrRet; - } - - /** - * おすすめ商品の登録. - * - * @param array $sqlval - * @return multiple 登録成功:おすすめ商品ID, 失敗:FALSE - */ - public function save($sqlval) - { - $objQuery =& SC_Query_Ex::getSingletonInstance(); - - $best_id = $sqlval['best_id']; - $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; - // 新規登録 - if ($best_id == '') { - // INSERTの実行 - if (!$sqlval['rank']) { - $sqlval['rank'] = $objQuery->max('rank', 'dtb_best_products') + 1; - } - $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; - $sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id'); - $ret = $objQuery->insert('dtb_best_products', $sqlval); - // 既存編集 - } else { - unset($sqlval['creator_id']); - unset($sqlval['create_date']); - $where = 'best_id = ?'; - $ret = $objQuery->update('dtb_best_products', $sqlval, $where, array($best_id)); - } - return ($ret) ? $sqlval['best_id'] : FALSE; - } - - /** - * おすすめ商品の削除. - * - * @param integer $best_id おすすめ商品ID - * @return void - */ - public function delete($best_id) - { - $objDb = new SC_Helper_DB_Ex(); - // ランク付きレコードの削除 - $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $best_id, TRUE); - } - - /** - * 商品IDの配列からおすすめ商品を削除. - * - * @param array $productIDs 商品ID - * @return void - */ - public function deleteByProductIDs($productIDs) - { - $objDb = new SC_Helper_DB_Ex(); - $arrList = $this->getList(); - foreach ($arrList as $recommend) { - if (in_array($recommend['product_id'], $productIDs)) { - $objDb->sfDeleteRankRecord('dtb_best_products', 'best_id', $recommend['best_id'], TRUE); - } - } - } - - /** - * おすすめ商品の表示順をひとつ上げる. - * - * @param integer $best_id おすすめ商品ID - * @return void - */ - public function rankUp($best_id) - { - $objDb = new SC_Helper_DB_Ex(); - //おすすめはデータベースの登録が昇順なので、Modeを逆にする。 - $objDb->sfRankDown('dtb_best_products', 'best_id', $best_id); - } - - /** - * おすすめ商品の表示順をひとつ下げる. - * - * @param integer $best_id おすすめ商品ID - * @return void - */ - public function rankDown($best_id) - { - $objDb = new SC_Helper_DB_Ex(); - //おすすめはデータベースの登録が昇順なので、Modeを逆にする。 - $objDb->sfRankUp('dtb_best_products', 'best_id', $best_id); - } -} Index: /branches/version-2_13-dev/data/class/SC_Date.php =================================================================== --- /branches/version-2_13-dev/data/class/SC_Date.php (revision 22576) +++ /branches/version-2_13-dev/data/class/SC_Date.php (revision 22735) @@ -199,6 +199,6 @@ public function isHoliday($year, $month, $day) { - is_null(SC_Date_Ex::$arrHoliday) and $this->setArrHoliday(); - is_null(SC_Date_Ex::$arrRegularHoliday) and $this->setRegularHoliday(); + if (is_null(SC_Date_Ex::$arrHoliday)) $this->setArrHoliday(); + if (is_null(SC_Date_Ex::$arrRegularHoliday)) $this->setRegularHoliday(); if (!empty(SC_Date_Ex::$arrHoliday[$month])) { Index: /branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 22581) +++ /branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 22735) @@ -116,5 +116,5 @@ case 'pre_edit': - $news = $objNews->get($news_id); + $news = $objNews->getNews($news_id); list($news['year'],$news['month'],$news['day']) = $this->splitNewsDate($news['cast_news_date']); $objFormParam->setParam($news); @@ -126,5 +126,5 @@ case 'delete': //----　データ削除 - $objNews->delete($news_id); + $objNews->deleteNews($news_id); //自分にリダイレクト（再読込による誤動作防止） SC_Response_Ex::reload(); @@ -219,5 +219,5 @@ $sqlval['news_date'] = $this->getRegistDate($sqlval); unset($sqlval['year'], $sqlval['month'], $sqlval['day']); - return $objNews->save($sqlval); + return $objNews->saveNews($sqlval); } Index: /branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 22582) +++ /branches/version-2_13-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 22735) @@ -79,5 +79,5 @@ $arrPost = $objFormParam->getHashArray(); - $objRecommend = new SC_Helper_Recommend_Ex(); + $objRecommend = new SC_Helper_BestProducts_Ex(); switch ($this->getMode()) { @@ -175,5 +175,5 @@ * @return Array $arrReturnProducts データベースに登録されているおすすめ商品の配列 */ - function getRecommendProducts(SC_Helper_Recommend_Ex &$objRecommend) + function getRecommendProducts(SC_Helper_BestProducts_Ex &$objRecommend) { $arrList = $objRecommend->getList(); @@ -203,5 +203,5 @@ * @param Object $objRecommend */ - function insertRecommendProduct($arrPost,$member_id, SC_Helper_Recommend_Ex &$objRecommend) + function insertRecommendProduct($arrPost,$member_id, SC_Helper_BestProducts_Ex &$objRecommend) { // 古いおすすめ商品のデータを削除する。 @@ -214,5 +214,5 @@ $sqlval['comment'] = $arrPost['comment']; $sqlval['creator_id'] = $member_id; - $objRecommend->save($sqlval); + $objRecommend->saveBestProducts($sqlval); } @@ -223,5 +223,5 @@ * @return void */ - function deleteProduct($arrPost, SC_Helper_Recommend_Ex &$objRecommend) + function deleteProduct($arrPost, SC_Helper_BestProducts_Ex &$objRecommend) { if ($arrPost['best_id']) { @@ -231,5 +231,5 @@ $target = $recommend['best_id']; } - $objRecommend->delete($target); + $objRecommend->deleteBestProducts($target); } Index: /branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 22570) +++ /branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 22735) @@ -110,5 +110,5 @@ // 削除 case 'delete': - $objKiyaku->delete($kiyaku_id); + $objKiyaku->deleteKiyaku($kiyaku_id); break; @@ -116,5 +116,5 @@ case 'pre_edit': // 編集項目を取得する。 - $arrKiyakuData = $objKiyaku->get($kiyaku_id); + $arrKiyakuData = $objKiyaku->getKiyaku($kiyaku_id); $objFormParam->setParam($arrKiyakuData); @@ -169,5 +169,5 @@ $sqlval['kiyaku_id'] = $kiyaku_id; $sqlval['creator_id'] = $_SESSION['member_id']; - return $objKiyaku->save($sqlval); + return $objKiyaku->saveKiyaku($sqlval); } Index: /branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 22578) +++ /branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 22735) @@ -116,5 +116,5 @@ // 編集前処理 case 'pre_edit': - $maker = $objMaker->get($maker_id); + $maker = $objMaker->getMaker($maker_id); $objFormParam->setParam($maker); @@ -190,5 +190,5 @@ $sqlval['maker_id'] = $maker_id; $sqlval['creator_id'] = $_SESSION['member_id']; - return $objMaker->save($sqlval); + return $objMaker->saveMaker($sqlval); } @@ -208,5 +208,5 @@ if (!SC_Utils_Ex::sfIsInt($arrForm['maker_id']) || SC_Utils_Ex::sfIsZeroFilling($arrForm['maker_id']) - || !$objMaker->get($arrForm['maker_id']) + || !$objMaker->getMaker($arrForm['maker_id']) ) { // maker_idが指定されていて、且つその値が不正と思われる場合はエラー Index: /branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 22582) +++ /branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 22735) @@ -277,5 +277,5 @@ $objQuery->delete('dtb_customer_favorite_products', "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam); - $objRecomment = new SC_Helper_Recommend_Ex(); + $objRecomment = new SC_Helper_BestProducts_Ex(); $objRecomment->deleteByProductIDs($product_ids); Index: /branches/version-2_13-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (revision 22582) +++ /branches/version-2_13-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (revision 22735) @@ -94,5 +94,5 @@ function lfGetRanking() { - $objRecommend = new SC_Helper_Recommend_Ex(); + $objRecommend = new SC_Helper_BestProducts_Ex(); // おすすめ商品取得 Index: /branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php (revision 22730) +++ /branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php (revision 22735) @@ -317,5 +317,5 @@ if (strlen($arrSearchData['maker_id']) > 0) { $objMaker = new SC_Helper_Maker_Ex(); - $maker = $objMaker->get($arrSearchData['maker_id']); + $maker = $objMaker->getMaker($arrSearchData['maker_id']); $arrSearch['maker'] = $maker['name']; }