Ignore:
Timestamp:
2010/07/26 17:16:59 (16 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18762
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/class/SC_DbConn.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_DbConn.php
html/define.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fdefine.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
test/README.txt 18218@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Ftest%2FREADME.txt
test/TestSuite.php 15114@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2FTestSuite.php
test/class/SC_DbConn_Test.php 18387@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Ftest%2Fclass%2FSC_DbConn_Test.php
test/class/db/DB_AllTests.php 18218@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Ftest%2Fclass%2Fdb%2FDB_AllTests.php
test/class/db/SC_DB_DBFactory_Test.php 15242@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2Fclass%2Fdb%2FSC_DB_DBFactory_Test.php
test/class/db/SC_DB_MasterData_Test.php 15134@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2Fclass%2Fdb%2FSC_DB_MasterData_Test.php
test/class/helper/Helper_AllTests.php 18218@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Ftest%2Fclass%2Fhelper%2FHelper_AllTests.php
test/class/helper/SC_Helper_DB_Test.php 15242@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2Fclass%2Fhelper%2FSC_Helper_DB_Test.php
test/class/logger/GC_Log_Log4php_Test.php 18220@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Ftest%2Fclass%2Flogger%2FGC_Log_Log4php_Test.php
test/class/logger/GC_Logger_Test.php 18220@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Ftest%2Fclass%2Flogger%2FGC_Logger_Test.php
test/class/page/LC_Page_Test.php 15114@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2Fclass%2Fpage%2FLC_Page_Test.php
test/class/page/Page_AllTests.php 18218@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Ftest%2Fclass%2Fpage%2FPage_AllTests.php
test/require.php require.php-20100726065552-t2b4u96mp8ikqvjf-1
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
2246
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-parents:

data/class/SC_DbConn.php [email protected]
html/define.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18653
html/install/index.php [email protected]
test/README.txt svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18218
test/TestSuite.php [email protected]
test/class/SC_DbConn_Test.php [email protected]
test/class/db/DB_AllTests.php [email protected]
test/class/db/SC_DB_DBFactory_Test.php [email protected]
test/class/db/SC_DB_MasterData_Test.php [email protected]
test/class/helper/Helper_AllTests.php [email protected]
test/class/helper/SC_Helper_DB_Test.php [email protected]
test/class/logger/GC_Log_Log4php_Test.php [email protected]
test/class/logger/GC_Logger_Test.php [email protected]
test/class/page/LC_Page_Test.php [email protected]
test/class/page/Page_AllTests.php [email protected]
bzr:timestamp:
2010-07-26 17:16:55.075999975 +0900
bzr:user-agent:
bzr2.1.2+bzr-svn1.0.2
svn:original-date:
2010-07-26T08:16:55.076000Z
Message:
  • MDB2に対応(#564)
    • r18755 のパッチをマージ
    • PEAR::DB を削除
    • 暫定的にインストーラを修正
    • PHPUnit/Framework.php を直接 require するための require.php を追加
    • カレントディレクトリでのテストケース実行をサポート
    • 実装に合わせて README.txt を修正
Location:
branches/version-2_5-dev/test/class
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/test/class/SC_DbConn_Test.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once("../html/require.php"); 
    26 require_once("../data/class/SC_DbConn.php"); 
    27 require_once("PHPUnit/Framework.php"); 
     25require_once(realpath(dirname(__FILE__)) . "/../require.php"); 
     26require_once(realpath(dirname(__FILE__)) . "/../../data/class/SC_DbConn.php"); 
    2827 
    2928/** 
    … …  
    9695     * SC_DbConn::getAll() のテストケース(エラー). 
    9796     */ 
     97    /* 
    9898    function testGetAllIsError() { 
    9999 
    … …  
    106106        $this->verify(); 
    107107    } 
    108  
     108    */ 
    109109 
    110110    /** 
    … …  
    126126     * SC_DbConn::getOne() のテストケース(エラー). 
    127127     */ 
     128    /* 
    128129    function testGetOneIsError() { 
    129130        $this->createTestTable(); 
    … …  
    137138        $this->verify(); 
    138139    } 
    139  
     140    */ 
    140141 
    141142    /** 
    … …  
    150151        $this->expected = array("column1" => 1, "column2" => 1); 
    151152        $this->actual = $this->objDbConn->getRow("SELECT column1, column2 FROM test_table WHERE id = ?", array(1)); 
    152  
    153153        $this->verify(); 
    154154    } 
    … …  
    173173     * SC_DbConn::autoExecute() で INSERT を実行するテストケース. 
    174174     */ 
     175    /* 
    175176    function testAutoExecuteOfInsert() { 
    176177        $this->createTestTable(); 
    … …  
    186187        $this->verify(); 
    187188    } 
    188  
     189    */ 
    189190    /** 
    190191     * SC_DbConn::autoExecute() で UPDATE を実行するテストケース. 
    191192     */ 
     193    /* 
    192194    function testAutoExecuteOfUpdate() { 
    193195        $this->createTestTable(); 
    … …  
    207209        $this->verify(); 
    208210    } 
     211    */ 
    209212 
    210213    /** 
    … …  
    280283 
    281284    function setTestData($column1, $column2, $column3) { 
    282         $fields_values = array("column1" => $column1, 
    283                                "column2" => $column2, 
    284                                "column3" => $column3); 
    285         return $this->objDbConn->autoExecute("test_table", $fields_values); 
     285        $fields_values = array($column1, $column2, $column3); 
     286        $sql = "INSERT INTO test_table (column1, column2, column3) VALUES (?, ?, ?)"; 
     287        $result = $this->objDbConn->query($sql, $fields_values); 
     288        if (PEAR::isError($result)) { 
     289            var_dump($result); 
     290        } 
     291        return $result; 
    286292    } 
    287293} 

  • branches/version-2_5-dev/test/class/db/DB_AllTests.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once 'PHPUnit/Framework.php'; 
    2625 
    27 require_once 'SC_DB_DBFactory_Test.php'; 
    28 require_once 'SC_DB_MasterData_Test.php'; 
     26require_once(realpath(dirname(__FILE__)) . '/../../require.php'); 
     27require_once(realpath(dirname(__FILE__)) . '/SC_DB_DBFactory_Test.php'); 
     28require_once(realpath(dirname(__FILE__)) . '/SC_DB_MasterData_Test.php'); 
    2929 
    3030/** 

  • branches/version-2_5-dev/test/class/db/SC_DB_DBFactory_Test.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once("../html/require.php"); 
    26 require_once("../data/class_extends/db_extends/SC_DB_DBFactory_Ex.php"); 
    27 require_once("PHPUnit/Framework.php"); 
     25require_once(realpath(dirname(__FILE__)) . "/../../require.php"); 
     26require_once(realpath(dirname(__FILE__)) . "/../../../data/class_extends/db_extends/SC_DB_DBFactory_Ex.php"); 
    2827 
    2928/** 

  • branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once("../html/require.php"); 
    26 require_once("../data/class_extends/db_extends/SC_DB_MasterData_Ex.php"); 
    27 require_once("PHPUnit/Framework.php"); 
     25require_once(realpath(dirname(__FILE__)) . "/../../require.php"); 
     26require_once(realpath(dirname(__FILE__)) . "/../../../data/class_extends/db_extends/SC_DB_MasterData_Ex.php"); 
    2827 
    2928/** 

  • branches/version-2_5-dev/test/class/helper/Helper_AllTests.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once 'PHPUnit/Framework.php'; 
    26  
    27 require_once 'SC_Helper_DB_Test.php'; 
     25require_once(realpath(dirname(__FILE__)) . "/../../require.php"); 
     26require_once(realpath(dirname(__FILE__)) . "/SC_Helper_DB_Test.php"); 
    2827 
    2928/** 

  • branches/version-2_5-dev/test/class/helper/SC_Helper_DB_Test.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once("../html/require.php"); 
    26 require_once("../data/class_extends/helper_extends/SC_Helper_DB_Ex.php"); 
    27 require_once("PHPUnit/Framework.php"); 
     25require_once(realpath(dirname(__FILE__)) . "/../../require.php"); 
     26require_once(realpath(dirname(__FILE__)) . "/../../../data/class_extends/helper_extends/SC_Helper_DB_Ex.php"); 
    2827 
    2928/** 

  • branches/version-2_5-dev/test/class/logger/GC_Log_Log4php_Test.php

    r18701 r18763  
    2323 
    2424define('LOG4PHP_CONFIGURATION', realpath(dirname(__FILE__)) . '/conf/log4php.properties'); 
     25require_once(realpath(dirname(__FILE__)) . "/../../require.php"); 
    2526require_once(realpath(dirname(__FILE__)) . "/../../../data/class/logger/log/GC_Log_Log4php.php"); 
    26 require_once("PHPUnit/Framework.php"); 
    2727 
    2828/** 

  • branches/version-2_5-dev/test/class/logger/GC_Logger_Test.php

    r18701 r18763  
    2323 
    2424define('LOG4PHP_CONFIGURATION', realpath(dirname(__FILE__)) . '/conf/log4php.properties'); 
     25require_once(realpath(dirname(__FILE__)) . "/../../require.php"); 
    2526require_once(realpath(dirname(__FILE__)) . "/../../../data/class/logger/GC_Logger.php"); 
    26 require_once("PHPUnit/Framework.php"); 
    2727 
    2828/** 

  • branches/version-2_5-dev/test/class/page/LC_Page_Test.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once("../html/require.php"); 
    26 require_once("../data/class/pages/LC_Page.php"); 
    27 require_once("PHPUnit/Framework.php"); 
     25require_once(realpath(dirname(__FILE__)) . '/../../require.php'); 
     26require_once(realpath(dirname(__FILE__)) . '/../../../data/class/pages/LC_Page.php'); 
    2827 
    2928/** 
    … …  
    141140    function testGetLocation() { 
    142141        $objPage = new LC_Page(); 
    143         $_SERVER['DOCUMENT_ROOT'] = realpath("../html"); 
    144         $url = $objPage->getLocation("../html/abouts/index.php"); 
     142        $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html"); 
     143        $url = $objPage->getLocation("/abouts/index.php"); 
    145144 
    146145        $this->assertEquals(SITE_URL . "abouts/index.php", $url); 
    … …  
    155154    function testGetLocationWithFullPath() { 
    156155        $objPage = new LC_Page(); 
    157         $_SERVER['DOCUMENT_ROOT'] = realpath("../html"); 
     156        $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html"); 
    158157        $url = $objPage->getLocation(URL_DIR . 'abouts/index.php'); 
    159158 
    … …  
    169168    function testGetLocationWithQueryString() { 
    170169        $objPage = new LC_Page(); 
    171         $_SERVER['DOCUMENT_ROOT'] = realpath("../html"); 
     170        $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html"); 
    172171 
    173172        $queryString = array("mode" => "update", "type" => "text"); 
    174         $url = $objPage->getLocation("../html/abouts/index.php", $queryString); 
     173        $url = $objPage->getLocation("/abouts/index.php", $queryString); 
    175174 
    176175        $this->assertEquals(SITE_URL . "abouts/index.php?mode=update&type=text", $url); 
    … …  
    185184    function testGetLocationUseSSL() { 
    186185        $objPage = new LC_Page(); 
    187         $_SERVER['DOCUMENT_ROOT'] = realpath("../html"); 
     186        $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html"); 
    188187 
    189188        $queryString = array("mode" => "update", "type" => "text"); 
    190         $url = $objPage->getLocation("../html/abouts/index.php", $queryString, true); 
     189        $url = $objPage->getLocation("/abouts/index.php", $queryString, true); 
    191190 
    192191        $this->assertEquals(SSL_URL . "abouts/index.php?mode=update&type=text", $url); 
    … …  
    201200    function testGetLocationWithDocumentRoot() { 
    202201        $objPage = new LC_Page(); 
    203         $documentRoot = realpath("../html"); 
     202        $documentRoot = realpath(dirname(__FILE__) . "/../../../html"); 
    204203 
    205204        $queryString = array("mode" => "update", "type" => "text"); 
    206         $url = $objPage->getLocation("../html/abouts/index.php", array(), 
     205        $url = $objPage->getLocation("/abouts/index.php", array(), 
    207206                                     false, $documentRoot); 
    208207 

  • branches/version-2_5-dev/test/class/page/Page_AllTests.php

    r18701 r18763  
    2323 
    2424// {{{ requires 
    25 require_once 'PHPUnit/Framework.php'; 
    26  
    27 require_once 'LC_Page_Test.php'; 
     25require_once(realpath(dirname(__FILE__)) . '/../../require.php'); 
     26require_once(realpath(dirname(__FILE__)) . '/LC_Page_Test.php'); 
    2827 
    2928/** 
Note: See TracChangeset for help on using the changeset viewer.